diff -Nru wget-1.19.5/aclocal.m4 wget-1.20.1/aclocal.m4 --- wget-1.19.5/aclocal.m4 2018-05-06 16:47:44.000000000 +0000 +++ wget-1.20.1/aclocal.m4 2018-12-26 20:08:56.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -580,7 +580,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -592,10 +592,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15.1], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -611,14 +611,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15.1])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -670,7 +670,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -701,7 +701,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -892,13 +892,12 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-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. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -906,49 +905,41 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -957,18 +948,17 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1055,8 +1045,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -1123,7 +1113,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -1165,7 +1155,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1186,7 +1176,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1207,7 +1197,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1215,49 +1205,42 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1294,7 +1277,7 @@ fi ]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1328,7 +1311,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1357,7 +1340,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1404,7 +1387,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1437,10 +1420,12 @@ [ dnl Find a Python interpreter. Python versions prior to 2.0 are not 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 - python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) +[python python2 python3 dnl + python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl + python3.2 python3.1 python3.0 dnl + python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl + python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -1640,7 +1625,7 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1659,7 +1644,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1740,7 +1725,7 @@ rm -f conftest.file ]) -# 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, @@ -1800,7 +1785,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1828,7 +1813,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1847,7 +1832,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1979,17 +1964,19 @@ ]) # _AM_PROG_TAR m4_include([m4/00gnulib.m4]) +m4_include([m4/__inline.m4]) m4_include([m4/absolute-header.m4]) +m4_include([m4/af_alg.m4]) m4_include([m4/alloca.m4]) m4_include([m4/arpa_inet_h.m4]) m4_include([m4/asm-underscore.m4]) m4_include([m4/base32.m4]) m4_include([m4/btowc.m4]) m4_include([m4/builtin-expect.m4]) +m4_include([m4/byteswap.m4]) m4_include([m4/clock_time.m4]) m4_include([m4/close.m4]) m4_include([m4/codeset.m4]) -m4_include([m4/configmake.m4]) m4_include([m4/dirname.m4]) m4_include([m4/double-slash-root.m4]) m4_include([m4/dup2.m4]) @@ -2004,11 +1991,15 @@ m4_include([m4/fcntl-o.m4]) m4_include([m4/fcntl.m4]) m4_include([m4/fcntl_h.m4]) +m4_include([m4/fflush.m4]) m4_include([m4/flexmember.m4]) m4_include([m4/float_h.m4]) m4_include([m4/flock.m4]) m4_include([m4/fnmatch.m4]) +m4_include([m4/fnmatch_h.m4]) m4_include([m4/fopen.m4]) +m4_include([m4/fpurge.m4]) +m4_include([m4/freading.m4]) m4_include([m4/fseek.m4]) m4_include([m4/fseeko.m4]) m4_include([m4/fstat.m4]) @@ -2031,7 +2022,6 @@ 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]) @@ -2115,6 +2105,7 @@ m4_include([m4/secure_getenv.m4]) m4_include([m4/select.m4]) m4_include([m4/servent.m4]) +m4_include([m4/sh-filename.m4]) m4_include([m4/sha1.m4]) m4_include([m4/sha256.m4]) m4_include([m4/sha512.m4]) @@ -2134,6 +2125,7 @@ m4_include([m4/ssize_t.m4]) m4_include([m4/stat-time.m4]) m4_include([m4/stat.m4]) +m4_include([m4/std-gnu11.m4]) m4_include([m4/stdalign.m4]) m4_include([m4/stdbool.m4]) m4_include([m4/stddef_h.m4]) diff -Nru wget-1.19.5/build-aux/announce-gen wget-1.20.1/build-aux/announce-gen --- wget-1.19.5/build-aux/announce-gen 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/build-aux/announce-gen 2018-12-26 20:08:17.000000000 +0000 @@ -3,7 +3,7 @@ if 0; # Generate a release announcement message. -my $VERSION = '2017-09-13 06:45'; # UTC +my $VERSION = '2018-03-07 03:46'; # 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 @@ -549,7 +549,7 @@ ## perl-label-offset: -2 ## perl-extra-newline-before-brace: t ## perl-merge-trailing-else: nil -## eval: (add-hook 'write-file-hooks 'time-stamp) +## eval: (add-hook 'before-save-hook 'time-stamp) ## time-stamp-start: "my $VERSION = '" ## time-stamp-format: "%:y-%02m-%02d %02H:%02M" ## time-stamp-time-zone: "UTC0" diff -Nru wget-1.19.5/build-aux/ar-lib wget-1.20.1/build-aux/ar-lib --- wget-1.19.5/build-aux/ar-lib 2017-12-31 11:53:50.000000000 +0000 +++ wget-1.20.1/build-aux/ar-lib 1970-01-01 00:00:00.000000000 +0000 @@ -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 -# 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 -# . - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -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/,$2, in - *,$file_conv,*) - ;; - 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_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# 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-end: "; # UTC" -# End: diff -Nru wget-1.19.5/build-aux/config.guess wget-1.20.1/build-aux/config.guess --- wget-1.19.5/build-aux/config.guess 2018-01-25 18:21:27.000000000 +0000 +++ wget-1.20.1/build-aux/config.guess 2018-12-26 19:58:56.000000000 +0000 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-01-16' +timestamp='2018-08-29' # 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 @@ -84,8 +84,6 @@ exit 1 fi -trap 'exit 1' 1 2 15 - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -96,34 +94,39 @@ # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > "$dummy.c" ; - for c in cc gcc c89 c99 ; do - if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 +trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 + +set_cc_for_build() { + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$driver" + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi @@ -138,7 +141,7 @@ # We could probably try harder. LIBC=gnu - eval "$set_cc_for_build" + set_cc_for_build cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) @@ -150,6 +153,13 @@ #endif EOF eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac @@ -192,7 +202,7 @@ os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval "$set_cc_for_build" + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -230,7 +240,7 @@ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi}" + echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -382,20 +392,15 @@ echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval "$set_cc_for_build" - SUN_ARCH=i386 - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH=x86_64 - fi - fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + case `isainfo -b` in + 32) + echo i386-pc-solaris2"$UNAME_REL" + ;; + 64) + echo x86_64-pc-solaris2"$UNAME_REL" + ;; + esac exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -475,7 +480,7 @@ echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -572,7 +577,7 @@ exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include @@ -653,7 +658,7 @@ esac fi if [ "$HP_ARCH" = "" ]; then - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -693,7 +698,7 @@ esac if [ "$HP_ARCH" = hppa2.0w ] then - eval "$set_cc_for_build" + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -719,7 +724,7 @@ echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include int @@ -833,6 +838,17 @@ *:BSD/OS:*:*) echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + else + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + fi + exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` case "$UNAME_PROCESSOR" in @@ -874,7 +890,7 @@ echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin + echo x86_64-pc-cygwin exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" @@ -887,8 +903,8 @@ # other systems with GNU libc and userland echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; - i*86:Minix:*:*) - echo "$UNAME_MACHINE"-pc-minix + *:Minix:*:*) + echo "$UNAME_MACHINE"-unknown-minix exit ;; aarch64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -915,7 +931,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then @@ -964,7 +980,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} @@ -1278,7 +1294,7 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval "$set_cc_for_build" + set_cc_for_build if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi @@ -1351,6 +1367,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. + # shellcheck disable=SC2154 if test "$cputype" = 386; then UNAME_MACHINE=i386 else @@ -1462,7 +1479,7 @@ exit 1 # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru wget-1.19.5/build-aux/config.sub wget-1.20.1/build-aux/config.sub --- wget-1.19.5/build-aux/config.sub 2018-01-25 18:21:27.000000000 +0000 +++ wget-1.20.1/build-aux/config.sub 2018-12-26 19:58:56.000000000 +0000 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-01-15' +timestamp='2018-08-29' # 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 @@ -89,7 +89,7 @@ - ) # Use stdin as input. break ;; -* ) - echo "$me: invalid option $1$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; *local*) @@ -110,1223 +110,1159 @@ exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo "$1" | sed 's/-[^-]*$//'` - if [ "$basic_machine" != "$1" ] - then os=`echo "$1" | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 +# Split fields of configuration type +IFS="-" read -r field1 field2 field3 field4 <&2 + exit 1 ;; - -lynx*) - os=-lynxos + *-*-*-*) + basic_machine=$field1-$field2 + os=$field3-$field4 ;; - -ptx*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ + | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova*) + basic_machine=$field1 + os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + os=linux-android + ;; + *) + basic_machine=$field1-$field2 + os=$field3 + ;; + esac ;; - -psos*) - os=-psos + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + os= + ;; + *) + basic_machine=$field1 + os=$field2 + ;; + esac + ;; + esac ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + os=bsd + ;; + a29khif) + basic_machine=a29k-amd + os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=scout + ;; + alliant) + basic_machine=fx80-alliant + os= + ;; + altos | altos3068) + basic_machine=m68k-altos + os= + ;; + am29k) + basic_machine=a29k-none + os=bsd + ;; + amdahl) + basic_machine=580-amdahl + os=sysv + ;; + amiga) + basic_machine=m68k-unknown + os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=bsd + ;; + aros) + basic_machine=i386-pc + os=aros + ;; + aux) + basic_machine=m68k-apple + os=aux + ;; + balance) + basic_machine=ns32k-sequent + os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=linux + ;; + cegcc) + basic_machine=arm-unknown + os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=bsd + ;; + convex-c2) + basic_machine=c2-convex + os=bsd + ;; + convex-c32) + basic_machine=c32-convex + os=bsd + ;; + convex-c34) + basic_machine=c34-convex + os=bsd + ;; + convex-c38) + basic_machine=c38-convex + os=bsd + ;; + cray) + basic_machine=j90-cray + os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + os= + ;; + da30) + basic_machine=m68k-da30 + os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + os= + ;; + delta88) + basic_machine=m88k-motorola + os=sysv3 + ;; + dicos) + basic_machine=i686-pc + os=dicos + ;; + djgpp) + basic_machine=i586-pc + os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=ose + ;; + gmicro) + basic_machine=tron-gmicro + os=sysv + ;; + go32) + basic_machine=i386-pc + os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=hms + ;; + harris) + basic_machine=m88k-harris + os=sysv3 + ;; + hp300) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=hpux + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=proelf + ;; + i386mach) + basic_machine=i386-mach + os=mach + ;; + vsta) + basic_machine=i386-pc + os=vsta + ;; + isi68 | isi) + basic_machine=m68k-isi + os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=sysv + ;; + merlin) + basic_machine=ns32k-utek + os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + os=coff + ;; + morphos) + basic_machine=powerpc-unknown + os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=moxiebox + ;; + msdos) + basic_machine=i386-pc + os=msdos + ;; + msys) + basic_machine=i686-pc + os=msys + ;; + mvs) + basic_machine=i370-ibm + os=mvs + ;; + nacl) + basic_machine=le32-unknown + os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=newsos + ;; + news1000) + basic_machine=m68030-sony + os=newsos + ;; + necv70) + basic_machine=v70-nec + os=sysv + ;; + nh3000) + basic_machine=m68k-harris + os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=cxux + ;; + nindy960) + basic_machine=i960-intel + os=nindy + ;; + mon960) + basic_machine=i960-intel + os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=ose + ;; + os68k) + basic_machine=m68k-none + os=os68k + ;; + paragon) + basic_machine=i860-intel + os=osf + ;; + parisc) + basic_machine=hppa-unknown + os=linux + ;; + pw32) + basic_machine=i586-unknown + os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=rdos + ;; + rdos32) + basic_machine=i386-pc + os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=coff + ;; + sa29200) + basic_machine=a29k-amd + os=udi + ;; + sei) + basic_machine=mips-sei + os=seiux + ;; + sequent) + basic_machine=i386-sequent + os= + ;; + sps7) + basic_machine=m68k-bull + os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + os= + ;; + stratus) + basic_machine=i860-stratus + os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + os= + ;; + sun2os3) + basic_machine=m68000-sun + os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + os= + ;; + sun3os3) + basic_machine=m68k-sun + os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + os= + ;; + sun4os3) + basic_machine=sparc-sun + os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + os= + ;; + sv1) + basic_machine=sv1-cray + os=unicos + ;; + symmetry) + basic_machine=i386-sequent + os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=unicos + ;; + t90) + basic_machine=t90-cray + os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + os=tpf + ;; + udi29k) + basic_machine=a29k-amd + os=udi + ;; + ultra3) + basic_machine=a29k-nyu + os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=none + ;; + vaxv) + basic_machine=vax-dec + os=sysv + ;; + vms) + basic_machine=vax-dec + os=vms + ;; + vxworks960) + basic_machine=i960-wrs + os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=vxworks + ;; + xbox) + basic_machine=i686-pc + os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + os=unicos + ;; + *) + basic_machine=$1 + os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia16 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pru \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | wasm32 \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + op50n) + cpu=hppa1.1 + vendor=oki ;; - ms1) - basic_machine=mt-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown + ibm*) + cpu=i370 + vendor=ibm ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none + orion105) + cpu=clipper + vendor=highlevel ;; - xscaleeb) - basic_machine=armeb-unknown + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple ;; - - xscaleel) - basic_machine=armel-unknown + pmac | pmac-mpw) + cpu=powerpc + vendor=apple ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | wasm32-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-pc - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx + cpu=m68k + vendor=motorola ;; dpx2*) - basic_machine=m68k-bull - os=-sysv3 - ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" - ;; - e500v[12]-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=$os"spe" - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + cpu=m68k + vendor=bull + os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + os=${os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv32 ;; i*86v4*) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv4 ;; i*86v) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv ;; i*86sol2) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - vsta) - basic_machine=i386-unknown - os=-vsta + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=solaris2 + ;; + j90 | j90-cray) + cpu=j90 + vendor=cray + os=${os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi + cpu=mips + vendor=sgi case $os in - -irix*) + irix*) ;; *) - os=-irix4 + os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos + cpu=m68000 + vendor=convergent ;; - ms1-*) - basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv + cpu=mips + vendor=sony + os=newsos ;; next | m*-next) - basic_machine=m68k-next + cpu=m68k + vendor=next case $os in - -nextstep* ) + nextstep* ) ;; - -ns2*) - os=-nextstep2 + ns2*) + os=nextstep2 ;; *) - os=-nextstep3 + os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - nsv-tandem) - basic_machine=nsv-tandem - ;; - nsx-tandem) - basic_machine=nsx-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti + cpu=m68k + vendor=tti ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 + pc532) + cpu=ns32k + vendor=pc532 ;; - pc98) - basic_machine=i386-pc + pn) + cpu=pn + vendor=gould ;; - pc98-*) - basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` + power) + cpu=power + vendor=ibm ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc + ps2) + cpu=i386 + vendor=ibm ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc + rm[46]00) + cpu=mips + vendor=siemens ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc + rtpc | rtpc-*) + cpu=romp + vendor=ibm ;; - pentium4) - basic_machine=i786-pc + sde) + cpu=mipsisa32 + vendor=sde + os=${os:-elf} ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` + simso-wrs) + cpu=sparclite + vendor=wrs + os=vxworks ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + tower | tower-32) + cpu=m68k + vendor=ncr ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu ;; - pentium4-*) - basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` + w65) + cpu=w65 + vendor=wdc ;; - pn) - basic_machine=pn-gould + w89k-*) + cpu=hppa1.1 + vendor=winbond + os=proelf ;; - power) basic_machine=power-ibm + none) + cpu=none + vendor=none ;; - ppc | ppcbe) basic_machine=powerpc-unknown + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown + + *-*) + IFS="-" read -r cpu vendor <&2 - exit 1 + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv64 \ + | rl78 | romp | rs6000 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | wasm32 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1334,198 +1270,245 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if [ x$os != x ] then case $os in # 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 + # solaris* is a basic system type, with this one exception. + auroraux) + os=auroraux ;; - -solaris1 | -solaris1.*) + bluegene*) + os=cnk + ;; + solaris1 | solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - -solaris) - os=-solaris2 + solaris) + os=solaris2 ;; - -unixware*) - os=-sysv4.2uw + unixware*) + os=sysv4.2uw ;; - -gnu/linux*) + gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # es1800 is here to avoid being matched by es* (a different OS) - -es1800*) - os=-ose + es1800*) + os=ose + ;; + # Some version numbers need modification + chorusos*) + os=chorusos + ;; + isc) + os=isc2.2 + ;; + sco6) + os=sco5v6 + ;; + sco5) + os=sco3.2v5 + ;; + sco4) + os=sco3.2v4 + ;; + sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + ;; + sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + scout) + # Don't match below + ;; + sco*) + os=sco3.2v2 + ;; + psos*) + os=psos ;; # Now accept the basic system types. # The portable systems comes first. # 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]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*) + # sysv* is not here because it comes later, after sysvr4. + gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | kopensolaris* | plan9* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | knetbsd* | mirbsd* | netbsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ + | linux-newlib* | linux-musl* | linux-uclibc* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* \ + | morphos* | superux* | rtmk* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) + qnx*) + case $cpu in + x86 | i*86) ;; *) - os=-nto$os + os=nto-$os ;; esac ;; - -nto-qnx*) + hiux*) + os=hiuxwe2 ;; - -nto*) + nto-qnx*) + ;; + nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -xray | -os68k* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + sim | xray | os68k* | v88r* \ + | windows* | osx | abug | netware* | os9* \ + | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) + ;; + linux-dietlibc) + os=linux-dietlibc ;; - -mac*) + linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + lynx*178) + os=lynxos178 + ;; + lynx*5) + os=lynxos5 + ;; + lynx*) + os=lynxos + ;; + mac*) os=`echo "$os" | sed -e 's|mac|macos|'` ;; - -linux-dietlibc) - os=-linux-dietlibc + opened*) + os=openedition ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` + os400*) + os=os400 ;; - -sunos5*) + sunos5*) os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - -sunos6*) + sunos6*) os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince + wince*) + os=wince ;; - -utek*) - os=-bsd + utek*) + os=bsd ;; - -dynix*) - os=-bsd + dynix*) + os=bsd ;; - -acis*) - os=-aos + acis*) + os=aos ;; - -atheos*) - os=-atheos + atheos*) + os=atheos ;; - -syllable*) - os=-syllable + syllable*) + os=syllable ;; - -386bsd) - os=-bsd + 386bsd) + os=bsd ;; - -ctix* | -uts*) - os=-sysv + ctix* | uts*) + os=sysv ;; - -nova*) - os=-rtmk-nova + nova*) + os=rtmk-nova ;; - -ns2) - os=-nextstep2 + ns2) + os=nextstep2 ;; - -nsk*) - os=-nsk + nsk*) + os=nsk ;; # Preserve the version number of sinix5. - -sinix5.*) + sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - -sinix*) - os=-sysv4 + sinix*) + os=sysv4 ;; - -tpf*) - os=-tpf + tpf*) + os=tpf ;; - -triton*) - os=-sysv3 + triton*) + os=sysv3 ;; - -oss*) - os=-sysv3 + oss*) + os=sysv3 ;; - -svr4*) - os=-sysv4 + svr4*) + os=sysv4 ;; - -svr3) - os=-sysv3 + svr3) + os=sysv3 ;; - -sysvr4) - os=-sysv4 + sysvr4) + os=sysv4 ;; - # This must come after -sysvr4. - -sysv*) + # This must come after sysvr4. + sysv*) ;; - -ose*) - os=-ose + ose*) + os=ose ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + os=mint ;; - -zvmoe) - os=-zvmoe + zvmoe) + os=zvmoe ;; - -dicos*) - os=-dicos + dicos*) + os=dicos ;; - -pikeos*) + pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. - case $basic_machine in + case $cpu in arm*) - os=-eabi + os=eabi ;; *) - os=-elf + os=elf ;; esac ;; - -nacl*) + nacl*) + ;; + ios) ;; - -ios) + none) ;; - -none) + *-eabi) ;; *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; @@ -1542,258 +1525,265 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +case $cpu-$vendor in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + os=linux ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac fi # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) +case $vendor in + unknown) case $os in - -riscix*) + riscix*) vendor=acorn ;; - -sunos*) + sunos*) vendor=sun ;; - -cnk*|-aix*) + cnk*|-aix*) vendor=ibm ;; - -beos*) + beos*) vendor=be ;; - -hpux*) + hpux*) vendor=hp ;; - -mpeix*) + mpeix*) vendor=hp ;; - -hiux*) + hiux*) vendor=hitachi ;; - -unos*) + unos*) vendor=crds ;; - -dgux*) + dgux*) vendor=dg ;; - -luna*) + luna*) vendor=omron ;; - -genix*) + genix*) vendor=ns ;; - -mvs* | -opened*) + clix*) + vendor=intergraph + ;; + mvs* | opened*) vendor=ibm ;; - -os400*) + os400*) vendor=ibm ;; - -ptx*) + ptx*) vendor=sequent ;; - -tpf*) + tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + vxsim* | vxworks* | windiss*) vendor=wrs ;; - -aux*) + aux*) vendor=apple ;; - -hms*) + hms*) vendor=hitachi ;; - -mpw* | -macos*) + mpw* | macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) vendor=atari ;; - -vos*) + vos*) vendor=stratus ;; esac - basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$basic_machine$os" +echo "$cpu-$vendor-$os" exit # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru wget-1.19.5/build-aux/depcomp wget-1.20.1/build-aux/depcomp --- wget-1.19.5/build-aux/depcomp 2018-01-19 21:19:13.000000000 +0000 +++ wget-1.20.1/build-aux/depcomp 2018-12-26 19:58:56.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2017-09-16.17; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 1999-2018 Free Software Foundation, Inc. @@ -783,7 +783,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru wget-1.19.5/build-aux/gitlog-to-changelog wget-1.20.1/build-aux/gitlog-to-changelog --- wget-1.19.5/build-aux/gitlog-to-changelog 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/build-aux/gitlog-to-changelog 2018-12-26 20:08:17.000000000 +0000 @@ -3,7 +3,7 @@ if 0; # Convert git log output to ChangeLog format. -my $VERSION = '2017-09-13 06:45'; # UTC +my $VERSION = '2018-03-07 03:47'; # 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 @@ -491,7 +491,7 @@ # Local Variables: # mode: perl # indent-tabs-mode: nil -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "my $VERSION = '" # time-stamp-format: "%:y-%02m-%02d %02H:%02M" # time-stamp-time-zone: "UTC0" diff -Nru wget-1.19.5/build-aux/git-version-gen wget-1.20.1/build-aux/git-version-gen --- wget-1.19.5/build-aux/git-version-gen 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/build-aux/git-version-gen 2018-12-26 20:08:17.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # Print a version string. -scriptversion=2017-09-13.06; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 2007-2018 Free Software Foundation, Inc. # @@ -219,7 +219,7 @@ printf %s "$v" # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru wget-1.19.5/build-aux/gnupload wget-1.20.1/build-aux/gnupload --- wget-1.19.5/build-aux/gnupload 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/build-aux/gnupload 2018-12-26 20:08:17.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2017-09-13.06; # UTC +scriptversion=2018-05-19.18; # UTC # Copyright (C) 2004-2018 Free Software Foundation, Inc. # @@ -24,7 +24,30 @@ set -e -GPG='gpg --batch --no-tty' +GPG=gpg +# Choose the proper version of gpg, so as to avoid a +# "gpg-agent is not available in this session" error +# when gpg-agent is version 3 but gpg is still version 1. +# FIXME-2020: remove, once all major distros ship gpg version 3 as /usr/bin/gpg +gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` +case "$gpg_agent_version" in + 2.*) + gpg_version=`(gpg --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` + case "$gpg_version" in + 1.*) + if (type gpg2) >/dev/null 2>/dev/null; then + # gpg2 is present. + GPG=gpg2 + else + # gpg2 is missing. Ubuntu users should install the package 'gnupg2'. + echo "WARNING: Using 'gpg', which is too old. You should install 'gpg2'." 1>&2 + fi + ;; + esac + ;; +esac + +GPG="${GPG} --batch --no-tty" conffile=.gnuploadrc to= dry_run=false @@ -432,7 +455,7 @@ exit 0 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru wget-1.19.5/build-aux/install-sh wget-1.20.1/build-aux/install-sh --- wget-1.19.5/build-aux/install-sh 2018-01-19 21:19:13.000000000 +0000 +++ wget-1.20.1/build-aux/install-sh 2018-12-26 19:58:56.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2017-09-23.17; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -332,34 +332,43 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -501,7 +510,7 @@ done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru wget-1.19.5/build-aux/ltmain.sh wget-1.20.1/build-aux/ltmain.sh --- wget-1.19.5/build-aux/ltmain.sh 2015-05-15 21:20:28.000000000 +0000 +++ wget-1.20.1/build-aux/ltmain.sh 1970-01-01 00:00:00.000000000 +0000 @@ -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 -Nru wget-1.19.5/build-aux/mdate-sh wget-1.20.1/build-aux/mdate-sh --- wget-1.19.5/build-aux/mdate-sh 2018-01-19 21:19:13.000000000 +0000 +++ wget-1.20.1/build-aux/mdate-sh 2018-12-26 19:58:56.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -scriptversion=2017-09-22.02; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 1995-2018 Free Software Foundation, Inc. # written by Ulrich Drepper , June 1995 @@ -220,7 +220,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru wget-1.19.5/build-aux/missing wget-1.20.1/build-aux/missing --- wget-1.19.5/build-aux/missing 2018-05-06 16:47:51.000000000 +0000 +++ wget-1.20.1/build-aux/missing 2018-12-26 20:09:02.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -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 . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook '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 -Nru wget-1.19.5/build-aux/test-driver wget-1.20.1/build-aux/test-driver --- wget-1.19.5/build-aux/test-driver 2018-05-06 16:47:51.000000000 +0000 +++ wget-1.20.1/build-aux/test-driver 2018-12-26 20:09:02.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2014 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 @@ -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 . +# 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 @@ -140,9 +140,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook '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 -Nru wget-1.19.5/build-aux/texinfo.tex wget-1.20.1/build-aux/texinfo.tex --- wget-1.19.5/build-aux/texinfo.tex 2018-01-19 21:19:13.000000000 +0000 +++ wget-1.20.1/build-aux/texinfo.tex 2018-12-26 19:58:56.000000000 +0000 @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2018-01-09.11} +\def\texinfoversion{2018-09-21.20} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -1528,6 +1528,9 @@ \startlink attr{/Border [0 0 0]}% user{/Subtype /Link /A << /S /URI /URI (#1) >>}% \endgroup} + % \pdfgettoks - Surround page numbers in #1 with @pdflink. #1 may + % be a simple number, or a list of numbers in the case of an index + % entry. \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} @@ -8001,6 +8004,7 @@ \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} \gdef\magicamp{\let&=\amprm} } +\let\ampchar\& \newcount\parencount @@ -11715,7 +11719,7 @@ @markupsetuprqdefault @c Local variables: -@c eval: (add-hook 'write-file-hooks 'time-stamp) +@c eval: (add-hook 'before-save-hook 'time-stamp) @c page-delimiter: "^\\\\message\\|emacs-page" @c time-stamp-start: "def\\\\texinfoversion{" @c time-stamp-format: "%:y-%02m-%02d.%02H" diff -Nru wget-1.19.5/build-aux/update-copyright wget-1.20.1/build-aux/update-copyright --- wget-1.19.5/build-aux/update-copyright 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/build-aux/update-copyright 2018-12-26 20:08:17.000000000 +0000 @@ -3,7 +3,7 @@ if 0; # Update an FSF copyright year list to include the current year. -my $VERSION = '2018-01-04.14:48'; # UTC +my $VERSION = '2018-03-07.03:47'; # UTC # Copyright (C) 2009-2018 Free Software Foundation, Inc. # @@ -269,7 +269,7 @@ # coding: utf-8 # mode: perl # indent-tabs-mode: nil -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "my $VERSION = '" # time-stamp-format: "%:y-%02m-%02d.%02H:%02M" # time-stamp-time-zone: "UTC0" diff -Nru wget-1.19.5/build-aux/useless-if-before-free wget-1.20.1/build-aux/useless-if-before-free --- wget-1.19.5/build-aux/useless-if-before-free 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/build-aux/useless-if-before-free 2018-12-26 20:08:17.000000000 +0000 @@ -4,7 +4,7 @@ # Detect instances of "if (p) free (p);". # Likewise "if (p != 0)", "if (0 != p)", or with NULL; and with braces. -my $VERSION = '2017-09-13 06:45'; # UTC +my $VERSION = '2018-03-07 03:47'; # 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 @@ -202,7 +202,7 @@ ## Local Variables: ## mode: perl ## indent-tabs-mode: nil -## eval: (add-hook 'write-file-hooks 'time-stamp) +## eval: (add-hook 'before-save-hook 'time-stamp) ## time-stamp-start: "my $VERSION = '" ## time-stamp-format: "%:y-%02m-%02d %02H:%02M" ## time-stamp-time-zone: "UTC0" diff -Nru wget-1.19.5/build-aux/vc-list-files wget-1.20.1/build-aux/vc-list-files --- wget-1.19.5/build-aux/vc-list-files 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/build-aux/vc-list-files 2018-12-26 20:08:17.000000000 +0000 @@ -2,7 +2,7 @@ # List version-controlled file names. # Print a version string. -scriptversion=2017-09-13.06; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 2006-2018 Free Software Foundation, Inc. @@ -105,7 +105,7 @@ done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru wget-1.19.5/ChangeLog wget-1.20.1/ChangeLog --- wget-1.19.5/ChangeLog 2018-05-06 16:50:33.000000000 +0000 +++ wget-1.20.1/ChangeLog 2018-12-26 20:12:23.000000000 +0000 @@ -1,3 +1,433 @@ +2018-12-26 Tim Rühsen + + * NEWS: Add release changes for 1.20.1 + +2018-12-26 Tim Rühsen + + Don't save user/pw with --xattr + Also the Referer info is reduced to scheme+host+port. + + * src/ftp.c (getftp): Change params of set_file_metadata() + * src/http.c (gethttp): Change params of set_file_metadata() + * src/xattr.c (set_file_metadata): Remove user/password from origin URL, + reduce Referer value to scheme/host/port. + * src/xattr.h: Change prototype of set_file_metadata() + +2018-12-26 Tim Rühsen + + Don't use extended attributes (--xattr) by default + * src/init.c (defaults): Set enable_xattr to false by default + * src/main.c (print_help): Reverse option logic of --xattr + * doc/wget.texi: Add description for --xattr + + Users may not be aware that the origin URL and Referer are saved + including credentials, and possibly access tokens within + the urls. + +2018-12-13 Tim Rühsen + + * .travis.yml: Email to wget-dev instead bug-wget mailing list + +2018-11-30 Darshit Shah + + * NEWS: Prepare for new version + +2018-11-13 Darshit Shah + + * contrib/make-release: Add a small checklist for pending tasks + + Prepare NEWS for new release + + * configure.ac: gnulib now expects autoconf >=2.63 + + * gnulib: Update library + +2018-11-13 Jay Satiro + + * src/init.c: Stop freeing the pointer returned by ws_mypath() + .. since ws_mypath() saves the address it returns in a static pointer + for reuse, to also be returned in later calls. + +2018-11-13 Darshit Shah + + * src/ftp.c(ftp_retrieve_glob): Honor {accept,reject}-regex switches as well + + * src/ftp.c (ftp_retrieve_glob): Refactor to prevent looping over listing multiple times + +2018-11-11 Tim Rühsen + + * .gitlab-ci.yml: Split into GnuTLS and OpenSSL build + + * Makefile.am: dist clean po/stamp-po + + Remove auto-generated files from po/ + + Add VPATH build + +2018-11-09 Tim Rühsen + + Revert "Bail out on unexpected 416 server errors" + This reverts commit 6f3b9959935ad7640bcf48a0a93848ed25ff8963. + + The code is obviously wrong, see https://savannah.gnu.org/bugs/?54963 + Also, the example from the original post doesn't work any more. + With other words, the broken server behavior has been fixed meanwhile. + +2018-11-09 Rosen Penev (tiny change) + + openssl: Do not use engines when OpenSSL does not support + * src/openssl.c: Check for OPENSSL_NO_ENGINE before + including openssl/engine.h and before calling ENGINE_load_builtin_engines() + + Fixes compilation with no engines compiled. + +2018-11-09 Tim Rühsen + + Fix HTTPS Perl tests + * tests/SSLTest.pm: Rename server cert and key file + * tests/Test-https*.px: Fix and remove OpenSSL hard-coding + * tests/certs/create-certs.sh: Script to generate test files + * tests/certs/*-template.txt: GnuTLS template files for certs and crl + * tests/certs/*.pem: Keys, certs, crls + * tests/certs/README: Removed commands, link to create-certs.sh + +2018-10-28 Kapus, Timotej (tiny change) + + Replace some loops with string.h functions + * src/init.c: Replace loop with strspn + * src/url.c: Replace loop with strrchr + +2018-10-26 Luiz Angelo Daros de Luca (tiny change) + + * .gitmodules: Use https:// instead of git:// for gnulib + git:// does not work over http proxy + + * src/host.c (sufmatch): Fix dot-prefixed domain matching + Current sufmatch does not match when domain is dot-prefixed. + The example of no_proxy in man (.mit.edu) does use a dot-prefixed + domain. + +2018-10-26 Tim Rühsen + + * src/convert.c (convert_links): Fix fallthrough + +2018-10-22 Darshit Shah + + * bootstrap: Update script from gnulib + + * gnulib: Update library + +2018-10-19 Tim Rühsen + + * .lgtm.yml: New file to add LGTM to Gitlab.com CI + +2018-10-16 Tim Rühsen + + * configure.ac: Fix build issue with libgpgme + +2018-10-14 Tim Rühsen + + * fuzz/*_fuzzer.in/*: Update fuzzer corpora + +2018-10-08 Nikos Mavrogiannopoulos + + Enable post-handshake auth under gnutls on TLS1.3 + +2018-09-20 Tim Rühsen + + * src/http.c (resp_new): Fix code to avoid false positive by clang + + * src/convert.c (convert_links): Fix code to avoid false positive by clang + +2018-09-19 Tim Rühsen + + Add support for PCRE2 pattern matching + * configure.ac: Check for libpcre2-8 + * src/init.c (choices): Test for HAVE_LIBPCRE2 + * src/main.c (main): Set regex compile and match functions + * src/options.h: Test for HAVE_LIBPCRE2 + * src/utils.c: Include pcre2.h, add functions + compile_pcre2_regex() and match_pcre2_regex() + * src/utils.h: Declare compile_pcre2_regex() and match_pcre2_regex() + + Fixes #54677 + Reported-by: Noël Köthe + +2018-09-07 Tim Rühsen + + Add . to perl path for all perl tests + * tests/*.px: Add -I . to the shebang + + This allows perl test to be run from tests/ directory, e.g. via + ./Test--post-file.px + +2018-09-07 Tomas Hozza + + Add TLS 1.3 support for GnuTLS + * doc/wget.texi: Add "TLSv1_3" to --secure-protocol + * src/gnutls.c (set_prio_default): Use GNUTLS_TLS1_3 where needed + + Wget currently allows specifying "TLSv1_3" as the parameter for + --secure-protocol option. However it is only implemented for OpenSSL + and in case wget is compiled with GnuTLS, it causes wget to abort with: + GnuTLS: unimplemented 'secure-protocol' option value 6 + + GnuTLS contains TLS 1.3 implementation since version 3.6.3 [1]. However + currently it must be enabled explicitly in the application of it to be + used. This will change after the draft is finalized. [2] However for + the time being, I enabled it explicitly in case "TLSv1_3" is used with + --secure-protocol. + + I also fixed man page to contain "TLSv1_3" in all listings of available + parameters for --secure-protocol + + [1] https://lists.gnupg.org/pipermail/gnutls-devel/2018-July/008584.html + [2] https://nikmav.blogspot.com/2018/05/gnutls-and-tls-13.html + +2018-08-29 Tomas Korbar + + Avoid creating empty wget-log when using -O and -q in background + * src/log.c (check_redirect_output): Check for quiet mode + +2018-08-27 Tomas Hozza + + * src/warc.c (warc_write_cdx_record): Fix RESOURCE LEAK found by Coverity + Error: RESOURCE_LEAK (CWE-772): - REAL ERROR + wget-1.19.5/src/warc.c:1376: alloc_fn: Storage is returned from allocation function "url_escape". + wget-1.19.5/src/url.c:284:3: alloc_fn: Storage is returned from allocation function "url_escape_1". + wget-1.19.5/src/url.c:255:3: alloc_fn: Storage is returned from allocation function "xmalloc". + wget-1.19.5/lib/xmalloc.c:41:11: alloc_fn: Storage is returned from allocation function "malloc". + wget-1.19.5/lib/xmalloc.c:41:11: var_assign: Assigning: "p" = "malloc(n)". + wget-1.19.5/lib/xmalloc.c:44:3: return_alloc: Returning allocated memory "p". + wget-1.19.5/src/url.c:255:3: var_assign: Assigning: "newstr" = "xmalloc(newlen + 1)". + wget-1.19.5/src/url.c:258:3: var_assign: Assigning: "p2" = "newstr". + wget-1.19.5/src/url.c:275:3: return_alloc: Returning allocated memory "newstr". + wget-1.19.5/src/url.c:284:3: return_alloc_fn: Directly returning storage allocated by "url_escape_1". + wget-1.19.5/src/warc.c:1376: var_assign: Assigning: "redirect_location" = storage returned from "url_escape(redirect_location)". + wget-1.19.5/src/warc.c:1381: noescape: Resource "redirect_location" is not freed or pointed-to in "fprintf". + wget-1.19.5/src/warc.c:1387: leaked_storage: Returning without freeing "redirect_location" leaks the storage that it points to. + \# 1385| fflush (warc_current_cdx_file); + \# 1386| + \# 1387|-> return true; + \# 1388| } + \# 1389| + + url_escape() really returns a newly allocated memory and it leaks when the warc_write_cdx_record() returns. The memory returned from url_escape() is usually stored in a temporary variable in other parts of the project and then freed. I took the same approach. + +2018-08-27 Tomas Hozza + + * src/warc.c (warc_write_start_record): Fix potential RESOURCE LEAK + In warc_write_start_record() function, the reutrn value of dup() is + directly used in gzdopen() call and not stored anywhere. However the + zlib documentation says that "The duplicated descriptor should be saved + to avoid a leak, since gzdopen does not close fd if it fails." [1]. + This change stores the FD in a variable and closes it in case gzopen() + fails. + + [1] https://www.zlib.net/manual.html + + Error: RESOURCE_LEAK (CWE-772): + wget-1.19.5/src/warc.c:217: open_fn: Returning handle opened by "dup". + wget-1.19.5/src/warc.c:217: leaked_handle: Failing to save or close handle opened by "dup(fileno(warc_current_file))" leaks it. + \# 215| + \# 216| /* Start a new GZIP stream. */ + \# 217|-> warc_current_gzfile = gzdopen (dup (fileno (warc_current_file)), "wb9"); + \# 218| warc_current_gzfile_uncompressed_size = 0; + \# 219| + +2018-08-27 Tomas Hozza + + * src/utils.c (open_stat): Fix RESOURCE LEAK found by Coverity + Error: RESOURCE_LEAK (CWE-772): + wget-1.19.5/src/utils.c:914: open_fn: Returning handle opened by "open". [Note: The source code implementation of the function has been overridden by a user model.] + wget-1.19.5/src/utils.c:914: var_assign: Assigning: "fd" = handle returned from "open(fname, flags, mode)". + wget-1.19.5/src/utils.c:921: noescape: Resource "fd" is not freed or pointed-to in "fstat". [Note: The source code implementation of the function has been overridden by a builtin model.] + wget-1.19.5/src/utils.c:924: leaked_handle: Handle variable "fd" going out of scope leaks the handle. + \# 922| { + \# 923| logprintf (LOG_NOTQUIET, _("Failed to stat file %s, error: %s\n"), fname, strerror(errno)); + \# 924|-> return -1; + \# 925| } + \# 926| #if !(defined(WINDOWS) || defined(__VMS)) + + This seems to be a real issue, since the opened file descriptor in "fd" + would leak. There is also additional check below the "fstat" call, which + closes the opened "fd". + +2018-08-27 Tomas Hozza + + * src/http.c (http_loop): Fix RESOURCE LEAK found by Coverity + Error: RESOURCE_LEAK (CWE-772): + wget-1.19.5/src/http.c:4486: alloc_fn: Storage is returned from allocation function "url_string". + wget-1.19.5/src/url.c:2248:3: alloc_fn: Storage is returned from allocation function "xmalloc". + wget-1.19.5/lib/xmalloc.c:41:11: alloc_fn: Storage is returned from allocation function "malloc". + wget-1.19.5/lib/xmalloc.c:41:11: var_assign: Assigning: "p" = "malloc(n)". + wget-1.19.5/lib/xmalloc.c:44:3: return_alloc: Returning allocated memory "p". + wget-1.19.5/src/url.c:2248:3: var_assign: Assigning: "result" = "xmalloc(size)". + wget-1.19.5/src/url.c:2248:3: var_assign: Assigning: "p" = "result". + wget-1.19.5/src/url.c:2250:3: noescape: Resource "p" is not freed or pointed-to in function "memcpy". [Note: The source code implementation of the function has been overridden by a builtin model.] + wget-1.19.5/src/url.c:2253:7: noescape: Resource "p" is not freed or pointed-to in function "memcpy". [Note: The source code implementation of the function has been overridden by a builtin model.] + wget-1.19.5/src/url.c:2257:11: noescape: Resource "p" is not freed or pointed-to in function "memcpy". [Note: The source code implementation of the function has been overridden by a builtin model.] + wget-1.19.5/src/url.c:2264:3: noescape: Resource "p" is not freed or pointed-to in function "memcpy". [Note: The source code implementation of the function has been overridden by a builtin model.] + wget-1.19.5/src/url.c:2270:7: identity_transfer: Passing "p" as argument 1 to function "number_to_string", which returns an offset off that argument. + wget-1.19.5/src/utils.c:1776:11: var_assign_parm: Assigning: "p" = "buffer". + wget-1.19.5/src/utils.c:1847:3: return_var: Returning "p", which is a copy of a parameter. + wget-1.19.5/src/url.c:2270:7: noescape: Resource "p" is not freed or pointed-to in function "number_to_string". + wget-1.19.5/src/utils.c:1774:25: noescape: "number_to_string(char *, wgint)" does not free or save its parameter "buffer". + wget-1.19.5/src/url.c:2270:7: var_assign: Assigning: "p" = "number_to_string(p, url->port)". + wget-1.19.5/src/url.c:2273:3: noescape: Resource "p" is not freed or pointed-to in function "full_path_write". + wget-1.19.5/src/url.c:1078:47: noescape: "full_path_write(struct url const *, char *)" does not free or save its parameter "where". + wget-1.19.5/src/url.c:2287:3: return_alloc: Returning allocated memory "result". + wget-1.19.5/src/http.c:4486: var_assign: Assigning: "hurl" = storage returned from "url_string(u, URL_AUTH_HIDE_PASSWD)". + wget-1.19.5/src/http.c:4487: noescape: Resource "hurl" is not freed or pointed-to in "logprintf". + wget-1.19.5/src/http.c:4513: leaked_storage: Variable "hurl" going out of scope leaks the storage it points to. + \# 4511| { + \# 4512| printwhat (count, opt.ntry); + \# 4513|-> continue; + \# 4514| } + \# 4515| else + + There are two conditional branches, which call continue, without freeing memory potentially allocated and pointed to by"hurl" pointer. In fase "!opt.verbose" is True and some of the appropriate conditions in the following if/else if construction, in which "continue" is called, are also true, then the memory allocated to "hurl" will leak. + +2018-08-27 Tomas Hozza + + * src/http.c (check_auth): Fix RESOURCE LEAK found by Coverity + Error: RESOURCE_LEAK (CWE-772): + wget-1.19.5/src/http.c:2434: alloc_fn: Storage is returned from allocation function "xmalloc". + wget-1.19.5/lib/xmalloc.c:41:11: alloc_fn: Storage is returned from allocation function "malloc". + wget-1.19.5/lib/xmalloc.c:41:11: var_assign: Assigning: "p" = "malloc(n)". + wget-1.19.5/lib/xmalloc.c:44:3: return_alloc: Returning allocated memory "p". + wget-1.19.5/src/http.c:2434: var_assign: Assigning: "auth_stat" = storage returned from "xmalloc(4UL)". + wget-1.19.5/src/http.c:2446: noescape: Resource "auth_stat" is not freed or pointed-to in "create_authorization_line". + wget-1.19.5/src/http.c:5203:70: noescape: "create_authorization_line(char const *, char const *, char const *, char const *, char const *, _Bool *, uerr_t *)" does not free or save its parameter "auth_err". + wget-1.19.5/src/http.c:2476: leaked_storage: Variable "auth_stat" going out of scope leaks the storage it points to. + \# 2474| /* Creating the Authorization header went wrong */ + \# 2475| } + \# 2476|-> } + \# 2477| else + \# 2478| { + + Error: RESOURCE_LEAK (CWE-772): + wget-1.19.5/src/http.c:2431: alloc_fn: Storage is returned from allocation function "url_full_path". + wget-1.19.5/src/url.c:1105:19: alloc_fn: Storage is returned from allocation function "xmalloc". + wget-1.19.5/lib/xmalloc.c:41:11: alloc_fn: Storage is returned from allocation function "malloc". + wget-1.19.5/lib/xmalloc.c:41:11: var_assign: Assigning: "p" = "malloc(n)". + wget-1.19.5/lib/xmalloc.c:44:3: return_alloc: Returning allocated memory "p". + wget-1.19.5/src/url.c:1105:19: var_assign: Assigning: "full_path" = "xmalloc(length + 1)". + wget-1.19.5/src/url.c:1107:3: noescape: Resource "full_path" is not freed or pointed-to in function "full_path_write". + wget-1.19.5/src/url.c:1078:47: noescape: "full_path_write(struct url const *, char *)" does not free or save its parameter "where". + wget-1.19.5/src/url.c:1110:3: return_alloc: Returning allocated memory "full_path". + wget-1.19.5/src/http.c:2431: var_assign: Assigning: "pth" = storage returned from "url_full_path(u)". + wget-1.19.5/src/http.c:2446: noescape: Resource "pth" is not freed or pointed-to in "create_authorization_line". + wget-1.19.5/src/http.c:5203:40: noescape: "create_authorization_line(char const *, char const *, char const *, char const *, char const *, _Bool *, uerr_t *)" does not free or save its parameter "path". + wget-1.19.5/src/http.c:2476: leaked_storage: Variable "pth" going out of scope leaks the storage it points to. + \# 2474| /* Creating the Authorization header went wrong */ + \# 2475| } + \# 2476|-> } + \# 2477| else + \# 2478| { + + Both "pth" and "auth_stat" are allocated in "check_auth()" function. These are used for creating the HTTP Authorization Request header via "create_authorization_line()" function. In case the creation went OK (auth_err == RETROK), then the memory previously allocated to "pth" and "auth_stat" is freed. However if the creation failed, then the memory is never freed and it leaks. + +2018-08-27 Tomas Hozza + + * src/ftp.c (getftp): Fix RESOURCE LEAK found by Coverity + Error: RESOURCE_LEAK (CWE-772): + wget-1.19.5/src/ftp.c:1493: alloc_fn: Storage is returned from allocation function "fopen". + wget-1.19.5/src/ftp.c:1493: var_assign: Assigning: "fp" = storage returned from "fopen(con->target, "wb")". + wget-1.19.5/src/ftp.c:1811: leaked_storage: Variable "fp" going out of scope leaks the storage it points to. + \# 1809| if (fp && !output_stream) + \# 1810| fclose (fp); + \# 1811|-> return err; + \# 1812| } + \# 1813| + + It can happen, that "if (!output_stream || con->cmd & DO_LIST)" on line #1398 can be true, even though "output_stream != NULL". In this case a new file is opened to "fp". Later it may happen in the FTPS branch, that some error will occure and code will jump to label "exit_error". In "exit_error", the "fp" is closed only if "output_stream == NULL". However this may not be true as described earlier and "fp" leaks. + + On line #1588, there is the following conditional free of "fp": + + /* Close the local file. */ + if (!output_stream || con->cmd & DO_LIST) + fclose (fp); + + Therefore the conditional at the end of the function after "exit_error" label should be modified to: + + if (fp && (!output_stream || con->cmd & DO_LIST)) + fclose (fp); + + This will ensure that "fp" does not leak in any case it sould be opened. + +2018-08-11 Tomas Hozza + + Don't limit the test suite HTTPS server to TLSv1 + In Fedora, we are implementing crypto policies, in order to enhance the + security of user systems. This is done on the system level by global + configuration. It may happen that due to the active policy, only + TLSv1.2 or higher will be available in crypto libraries. While wget as + a client will by default determine the minimal TLS version supported by + both client and server, the HTTPS server implementation in testenv/ + hardcodes use of TLSv1. As a result all HTTPS related tests fail in + case a more hardened crypto policy is set on the Fedora system. + + This change removes the explicit TLS version setting and leaves the + determination of the minimal supported TLS version on the server and + client. + + More information about Fedora change can be found here: + https://fedoraproject.org/wiki/Changes/StrongCryptoSettings + +2018-06-13 Tim Rühsen + + * src/gnutls.c (ssl_check_certificate): Fix grammar of error msg + Reported-by: Nicholas Sielicki + + * fuzz/Makefile.am: Remove libtool LTLIB... from LDADD + + * src/http.c (http_loop): Fix --retry-on-host-error + +2018-06-13 ethus3h (tiny change) + + Add new option --retry-on-host-error + * doc/wget.texi: Add docs for --retry-on-host-error + * src/http.c (http_loop): Add code for HOSTERR + * src/init.c: Add option --retry-on-host-error + * src/main.c: Likewise + * src/options.h: Add options.retry_on_host_error + +2018-05-29 Tim Rühsen + + Save original data to WARC file + * src/retr.c (write_data): Cleanup, + (fd_read_body): Write to WARC before uncompressing + + Fixes: #53968 + +2018-05-10 Tim Rühsen + + * fuzz/get_ossfuzz_corpora: Speed up corpora download + +2018-05-09 Tim Rühsen + + * src/main.c (print_version): Silence UBSAN message + + * src/utils.ci (file_exists_p): Fix stat(NULL,...) + + * src/hsts.c (open_hsts_test_store): Fix unlink(NULL) + + * src/hash.c: Silence UBSAN for hash functions + + * fuzz/*_fuzzer.in: Update corpora from OSS-Fuzz + + * fuzz/get_ossfuzz_corpora: Fix path + +2018-05-08 Tim Rühsen + + * src/hsts.h: Fix header guard + + * src/version.h: Add header guard + + * src/host.c (wait_ares): Remove void assignment + Reported-by: Josef Moellers + 2018-05-06 Tim Rühsen Update NEWS file for new release diff -Nru wget-1.19.5/configure wget-1.20.1/configure --- wget-1.19.5/configure 2018-05-06 16:47:47.000000000 +0000 +++ wget-1.20.1/configure 2018-12-26 20:08:59.000000000 +0000 @@ -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.5. +# Generated by GNU Autoconf 2.69 for wget 1.20.1. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='wget' PACKAGE_TARNAME='wget' -PACKAGE_VERSION='1.19.5' -PACKAGE_STRING='wget 1.19.5' +PACKAGE_VERSION='1.20.1' +PACKAGE_STRING='wget 1.20.1' PACKAGE_BUGREPORT='bug-wget@gnu.org' PACKAGE_URL='' @@ -646,20 +646,22 @@ WITH_SSL_TRUE IRI_IS_ENABLED_FALSE IRI_IS_ENABLED_TRUE +GPGME_LIBS +GPGME_CFLAGS +GPGME_CONFIG +METALINK_LIBS +METALINK_CFLAGS CARES_LIBS CARES_CFLAGS PCRE_LIBS PCRE_CFLAGS +PCRE2_LIBS +PCRE2_CFLAGS UUID_LIBS UUID_CFLAGS COMMENT_IF_NO_POD2MAN POD2MAN PERL -GPGME_LIBS -GPGME_CFLAGS -GPGME_CONFIG -METALINK_LIBS -METALINK_CFLAGS NETTLE_LIBS LIBGNUTLS_PREFIX LTLIBGNUTLS @@ -681,7 +683,6 @@ PKG_CONFIG_PATH PKG_CONFIG LIBOBJS -LIBTESTS_LIBDEPS LIBGNU_LTLIBDEPS LIBGNU_LIBDEPS gltests_WITNESS @@ -780,6 +781,7 @@ HAVE_SCHED_H NEXT_AS_FIRST_DIRECTIVE_SCHED_H NEXT_SCHED_H +GLIBC21 REPLACE_RAISE REPLACE_PTHREAD_SIGMASK HAVE_SIGHANDLER_T @@ -800,7 +802,9 @@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE +REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR REPLACE_POSIX_SPAWN +HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR HAVE_POSIX_SPAWN_FILE_ACTIONS_T HAVE_POSIX_SPAWNATTR_T HAVE_POSIX_SPAWN @@ -822,6 +826,7 @@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE +GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT GNULIB_POSIX_SPAWNP GNULIB_POSIX_SPAWN @@ -1023,21 +1028,26 @@ HAVE_MAX_ALIGN_T REPLACE_NULL REPLACE_STRUCT_LCONV +REPLACE_FREELOCALE REPLACE_DUPLOCALE +REPLACE_NEWLOCALE REPLACE_SETLOCALE REPLACE_LOCALECONV +HAVE_FREELOCALE HAVE_DUPLOCALE +HAVE_NEWLOCALE +GNULIB_LOCALENAME GNULIB_DUPLOCALE GNULIB_SETLOCALE GNULIB_LOCALECONV LOCALCHARSET_TESTS_ENVIRONMENT -GLIBC21 LIBUNISTRING_PREFIX LTLIBUNISTRING LIBUNISTRING HAVE_LIBUNISTRING HAVE_LANGINFO_YESEXPR HAVE_LANGINFO_ERA +HAVE_LANGINFO_ALTMON HAVE_LANGINFO_T_FMT_AMPM HAVE_LANGINFO_CODESET HAVE_LANGINFO_H @@ -1073,6 +1083,7 @@ INT32_MAX_LT_INTMAX_MAX REPLACE_STRTOUMAX REPLACE_STRTOIMAX +HAVE_IMAXDIV_T HAVE_DECL_STRTOUMAX HAVE_DECL_STRTOIMAX HAVE_DECL_IMAXDIV @@ -1221,6 +1232,23 @@ WINDOWS_64_BIT_OFF_T NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H NEXT_SYS_TYPES_H +GL_GENERATE_FNMATCH_H_FALSE +GL_GENERATE_FNMATCH_H_TRUE +FNMATCH_H +HAVE_FNMATCH_H +NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H +NEXT_FNMATCH_H +REPLACE_FNMATCH +HAVE_FNMATCH +GNULIB_FNMATCH +HAVE_FLOCK +GNULIB_FLOCK +REPLACE_ITOLD +GL_GENERATE_FLOAT_H_FALSE +GL_GENERATE_FLOAT_H_TRUE +FLOAT_H +NEXT_AS_FIRST_DIRECTIVE_FLOAT_H +NEXT_FLOAT_H REPLACE_VSPRINTF REPLACE_VSNPRINTF REPLACE_VPRINTF @@ -1322,17 +1350,6 @@ GNULIB_FDOPEN GNULIB_FCLOSE GNULIB_DPRINTF -GL_GENERATE_FNMATCH_H_FALSE -GL_GENERATE_FNMATCH_H_TRUE -FNMATCH_H -HAVE_FLOCK -GNULIB_FLOCK -REPLACE_ITOLD -GL_GENERATE_FLOAT_H_FALSE -GL_GENERATE_FLOAT_H_TRUE -FLOAT_H -NEXT_AS_FIRST_DIRECTIVE_FLOAT_H -NEXT_FLOAT_H NEXT_AS_FIRST_DIRECTIVE_FCNTL_H NEXT_FCNTL_H REPLACE_OPENAT @@ -1356,10 +1373,11 @@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H NEXT_ERRNO_H LIB_CRYPTO -pkglibexecdir -lispdir HAVE_MSVC_INVALID_PARAMETER_HANDLER LIB_CLOCK_GETTIME +GL_GENERATE_BYTESWAP_H_FALSE +GL_GENERATE_BYTESWAP_H_TRUE +BYTESWAP_H LOCALE_FR REPLACE_WCSFTIME REPLACE_WCSWIDTH @@ -1496,6 +1514,7 @@ REPLACE_LINK REPLACE_LCHOWN REPLACE_ISATTY +REPLACE_GETPASS REPLACE_GETPAGESIZE REPLACE_GETGROUPS REPLACE_GETLOGIN_R @@ -1512,6 +1531,7 @@ HAVE_SYS_PARAM_H HAVE_OS_H HAVE_DECL_TTYNAME_R +HAVE_DECL_TRUNCATE HAVE_DECL_SETHOSTNAME HAVE_DECL_GETUSERSHELL HAVE_DECL_GETPAGESIZE @@ -1523,7 +1543,6 @@ HAVE_DECL_ENVIRON HAVE_USLEEP HAVE_UNLINKAT -HAVE_TRUNCATE HAVE_SYMLINKAT HAVE_SYMLINK HAVE_SLEEP @@ -1538,6 +1557,7 @@ HAVE_LINK HAVE_LCHOWN HAVE_GROUP_MEMBER +HAVE_GETPASS HAVE_GETPAGESIZE HAVE_GETLOGIN HAVE_GETHOSTNAME @@ -1580,6 +1600,7 @@ GNULIB_ISATTY GNULIB_GROUP_MEMBER GNULIB_GETUSERSHELL +GNULIB_GETPASS GNULIB_GETPAGESIZE GNULIB_GETLOGIN_R GNULIB_GETLOGIN @@ -1641,8 +1662,6 @@ LTLIBICONV LIBICONV INTL_MACOSX_LIBS -HOST_CPU_C_ABI -HOST_CPU XGETTEXT_EXTRA_OPTIONS MSGMERGE XGETTEXT_015 @@ -1677,7 +1696,6 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -1765,7 +1783,8 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -1790,6 +1809,7 @@ enable_rpath with_libiconv_prefix with_libintl_prefix +with_linux_crypto with_openssl with_included_libunistring with_libunistring_prefix @@ -1797,12 +1817,13 @@ with_included_regex with_libssl_prefix with_libgnutls_prefix -with_gpgme_prefix enable_ipv6 enable_iri with_libidn with_libuuid +enable_pcre2 enable_pcre +with_gpgme_prefix enable_xattr ' ac_precious_vars='build_alias @@ -1826,14 +1847,16 @@ OPENSSL_LIBS GNUTLS_CFLAGS GNUTLS_LIBS -METALINK_CFLAGS -METALINK_LIBS UUID_CFLAGS UUID_LIBS +PCRE2_CFLAGS +PCRE2_LIBS PCRE_CFLAGS PCRE_LIBS CARES_CFLAGS -CARES_LIBS' +CARES_LIBS +METALINK_CFLAGS +METALINK_LIBS' # Initialize some variables set by options. @@ -2384,7 +2407,7 @@ # 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.5 to adapt to many kinds of systems. +\`configure' configures wget 1.20.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2455,7 +2478,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wget 1.19.5:";; + short | recursive ) echo "Configuration of wget 1.20.1:";; esac cat <<\_ACEOF @@ -2484,6 +2507,7 @@ --disable-rpath do not hardcode runtime library paths --disable-ipv6 disable IPv6 support --disable-iri disable IDN/IRIs support + --disable-pcre2 Disable PCRE2 style regular expressions --disable-pcre Disable PCRE style regular expressions --disable-xattr disable support for POSIX Extended Attributes @@ -2501,10 +2525,13 @@ --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir + --with-linux-crypto use Linux kernel cryptographic API (if available) --with-openssl use libcrypto hash routines. Valid ARGs are: 'yes', 'no', 'auto' => use if available, 'optional' => use if available and warn if not available; default is - 'no' + 'no'. Note also --with-linux-crypto, which will + enable use of kernel crypto routines, which have + precedence --with-included-libunistring use the libunistring parts included here --with-libunistring-prefix[=DIR] search for libunistring in DIR/include and DIR/lib --without-libunistring-prefix don't search for libunistring in includedir and libdir @@ -2518,10 +2545,10 @@ --without-libssl-prefix don't search for libssl in includedir and libdir --with-libgnutls-prefix[=DIR] search for libgnutls in DIR/include and DIR/lib --without-libgnutls-prefix don't search for libgnutls in includedir and libdir - --with-gpgme-prefix=PFX prefix where GPGME is installed (optional) --with-libidn=DIR Support IDN2008/IRIs (needs GNU libidn2 + libunicode) --without-libuuid Generate UUIDs for WARC files via libuuid + --with-gpgme-prefix=PFX prefix where GPGME is installed (optional) Some influential environment variables: CC C compiler command @@ -2550,17 +2577,20 @@ GNUTLS_CFLAGS C compiler flags for GNUTLS, overriding pkg-config GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config - METALINK_CFLAGS - C compiler flags for METALINK, overriding pkg-config - METALINK_LIBS - linker flags for METALINK, overriding pkg-config UUID_CFLAGS C compiler flags for UUID, overriding pkg-config UUID_LIBS linker flags for UUID, overriding pkg-config + PCRE2_CFLAGS + C compiler flags for PCRE2, overriding pkg-config + PCRE2_LIBS linker flags for PCRE2, overriding pkg-config PCRE_CFLAGS C compiler flags for PCRE, overriding pkg-config PCRE_LIBS linker flags for PCRE, overriding pkg-config CARES_CFLAGS C compiler flags for CARES, overriding pkg-config CARES_LIBS linker flags for CARES, overriding pkg-config + METALINK_CFLAGS + C compiler flags for METALINK, overriding pkg-config + METALINK_LIBS + linker flags for METALINK, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2628,7 +2658,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wget configure 1.19.5 +wget configure 1.20.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3337,7 +3367,7 @@ 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.5, which was +It was created by wget $as_me 1.20.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3627,6 +3657,8 @@ as_fn_append ac_func_list " fcntl" as_fn_append ac_func_list " symlink" as_fn_append ac_func_list " flock" +as_fn_append ac_header_list " fnmatch.h" +as_fn_append ac_func_list " fnmatch" as_fn_append ac_func_list " isblank" as_fn_append ac_func_list " iswctype" as_fn_append ac_func_list " mbsrtowcs" @@ -3635,6 +3667,9 @@ as_fn_append ac_func_list " wmemcpy" as_fn_append ac_func_list " wmempcpy" as_fn_append ac_header_list " wctype.h" +as_fn_append ac_func_list " fpurge" +as_fn_append ac_func_list " __fpurge" +as_fn_append ac_func_list " __freading" as_fn_append ac_header_list " sys/stat.h" as_fn_append ac_func_list " futimens" as_fn_append ac_header_list " netdb.h" @@ -3644,15 +3679,13 @@ 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_func_list " getpass" as_fn_append ac_header_list " stdio_ext.h" as_fn_append ac_header_list " termios.h" as_fn_append ac_func_list " __fsetlocking" -as_fn_append ac_func_list " tcgetattr" -as_fn_append ac_func_list " tcsetattr" as_fn_append ac_func_list " getprogname" as_fn_append ac_func_list " getexecname" as_fn_append ac_func_list " gettimeofday" -as_fn_append ac_func_list " nanotime" as_fn_append ac_header_list " sys/time.h" as_fn_append ac_header_list " iconv.h" as_fn_append ac_header_list " limits.h" @@ -3818,7 +3851,7 @@ -am__api_version='1.15' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -4304,7 +4337,7 @@ # Define the identity of the package. PACKAGE='wget' - VERSION='1.19.5' + VERSION='1.20.1' cat >>confdefs.h <<_ACEOF @@ -4334,8 +4367,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -4386,7 +4419,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -5018,6 +5051,100 @@ fi fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; 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_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}clang" + $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 +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; 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_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="clang" + $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_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + 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 + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -5029,7 +5156,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -5415,8 +5542,420 @@ CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +$as_echo_n "checking for $CC option to enable C11 features... " >&6; } +if ${ac_cv_prog_cc_c11+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c11=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + v1.i = 2; + v1.w.k = 5; + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +ac_prog_cc_stdc_options= +case "x$ac_cv_prog_cc_c11" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c11" + CC=$CC$ac_prog_cc_stdc_options + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +$as_echo "$ac_cv_prog_cc_c11" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c11" != xno; then : + ac_prog_cc_stdc=c11 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +$as_echo_n "checking for $CC option to enable C99 features... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +ac_prog_cc_stdc_options= +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c99" + CC=$CC$ac_prog_cc_stdc_options + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; then : + ac_prog_cc_stdc=c99 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +$as_echo_n "checking for $CC option to enable C89 features... " >&6; } if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5489,6 +6028,7 @@ fi # AC_CACHE_VAL +ac_prog_cc_stdc_options= case "x$ac_cv_prog_cc_c89" in x) { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 @@ -5497,121 +6037,71 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) - CC="$CC $ac_cv_prog_cc_c89" + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c89" + CC=$CC$ac_prog_cc_stdc_options { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 + ac_prog_cc_stdc=c89 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ + ac_prog_cc_stdc=no + ac_cv_prog_cc_stdc=no +fi - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -6291,6 +6781,14 @@ test $ac_cv_should_define__xopen_source = yes && $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h + $as_echo "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + + + + + + @@ -6853,6 +7351,10 @@ + # Pre-early section. + + + # Code from module absolute-header: # Code from module accept: @@ -6866,21 +7368,27 @@ # Code from module bind: # Code from module btowc: # Code from module builtin-expect: + # Code from module byteswap: # Code from module c-ctype: # Code from module c-strcase: # Code from module c-strcaseeq: # Code from module c-strcasestr: + # Code from module c99: # Code from module clock-time: # Code from module cloexec: # Code from module close: - # Code from module configmake: # Code from module connect: + # Code from module crypto/af_alg: # Code from module crypto/md2: # Code from module crypto/md4: # Code from module crypto/md5: + # Code from module crypto/md5-buffer: # Code from module crypto/sha1: + # Code from module crypto/sha1-buffer: # Code from module crypto/sha256: + # Code from module crypto/sha256-buffer: # Code from module crypto/sha512: + # Code from module crypto/sha512-buffer: # Code from module dirname: # Code from module dirname-lgpl: # Code from module dosname: @@ -6897,12 +7405,17 @@ # Code from module fcntl-h: # Code from module fd-hook: # Code from module fd-safer-flag: + # Code from module fflush: + # Code from module filename: # Code from module flexmember: # Code from module float: # Code from module flock: # Code from module fnmatch: + # Code from module fnmatch-h: # Code from module fopen: + # Code from module fpurge: + # Code from module freading: # Code from module fseek: # Code from module fseeko: @@ -6918,6 +7431,7 @@ # Code from module getline: # Code from module getopt-gnu: # Code from module getopt-posix: + # Code from module getpass: # Code from module getpass-gnu: # Code from module getpeername: # Code from module getprogname: @@ -6933,7 +7447,6 @@ # 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: @@ -6948,6 +7461,7 @@ # Code from module langinfo: # Code from module largefile: + # Code from module libc-config: # Code from module libunistring-optional: # Code from module limits-h: # Code from module link: @@ -7014,6 +7528,7 @@ # Code from module send: # Code from module servent: # Code from module setsockopt: + # Code from module sh-filename: # Code from module sigaction: # Code from module signal-h: # Code from module sigpipe: @@ -7034,6 +7549,7 @@ # Code from module ssize_t: # Code from module stat: # Code from module stat-time: + # Code from module std-gnu11: # Code from module stdalign: # Code from module stdbool: # Code from module stddef: @@ -7171,7 +7687,7 @@ $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.9 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 test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -7837,105 +8353,63 @@ - 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 "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5 +$as_echo_n "checking 32-bit host C ABI... " >&6; } +if ${gl_cv_host_cpu_c_abi_32bit+:} false; then : $as_echo_n "(cached) " >&6 else - case "$host_cpu" in + if test -n "$gl_cv_host_cpu_c_abi"; then + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; + *) + gl_cv_host_cpu_c_abi_32bit=no ;; + esac + else + case "$host_cpu" in - i[4567]86 ) - gl_cv_host_cpu_c_abi=i386 - ;; + i[4567]86 ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; - 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 + 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 + || defined _M_X64 || defined _M_AMD64) \ + && !(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 + gl_cv_host_cpu_c_abi_32bit=no else - gl_cv_host_cpu_c_abi=x86_64 + gl_cv_host_cpu_c_abi_32bit=yes 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 + 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. */ -#if defined __ILP32__ || defined _ILP32 +#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32) int ok; #else error fail @@ -7943,247 +8417,180 @@ _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 + gl_cv_host_cpu_c_abi_32bit=no 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* - + gl_cv_host_cpu_c_abi_32bit=yes 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 + 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 + int ok; + #else + error fail + #endif _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi=hppa64 + gl_cv_host_cpu_c_abi_32bit=no else - gl_cv_host_cpu_c_abi=hppa + gl_cv_host_cpu_c_abi_32bit=yes 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 + 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 + int ok; + #else + error fail + #endif _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi=ia64-ilp32 + gl_cv_host_cpu_c_abi_32bit=yes else - gl_cv_host_cpu_c_abi=ia64 + gl_cv_host_cpu_c_abi_32bit=no 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 + 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 + int ok; + #else + error fail + #endif _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi=mips64 + gl_cv_host_cpu_c_abi_32bit=no 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 + gl_cv_host_cpu_c_abi_32bit=yes +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 (_MIPS_SIM == _ABIN32) - int ok; - #else - error fail - #endif +#if defined __powerpc64__ || defined _ARCH_PPC64 + int ok; + #else + error fail + #endif _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi=mipsn32 + gl_cv_host_cpu_c_abi_32bit=no else - gl_cv_host_cpu_c_abi=mips -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + gl_cv_host_cpu_c_abi_32bit=yes 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 + rs6000 ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; + + riscv32 | riscv64 ) + # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. + # Size of 'long' and 'void *': + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#if defined __powerpc64__ || defined _ARCH_PPC64 - int ok; - #else - error fail - #endif +#if defined __LP64__ + 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 + gl_cv_host_cpu_c_abi_32bit=no +else + gl_cv_host_cpu_c_abi_32bit=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + 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 _CALL_ELF && _CALL_ELF == 2 +#if defined __LP64__ || defined __s390x__ int ok; - #else + #else error fail - #endif + #endif _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi=powerpc64-elfv2 + gl_cv_host_cpu_c_abi_32bit=no else - gl_cv_host_cpu_c_abi=powerpc64 + gl_cv_host_cpu_c_abi_32bit=yes 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 + 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 + int ok; + #else + error fail + #endif _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi=sparc64 + gl_cv_host_cpu_c_abi_32bit=no else - gl_cv_host_cpu_c_abi=sparc + gl_cv_host_cpu_c_abi_32bit=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; + ;; - *) - gl_cv_host_cpu_c_abi="$host_cpu" - ;; - esac + *) + gl_cv_host_cpu_c_abi_32bit=no + ;; + esac + fi 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 "$gl_cv_host_cpu_c_abi_32bit" >&6; } + HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&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 + 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 @@ -8191,10 +8598,10 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef _LP64 - int ok; - #else - error fail - #endif + int ok; + #else + error fail + #endif _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -8206,8 +8613,19 @@ 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 +$as_echo "$gl_cv_solaris_64bit" >&6; };; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&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*) + if test $gl_cv_solaris_64bit = yes; then acl_libdirstem=lib/64 case "$host_cpu" in sparc*) acl_libdirstem2=lib/sparcv9 ;; @@ -8216,37 +8634,33 @@ 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 + if test "$HOST_CPU_C_ABI_32BIT" != yes; then + 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 + fi ;; esac test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" @@ -8269,7 +8683,6 @@ - use_additional=yes acl_save_prefix="$prefix" @@ -8307,7 +8720,7 @@ additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then + && test ! -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -8747,7 +9160,6 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : @@ -9169,7 +9581,6 @@ - use_additional=yes acl_save_prefix="$prefix" @@ -9207,7 +9618,7 @@ additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then + && test ! -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -9623,7 +10034,6 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } if eval \${$gt_func_gnugettext_libintl+:} false; then : @@ -11174,6 +11584,7 @@ GNULIB_GETLOGIN=0; GNULIB_GETLOGIN_R=0; GNULIB_GETPAGESIZE=0; + GNULIB_GETPASS=0; GNULIB_GETUSERSHELL=0; GNULIB_GROUP_MEMBER=0; GNULIB_ISATTY=0; @@ -11216,6 +11627,7 @@ HAVE_GETHOSTNAME=1; HAVE_GETLOGIN=1; HAVE_GETPAGESIZE=1; + HAVE_GETPASS=1; HAVE_GROUP_MEMBER=1; HAVE_LCHOWN=1; HAVE_LINK=1; @@ -11230,7 +11642,6 @@ HAVE_SLEEP=1; HAVE_SYMLINK=1; HAVE_SYMLINKAT=1; - HAVE_TRUNCATE=1; HAVE_UNLINKAT=1; HAVE_USLEEP=1; HAVE_DECL_ENVIRON=1; @@ -11242,6 +11653,7 @@ HAVE_DECL_GETPAGESIZE=1; HAVE_DECL_GETUSERSHELL=1; HAVE_DECL_SETHOSTNAME=1; + HAVE_DECL_TRUNCATE=1; HAVE_DECL_TTYNAME_R=1; HAVE_OS_H=0; HAVE_SYS_PARAM_H=0; @@ -11258,6 +11670,7 @@ REPLACE_GETLOGIN_R=0; REPLACE_GETGROUPS=0; REPLACE_GETPAGESIZE=0; + REPLACE_GETPASS=0; REPLACE_ISATTY=0; REPLACE_LCHOWN=0; REPLACE_LINK=0; @@ -11572,47 +11985,7 @@ - for gl_func in socket connect accept bind getpeername getsockname getsockopt listen recv send recvfrom sendto setsockopt shutdown accept4; 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. */ - -/* Some systems require prerequisite headers. */ -#include -#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 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works @@ -11837,17 +12210,17 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ typedef int *int_ptr; - int foo (int_ptr $ac_kw ip) { return ip[0]; } - int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ - int bar (int ip[$ac_kw]) { return ip[0]; } + int foo (int_ptr $ac_kw ip) { return ip[0]; } + int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ + int bar (int ip[$ac_kw]) { return ip[0]; } int main () { int s[1]; - int *$ac_kw t = s; - t[0] = 0; - return foo (t) + bar (t); + int *$ac_kw t = s; + t[0] = 0; + return foo (t) + bar (t); ; return 0; @@ -11995,7 +12368,8 @@ _ACEOF save_ac_compile="$ac_compile" ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + if echo '#include "conftest.c"' >conftest1.c && + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -12016,7 +12390,8 @@ _ACEOF ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + if echo '#include "conftest.c"' >conftest2.c && + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -12029,7 +12404,7 @@ fi fi ac_compile="$save_ac_compile" - rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext + rm -f conftest12.c conftest12.$ac_objext conftest$ac_exeext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5 @@ -12126,7 +12501,7 @@ 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 __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 @@ -12243,21 +12618,84 @@ + if test $ac_cv_func__set_invalid_parameter_handler = yes; then + HAVE_MSVC_INVALID_PARAMETER_HANDLER=1 + +$as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h + else + HAVE_MSVC_INVALID_PARAMETER_HANDLER=0 + fi - if test $ac_cv_func__set_invalid_parameter_handler = yes; then - HAVE_MSVC_INVALID_PARAMETER_HANDLER=1 -$as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether linux/if_alg.h has struct sockaddr_alg." >&5 +$as_echo_n "checking whether linux/if_alg.h has struct sockaddr_alg.... " >&6; } +if ${gl_cv_header_linux_if_alg_salg+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + struct sockaddr_alg salg = { + .salg_family = AF_ALG, + .salg_type = "hash", + .salg_name = "sha1", + }; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_header_linux_if_alg_salg=yes +else + gl_cv_header_linux_if_alg_salg=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_linux_if_alg_salg" >&5 +$as_echo "$gl_cv_header_linux_if_alg_salg" >&6; } + if test "$gl_cv_header_linux_if_alg_salg" = yes; then + +$as_echo "#define HAVE_LINUX_IF_ALG_H 1" >>confdefs.h + fi + + use_af_alg=no + +# Check whether --with-linux-crypto was given. +if test "${with_linux_crypto+set}" = set; then : + withval=$with_linux_crypto; use_af_alg=$withval +else + use_af_alg=no +fi + + if test "$gl_cv_header_linux_if_alg_salg" != yes; then + if test "$use_af_alg" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Linux kernel cryptographic API not found" >&5 +$as_echo "$as_me: WARNING: Linux kernel cryptographic API not found" >&2;} + fi + use_af_alg=no + fi + + if test "$use_af_alg" != no; then + USE_AF_ALG=1 else - HAVE_MSVC_INVALID_PARAMETER_HANDLER=0 + USE_AF_ALG=0 fi +cat >>confdefs.h <<_ACEOF +#define USE_LINUX_CRYPTO_API $USE_AF_ALG +_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 @@ -12539,11 +12977,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5 $as_echo_n "checking if environ is properly declared... " >&6; } - if ${gt_cv_var_environ_declaration+:} false; then : +if ${gt_cv_var_environ_declaration+:} 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. */ #if HAVE_UNISTD_H #include @@ -12551,7 +12988,7 @@ /* mingw, BeOS, Haiku declare environ in , not in . */ #include - extern struct { int foo; } environ; + extern struct { int foo; } environ; int main () { @@ -12567,8 +13004,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5 $as_echo "$gt_cv_var_environ_declaration" >&6; } if test $gt_cv_var_environ_declaration = yes; then @@ -13251,73 +13687,6 @@ fi - GNULIB_FLOCK=0; - HAVE_FLOCK=1; - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 -$as_echo_n "checking for mbstate_t... " >&6; } -if ${ac_cv_type_mbstate_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be - included before . */ -#include -#include -#include -#include -int -main () -{ -mbstate_t x; return sizeof x; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_mbstate_t=yes -else - ac_cv_type_mbstate_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5 -$as_echo "$ac_cv_type_mbstate_t" >&6; } - if test $ac_cv_type_mbstate_t = yes; then - -$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h - - else - -$as_echo "#define mbstate_t int" >>confdefs.h - - fi - - - - - - - - - - - - - - - - - - GNULIB_DPRINTF=0; GNULIB_FCLOSE=0; GNULIB_FDOPEN=0; @@ -13421,6 +13790,203 @@ REPLACE_VSPRINTF=0; + GNULIB_FLOCK=0; + HAVE_FLOCK=1; + + + + + GNULIB_FNMATCH=0; + HAVE_FNMATCH=1; + REPLACE_FNMATCH=0; + + + + + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_fnmatch_h='<'fnmatch.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_fnmatch_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + + if test $ac_cv_header_fnmatch_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 'fnmatch.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_fnmatch_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_fnmatch_h + gl_cv_next_fnmatch_h='"'$gl_header'"' + else + gl_cv_next_fnmatch_h='<'fnmatch.h'>' + fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fnmatch_h" >&5 +$as_echo "$gl_cv_next_fnmatch_h" >&6; } + fi + NEXT_FNMATCH_H=$gl_cv_next_fnmatch_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='<'fnmatch.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_fnmatch_h + fi + NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H=$gl_next_as_first_directive + + + + + + + + if test $ac_cv_header_fnmatch_h = yes; then + HAVE_FNMATCH_H=1 + else + HAVE_FNMATCH_H=0 + fi + + + FNMATCH_H='' + if false; then + FNMATCH_H=fnmatch.h + else + if test $ac_cv_header_fnmatch_h != yes; then + FNMATCH_H=fnmatch.h + fi + fi + + + if test -n "$FNMATCH_H"; then + GL_GENERATE_FNMATCH_H_TRUE= + GL_GENERATE_FNMATCH_H_FALSE='#' +else + GL_GENERATE_FNMATCH_H_TRUE='#' + GL_GENERATE_FNMATCH_H_FALSE= +fi + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 +$as_echo_n "checking for mbstate_t... " >&6; } +if ${ac_cv_type_mbstate_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int +main () +{ +mbstate_t x; return sizeof x; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_mbstate_t=yes +else + ac_cv_type_mbstate_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5 +$as_echo "$ac_cv_type_mbstate_t" >&6; } + if test $ac_cv_type_mbstate_t = yes; then + +$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h + + else + +$as_echo "#define mbstate_t int" >>confdefs.h + + fi + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdin defaults to large file offsets" >&5 $as_echo_n "checking whether stdin defaults to large file offsets... " >&6; } if ${gl_cv_var_stdin_large_offset+:} false; then : @@ -13695,6 +14261,106 @@ REPLACE_FSEEKO=1 fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5 +$as_echo_n "checking whether fflush works on input streams... " >&6; } +if ${gl_cv_func_fflush_stdin+:} false; then : + $as_echo_n "(cached) " >&6 +else + echo hello world > conftest.txt + if test "$cross_compiling" = yes; then : + case "$host_os" in + # Guess no on native Windows. + mingw*) gl_cv_func_fflush_stdin="guessing no" ;; + *) gl_cv_func_fflush_stdin=cross ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if HAVE_UNISTD_H +# include +#else /* on Windows with MSVC */ +# include +#endif + +int +main () +{ +FILE *f = fopen ("conftest.txt", "r"); + char buffer[10]; + int fd; + int c; + if (f == NULL) + return 1; + fd = fileno (f); + if (fd < 0 || fread (buffer, 1, 5, f) != 5) + { fclose (f); return 2; } + /* For deterministic results, ensure f read a bigger buffer. */ + if (lseek (fd, 0, SEEK_CUR) == 5) + { fclose (f); return 3; } + /* POSIX requires fflush-fseek to set file offset of fd. This fails + on BSD systems and on mingw. */ + if (fflush (f) != 0 || fseek (f, 0, SEEK_CUR) != 0) + { fclose (f); return 4; } + if (lseek (fd, 0, SEEK_CUR) != 5) + { fclose (f); return 5; } + /* Verify behaviour of fflush after ungetc. See + */ + /* Verify behaviour of fflush after a backup ungetc. This fails on + mingw. */ + c = fgetc (f); + ungetc (c, f); + fflush (f); + if (fgetc (f) != c) + { fclose (f); return 6; } + /* Verify behaviour of fflush after a non-backup ungetc. This fails + on glibc 2.8 and on BSD systems. */ + c = fgetc (f); + ungetc ('@', f); + fflush (f); + if (fgetc (f) != c) + { fclose (f); return 7; } + fclose (f); + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_fflush_stdin=yes +else + gl_cv_func_fflush_stdin=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + rm conftest.txt + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 +$as_echo "$gl_cv_func_fflush_stdin" >&6; } + case "$gl_cv_func_fflush_stdin" in + *yes) gl_func_fflush_stdin=1 ;; + *no) gl_func_fflush_stdin=0 ;; + *) gl_func_fflush_stdin='(-1)' ;; + esac + +cat >>confdefs.h <<_ACEOF +#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin +_ACEOF + + + case "$gl_cv_func_fflush_stdin" in + *yes) ;; + *) REPLACE_FSEEKO=1 ;; + esac + fi @@ -13886,44 +14552,7 @@ - for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat mknod mknodat stat utimensat; 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 ac_fn_c_check_decl "$LINENO" "ftello" "ac_cv_have_decl_ftello" "$ac_includes_default" @@ -14193,43 +14822,7 @@ - for gl_func in getaddrinfo freeaddrinfo gai_strerror getnameinfo; 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 @@ -14634,7 +15227,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv4 sockets" >&5 $as_echo_n "checking for IPv4 sockets... " >&6; } - if ${gl_cv_socket_ipv4+:} false; then : +if ${gl_cv_socket_ipv4+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14665,8 +15258,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socket_ipv4" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socket_ipv4" >&5 $as_echo "$gl_cv_socket_ipv4" >&6; } if test $gl_cv_socket_ipv4 = yes; then @@ -14676,7 +15268,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 sockets" >&5 $as_echo_n "checking for IPv6 sockets... " >&6; } - if ${gl_cv_socket_ipv6+:} false; then : +if ${gl_cv_socket_ipv6+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14710,8 +15302,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socket_ipv6" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socket_ipv6" >&5 $as_echo "$gl_cv_socket_ipv6" >&6; } if test $gl_cv_socket_ipv6 = yes; then @@ -15241,7 +15832,7 @@ } } } -#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#elif defined _WIN32 && ! defined __CYGWIN__ /* Avoid a crash on native Windows. */ #define WIN32_LEAN_AND_MEAN #include @@ -15459,16 +16050,7 @@ -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 -else - ac_have_decl=0 -fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETPASS $ac_have_decl -_ACEOF @@ -15476,6 +16058,12 @@ + if test $ac_cv_func_getpass = no; then + HAVE_GETPASS=0 + fi + + + @@ -15543,8 +16131,6 @@ - - GNULIB_GETTIMEOFDAY=0; HAVE_GETTIMEOFDAY=1; HAVE_STRUCT_TIMEVAL=1; @@ -15747,48 +16333,7 @@ fi - for gl_func in gettimeofday; 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. */ -#if HAVE_SYS_TIME_H -# include -#endif -#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 @@ -15827,12 +16372,17 @@ REPLACE_LOCALTIME=0; + GNULIB_ICONV=0; ICONV_CONST=; REPLACE_ICONV=0; REPLACE_ICONV_OPEN=0; REPLACE_ICONV_UTF=0; ICONV_H=''; + if false; then + ICONV_H='iconv.h' + fi + if test -n "$ICONV_H"; then GL_GENERATE_ICONV_H_TRUE= GL_GENERATE_ICONV_H_FALSE='#' @@ -16255,18 +16805,21 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether limits.h has ULLONG_WIDTH etc." >&5 -$as_echo_n "checking whether limits.h has ULLONG_WIDTH etc.... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc." >&5 +$as_echo_n "checking whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.... " >&6; } if ${gl_cv_header_limits_width+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ - #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 - #endif - #include - int ullw = ULLONG_WIDTH; + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif + #include + long long llm = LLONG_MAX; + int wb = WORD_BIT; + int ullw = ULLONG_WIDTH; + int main () { @@ -17388,7 +17941,9 @@ ;; esac - LIMITS_H=limits.h + + + LIMITS_H='limits.h' if test -n "$LIMITS_H"; then GL_GENERATE_LIMITS_H_TRUE= GL_GENERATE_LIMITS_H_FALSE='#' @@ -17402,6 +17957,7 @@ + if test -n "$STDINT_H"; then GL_GENERATE_STDINT_H_TRUE= GL_GENERATE_STDINT_H_FALSE='#' @@ -17422,6 +17978,7 @@ HAVE_DECL_IMAXDIV=1; HAVE_DECL_STRTOIMAX=1; HAVE_DECL_STRTOUMAX=1; + HAVE_IMAXDIV_T=1; REPLACE_STRTOIMAX=0; REPLACE_STRTOUMAX=0; INT32_MAX_LT_INTMAX_MAX=1; @@ -17518,44 +18075,7 @@ - for gl_func in imaxabs imaxdiv strtoimax strtoumax; 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 @@ -17953,55 +18473,7 @@ fi - for gl_func in wctype iswctype wctrans towctrans ; 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. */ - -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be - included before . */ -#if !(defined __GLIBC__ && !defined __UCLIBC__) -# include -# include -# include -# include -#endif -#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 @@ -18054,7 +18526,6 @@ - use_additional=yes acl_save_prefix="$prefix" @@ -18092,7 +18563,7 @@ additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then + && test ! -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -18509,7 +18980,6 @@ - ac_save_CPPFLAGS="$CPPFLAGS" for element in $INCUNISTRING; do @@ -18608,7 +19078,6 @@ - use_additional=yes acl_save_prefix="$prefix" @@ -18646,7 +19115,7 @@ additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then + && test ! -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -19063,7 +19532,6 @@ - ac_save_CPPFLAGS="$CPPFLAGS" for element in $INCUNISTRING; do @@ -19165,7 +19633,6 @@ - use_additional=yes acl_save_prefix="$prefix" @@ -19203,7 +19670,7 @@ additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then + && test ! -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -19620,7 +20087,6 @@ - ac_save_CPPFLAGS="$CPPFLAGS" for element in $INCUNISTRING; do @@ -19818,62 +20284,19 @@ -ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" -if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl -_ACEOF - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5 -$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; } -if ${ac_cv_gnu_library_2_1+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif -#ifdef __UCLIBC__ - Lucky user -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky" >/dev/null 2>&1; then : - ac_cv_gnu_library_2_1=yes -else - ac_cv_gnu_library_2_1=no -fi -rm -f conftest* - - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5 -$as_echo "$ac_cv_gnu_library_2_1" >&6; } - - GLIBC21="$ac_cv_gnu_library_2_1" - - GNULIB_LOCALECONV=0; GNULIB_SETLOCALE=0; GNULIB_DUPLOCALE=0; - HAVE_DUPLOCALE=1; + GNULIB_LOCALENAME=0; + HAVE_NEWLOCALE=1; + HAVE_DUPLOCALE=1; + HAVE_FREELOCALE=1; REPLACE_LOCALECONV=0; REPLACE_SETLOCALE=0; + REPLACE_NEWLOCALE=0; REPLACE_DUPLOCALE=0; + REPLACE_FREELOCALE=0; REPLACE_STRUCT_LCONV=0; @@ -19918,19 +20341,49 @@ STDDEF_H= - ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include -" -if test "x$ac_cv_type_max_align_t" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5 +$as_echo_n "checking for good max_align_t... " >&6; } +if ${gl_cv_type_max_align_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + unsigned int s = sizeof (max_align_t); + #if defined __GNUC__ || defined __IBM__ALIGNOF__ + int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; + int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1]; + #endif + +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_type_max_align_t=yes else - HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h + gl_cv_type_max_align_t=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5 +$as_echo "$gl_cv_type_max_align_t" >&6; } + if test $gl_cv_type_max_align_t = no; then + HAVE_MAX_ALIGN_T=0 + STDDEF_H=stddef.h + fi if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 STDDEF_H=stddef.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5 $as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; } if ${gl_cv_decl_null_works+:} false; then : @@ -19963,6 +20416,7 @@ STDDEF_H=stddef.h fi + if test -n "$STDDEF_H"; then GL_GENERATE_STDDEF_H_TRUE= GL_GENERATE_STDDEF_H_FALSE='#' @@ -20124,6 +20578,74 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 $as_echo "$gl_cv_have_weak" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker supports --as-needed" >&5 +$as_echo_n "checking whether the linker supports --as-needed... " >&6; } +if ${gl_cv_linker_have_as_needed+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GCC"; then + gl_saved_ldflags="$LDFLAGS" + LDFLAGS="$gl_saved_ldflags -Wl,--as-needed -Wl,--no-as-needed" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_linker_have_as_needed=yes +else + gl_cv_linker_have_as_needed=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$gl_saved_ldflags" + else + gl_cv_linker_have_as_needed=no + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_linker_have_as_needed" >&5 +$as_echo "$gl_cv_linker_have_as_needed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker supports --push-state" >&5 +$as_echo_n "checking whether the linker supports --push-state... " >&6; } +if ${gl_cv_linker_have_push_state+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GCC"; then + gl_saved_ldflags="$LDFLAGS" + LDFLAGS="$gl_saved_ldflags -Wl,--push-state -Wl,--pop-state" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_linker_have_push_state=yes +else + gl_cv_linker_have_push_state=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$gl_saved_ldflags" + else + gl_cv_linker_have_push_state=no + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_linker_have_push_state" >&5 +$as_echo "$gl_cv_linker_have_push_state" >&6; } 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 # it groks . It's added above, in gl_THREADLIB_EARLY_BODY. @@ -20336,6 +20858,28 @@ LIBTHREAD= LTLIBTHREAD= + case "$LIBMULTITHREAD" in + "") ;; + -pthread) + if test $gl_cv_linker_have_as_needed = yes; then + if test $gl_cv_linker_have_push_state = yes; then + LIBMULTITHREAD="$LIBMULTITHREAD -Wl,--push-state -Wl,--no-as-needed -lpthread -Wl,--pop-state" + else + LIBMULTITHREAD="$LIBMULTITHREAD -Wl,--no-as-needed -lpthread" + fi + fi + ;; + *) + if test $gl_cv_linker_have_as_needed = yes; then + if test $gl_cv_linker_have_push_state = yes; then + LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state" + else + LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD" + fi + fi + ;; + esac + # TODO: May need to modify LTLIBMULTITHREAD similarly. fi fi fi @@ -20381,6 +20925,14 @@ LIBTHREAD= LTLIBTHREAD= + if test $gl_cv_linker_have_as_needed = yes; then + if test $gl_cv_linker_have_push_state = yes; then + LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state" + else + LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD" + fi + fi + # TODO: May need to modify LTLIBMULTITHREAD similarly. fi fi fi @@ -20404,7 +20956,6 @@ - use_additional=yes acl_save_prefix="$prefix" @@ -20442,7 +20993,7 @@ additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then + && test ! -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -20858,7 +21409,6 @@ - ac_cv_libpth_libs="$LIBPTH" ac_cv_libpth_ltlibs="$LTLIBPTH" ac_cv_libpth_cppflags="$INCPTH" @@ -20937,6 +21487,14 @@ LIBTHREAD= LTLIBTHREAD= + if test $gl_cv_linker_have_as_needed = yes; then + if test $gl_cv_linker_have_push_state = yes; then + LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state" + else + LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD" + fi + fi + # TODO: May need to modify LTLIBMULTITHREAD similarly. fi fi else @@ -20985,6 +21543,9 @@ echo >conftest.file if test "$cross_compiling" = yes; then : case "$host_os" in + linux-* | linux) + # Guess yes on Linux systems. + gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; *-gnu* | gnu*) # Guess yes on glibc systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; @@ -21206,7 +21767,7 @@ int main () { -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ choke me #endif @@ -21334,7 +21895,7 @@ 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 __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 @@ -21483,7 +22044,7 @@ 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 __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 @@ -21620,7 +22181,7 @@ variables, and all locales use the UTF-8 encoding. */ #if !(defined __BEOS__ || defined __HAIKU__) /* Check whether the given locale name is recognized by the system. */ -# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if 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 @@ -22558,50 +23119,7 @@ - for gl_func in pselect select; 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. */ - -/* Some systems require prerequisite headers. */ -#include -#if !(defined __GLIBC__ && !defined __UCLIBC__) && HAVE_SYS_TIME_H -# include -#endif -#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 @@ -22678,7 +23196,7 @@ LIBSOCKET='-lws2_32' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5 $as_echo_n "checking for library containing setsockopt... " >&6; } if ${gl_cv_lib_socket+:} false; then : $as_echo_n "(cached) " >&6 @@ -22863,10 +23381,12 @@ if test "$cross_compiling" = yes; then : case "$host_os" in - # 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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_select_detects_ebadf="guessing yes" ;; + # 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 @@ -23024,6 +23544,7 @@ GNULIB_POSIX_SPAWN=0; GNULIB_POSIX_SPAWNP=0; GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT=0; + GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR=0; GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0; GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0; GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0; @@ -23046,7 +23567,11 @@ HAVE_POSIX_SPAWNATTR_T=1; HAVE_POSIX_SPAWN_FILE_ACTIONS_T=1; + HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR=1; + REPLACE_POSIX_SPAWN=0; + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR=0; + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0; REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0; @@ -23139,6 +23664,8 @@ if test $ac_cv_func_posix_spawn = yes; then + if test $REPLACE_POSIX_SPAWN = 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn works" >&5 $as_echo_n "checking whether posix_spawn works... " >&6; } @@ -23476,12 +24003,9 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_works" >&5 $as_echo "$gl_cv_func_posix_spawn_works" >&6; } - case "$gl_cv_func_posix_spawn_works" in - *yes) - -$as_echo "#define HAVE_WORKING_POSIX_SPAWN 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedpolicy is supported" >&5 + case "$gl_cv_func_posix_spawn_works" in + *yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedpolicy is supported" >&5 $as_echo_n "checking whether posix_spawnattr_setschedpolicy is supported... " >&6; } if ${gl_cv_func_spawnattr_setschedpolicy+:} false; then : $as_echo_n "(cached) " >&6 @@ -23507,7 +24031,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_spawnattr_setschedpolicy" >&5 $as_echo "$gl_cv_func_spawnattr_setschedpolicy" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedparam is supported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedparam is supported" >&5 $as_echo_n "checking whether posix_spawnattr_setschedparam is supported... " >&6; } if ${gl_cv_func_spawnattr_setschedparam+:} false; then : $as_echo_n "(cached) " >&6 @@ -23533,9 +24057,15 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_spawnattr_setschedparam" >&5 $as_echo "$gl_cv_func_spawnattr_setschedparam" >&6; } - ;; - *) REPLACE_POSIX_SPAWN=1 ;; - esac + ;; + *) REPLACE_POSIX_SPAWN=1 ;; + esac + fi + fi + if test $ac_cv_func_posix_spawn != yes || test $REPLACE_POSIX_SPAWN = 1; then + +$as_echo "#define REPLACE_POSIX_SPAWN 1" >>confdefs.h + fi @@ -23613,6 +24143,50 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5 +$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; } +if ${ac_cv_gnu_library_2_1+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif +#ifdef __UCLIBC__ + Lucky user +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Lucky" >/dev/null 2>&1; then : + ac_cv_gnu_library_2_1=yes +else + ac_cv_gnu_library_2_1=no +fi +rm -f conftest* + + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5 +$as_echo "$ac_cv_gnu_library_2_1" >&6; } + + GLIBC21="$ac_cv_gnu_library_2_1" + + + + + + + + + + @@ -23622,9 +24196,25 @@ + 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* @@ -23648,7 +24238,7 @@ 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 '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then + if LC_ALL=C $EGREP '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then gl_cv_prog_as_underscore=yes else gl_cv_prog_as_underscore=no @@ -24132,44 +24722,7 @@ - for gl_func in ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r strerror_r strsignal strverscmp; 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 @@ -24263,48 +24816,7 @@ - for gl_func in ffs strcasecmp strncasecmp; 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. */ - - /* Minix 3.1.8 has a bug: must be included before - . */ - #include - #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 ac_fn_c_check_decl "$LINENO" "strndup" "ac_cv_have_decl_strndup" "$ac_includes_default" @@ -24684,6 +25196,17 @@ #define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl _ACEOF +ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl +_ACEOF + ac_fn_c_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_getchar_unlocked" = xyes; then : ac_have_decl=1 @@ -25418,7 +25941,7 @@ gl_cond_libtool=false gl_libdeps= gl_ltlibdeps= - gl_m4_base='m4/' + gl_m4_base='m4' @@ -25428,7 +25951,7 @@ - gl_source_base='lib/' + gl_source_base='lib' if test "$ac_cv_header_winsock2_h" = yes; then @@ -25604,52 +26127,7 @@ - for gl_func in inet_ntop inet_pton; 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. */ - -/* On some systems, this header is not self-consistent. */ -#if !(defined __GLIBC__ || defined __UCLIBC__) -# include -#endif -#ifdef __TANDEM -# include -#endif -#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 @@ -25899,6 +26377,35 @@ + for ac_header in byteswap.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default" +if test "x$ac_cv_header_byteswap_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BYTESWAP_H 1 +_ACEOF + + BYTESWAP_H='' + +else + + BYTESWAP_H='byteswap.h' + +fi + +done + + + if test -n "$BYTESWAP_H"; then + GL_GENERATE_BYTESWAP_H_TRUE= + GL_GENERATE_BYTESWAP_H_FALSE='#' +else + GL_GENERATE_BYTESWAP_H_TRUE='#' + GL_GENERATE_BYTESWAP_H_FALSE= +fi + + + # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. @@ -26056,47 +26563,6 @@ - if test "x$datarootdir" = x; then - datarootdir='${datadir}' - - fi - if test "x$docdir" = x; then - docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' - - fi - if test "x$htmldir" = x; then - htmldir='${docdir}' - - fi - if test "x$dvidir" = x; then - dvidir='${docdir}' - - fi - if test "x$pdfdir" = x; then - pdfdir='${docdir}' - - fi - if test "x$psdir" = x; then - psdir='${docdir}' - - fi - if test "x$lispdir" = x; then - lispdir='${datarootdir}/emacs/site-lisp' - - fi - if test "x$localedir" = x; then - localedir='${datarootdir}/locale' - - fi - if test "x$runstatedir" = x; then - runstatedir='${localstatedir}/run' - - fi - - pkglibexecdir='${libexecdir}/${PACKAGE}' - - - if test "$ac_cv_header_winsock2_h" = yes; then @@ -26126,9 +26592,13 @@ + : +$as_echo "#define GL_COMPILE_CRYPTO_STREAM 1" >>confdefs.h + + @@ -26220,6 +26690,9 @@ +$as_echo "#define GL_COMPILE_CRYPTO_STREAM 1" >>confdefs.h + + @@ -26311,6 +26784,9 @@ +$as_echo "#define GL_COMPILE_CRYPTO_STREAM 1" >>confdefs.h + + @@ -26402,6 +26878,9 @@ +$as_echo "#define GL_COMPILE_CRYPTO_STREAM 1" >>confdefs.h + + @@ -27053,54 +27532,154 @@ - for gl_func in fcntl openat; 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 : + + + + + +cat >>confdefs.h <<_ACEOF +#define GNULIB_FD_SAFER_FLAG 1 +_ACEOF + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5 +$as_echo_n "checking whether fflush works on input streams... " >&6; } +if ${gl_cv_func_fflush_stdin+:} false; then : $as_echo_n "(cached) " >&6 else + echo hello world > conftest.txt + if test "$cross_compiling" = yes; then : + case "$host_os" in + # Guess no on native Windows. + mingw*) gl_cv_func_fflush_stdin="guessing no" ;; + *) gl_cv_func_fflush_stdin=cross ;; + esac + +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +#include +#if HAVE_UNISTD_H +# include +#else /* on Windows with MSVC */ +# include +#endif int main () { -#undef $gl_func - (void) $gl_func; +FILE *f = fopen ("conftest.txt", "r"); + char buffer[10]; + int fd; + int c; + if (f == NULL) + return 1; + fd = fileno (f); + if (fd < 0 || fread (buffer, 1, 5, f) != 5) + { fclose (f); return 2; } + /* For deterministic results, ensure f read a bigger buffer. */ + if (lseek (fd, 0, SEEK_CUR) == 5) + { fclose (f); return 3; } + /* POSIX requires fflush-fseek to set file offset of fd. This fails + on BSD systems and on mingw. */ + if (fflush (f) != 0 || fseek (f, 0, SEEK_CUR) != 0) + { fclose (f); return 4; } + if (lseek (fd, 0, SEEK_CUR) != 5) + { fclose (f); return 5; } + /* Verify behaviour of fflush after ungetc. See + */ + /* Verify behaviour of fflush after a backup ungetc. This fails on + mingw. */ + c = fgetc (f); + ungetc (c, f); + fflush (f); + if (fgetc (f) != c) + { fclose (f); return 6; } + /* Verify behaviour of fflush after a non-backup ungetc. This fails + on glibc 2.8 and on BSD systems. */ + c = fgetc (f); + ungetc ('@', f); + fflush (f); + if (fgetc (f) != c) + { fclose (f); return 7; } + fclose (f); + return 0; + ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$as_gl_Symbol=yes" +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_fflush_stdin=yes else - eval "$as_gl_Symbol=no" + gl_cv_func_fflush_stdin=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam 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 + rm conftest.txt + fi - done +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 +$as_echo "$gl_cv_func_fflush_stdin" >&6; } + case "$gl_cv_func_fflush_stdin" in + *yes) gl_func_fflush_stdin=1 ;; + *no) gl_func_fflush_stdin=0 ;; + *) gl_func_fflush_stdin='(-1)' ;; + esac + +cat >>confdefs.h <<_ACEOF +#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin +_ACEOF + + + case "$gl_cv_func_fflush_stdin" in + *yes) ;; + *) REPLACE_FFLUSH=1 ;; + esac + + if test $REPLACE_FFLUSH = 1; then + + + + + + + gl_LIBOBJS="$gl_LIBOBJS fflush.$ac_objext" + + : + fi cat >>confdefs.h <<_ACEOF -#define GNULIB_FD_SAFER_FLAG 1 +#define GNULIB_FFLUSH 1 _ACEOF + + + + + GNULIB_FFLUSH=1 + + + + + +$as_echo "#define GNULIB_TEST_FFLUSH 1" >>confdefs.h + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flexible array member" >&5 $as_echo_n "checking for flexible array member... " >&6; } if ${ac_cv_c_flexmember+:} false; then : @@ -27420,108 +27999,110 @@ - - FNMATCH_H= gl_fnmatch_required_lowercase=` echo $gl_fnmatch_required | LC_ALL=C tr '[A-Z]' '[a-z]' ` - gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working $gl_fnmatch_required fnmatch" >&5 + + if test $ac_cv_func_fnmatch = no; then + HAVE_FNMATCH=0 + else + gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working $gl_fnmatch_required fnmatch" >&5 $as_echo_n "checking for working $gl_fnmatch_required fnmatch... " >&6; } if eval \${$gl_fnmatch_cache_var+:} false; then : $as_echo_n "(cached) " >&6 else - if test $gl_fnmatch_required = GNU; then - gl_fnmatch_gnu_start= - gl_fnmatch_gnu_end= - else - gl_fnmatch_gnu_start='#if 0' - gl_fnmatch_gnu_end='#endif' - fi - if test "$cross_compiling" = yes; then : + if test $gl_fnmatch_required = GNU; then + gl_fnmatch_gnu_start= + gl_fnmatch_gnu_end= + else + gl_fnmatch_gnu_start='#if 0' + gl_fnmatch_gnu_end='#endif' + fi + if test "$cross_compiling" = yes; then : eval "$gl_fnmatch_cache_var=\"guessing no\"" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - static int - y (char const *pattern, char const *string, int flags) - { - return fnmatch (pattern, string, flags) == 0; - } - static int - n (char const *pattern, char const *string, int flags) - { - return fnmatch (pattern, string, flags) == FNM_NOMATCH; - } + static int + y (char const *pattern, char const *string, int flags) + { + return fnmatch (pattern, string, flags) == 0; + } + static int + n (char const *pattern, char const *string, int flags) + { + return fnmatch (pattern, string, flags) == FNM_NOMATCH; + } int main () { char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]"; - char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]"; - static char const A_1[] = { 'A' - 1, 0 }; - static char const A01[] = { 'A' + 1, 0 }; - static char const a_1[] = { 'a' - 1, 0 }; - static char const a01[] = { 'a' + 1, 0 }; - static char const bs_1[] = { '\\\\' - 1, 0 }; - static char const bs01[] = { '\\\\' + 1, 0 }; - int result = 0; - if (!n ("a*", "", 0)) - return 1; - if (!y ("a*", "abc", 0)) - return 1; - if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */ - return 1; - if (!n ("d*/*1", "d/s/1", FNM_PATHNAME)) - return 2; - if (!y ("a\\\\bc", "abc", 0)) - return 3; - if (!n ("a\\\\bc", "abc", FNM_NOESCAPE)) - return 3; - if (!y ("*x", ".x", 0)) - return 4; - if (!n ("*x", ".x", FNM_PERIOD)) - return 4; - if (!y (Apat, "\\\\", 0)) - return 5; - if (!y (Apat, "A", 0)) - return 5; - if (!y (apat, "\\\\", 0)) - return 5; - if (!y (apat, "a", 0)) - return 5; - if (!(n (Apat, A_1, 0) == ('A' < '\\\\'))) - return 5; - if (!(n (apat, a_1, 0) == ('a' < '\\\\'))) - return 5; - if (!(y (Apat, A01, 0) == ('A' < '\\\\'))) - return 5; - if (!(y (apat, a01, 0) == ('a' < '\\\\'))) - return 5; - if (!(y (Apat, bs_1, 0) == ('A' < '\\\\'))) - return 5; - if (!(y (apat, bs_1, 0) == ('a' < '\\\\'))) - return 5; - if (!(n (Apat, bs01, 0) == ('A' < '\\\\'))) - return 5; - if (!(n (apat, bs01, 0) == ('a' < '\\\\'))) - return 5; - $gl_fnmatch_gnu_start - if (!y ("xxXX", "xXxX", FNM_CASEFOLD)) - result |= 8; - if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)) - result |= 16; - if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME)) - result |= 32; - if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)) - result |= 64; - if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)) - result |= 64; - if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)) - result |= 64; - $gl_fnmatch_gnu_end - return result; + char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]"; + static char const A_1[] = { 'A' - 1, 0 }; + static char const A01[] = { 'A' + 1, 0 }; + static char const a_1[] = { 'a' - 1, 0 }; + static char const a01[] = { 'a' + 1, 0 }; + static char const bs_1[] = { '\\\\' - 1, 0 }; + static char const bs01[] = { '\\\\' + 1, 0 }; + int result = 0; + if (!n ("a*", "", 0)) + return 1; + if (!y ("a*", "abc", 0)) + return 1; + if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */ + return 1; + if (!n ("d*/*1", "d/s/1", FNM_PATHNAME)) + return 2; + if (!y ("a\\\\bc", "abc", 0)) + return 3; + if (!n ("a\\\\bc", "abc", FNM_NOESCAPE)) + return 3; + if (!y ("*x", ".x", 0)) + return 4; + if (!n ("*x", ".x", FNM_PERIOD)) + return 4; + if (!y (Apat, "\\\\", 0)) + return 5; + if (!y (Apat, "A", 0)) + return 5; + if (!y (apat, "\\\\", 0)) + return 5; + if (!y (apat, "a", 0)) + return 5; + if (!(n (Apat, A_1, 0) == ('A' < '\\\\'))) + return 5; + if (!(n (apat, a_1, 0) == ('a' < '\\\\'))) + return 5; + if (!(y (Apat, A01, 0) == ('A' < '\\\\'))) + return 5; + if (!(y (apat, a01, 0) == ('a' < '\\\\'))) + return 5; + if (!(y (Apat, bs_1, 0) == ('A' < '\\\\'))) + return 5; + if (!(y (apat, bs_1, 0) == ('a' < '\\\\'))) + return 5; + if (!(n (Apat, bs01, 0) == ('A' < '\\\\'))) + return 5; + if (!(n (apat, bs01, 0) == ('a' < '\\\\'))) + return 5; + $gl_fnmatch_gnu_start + if (!y ("xxXX", "xXxX", FNM_CASEFOLD)) + result |= 8; + if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)) + result |= 16; + if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME)) + result |= 32; + if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + $gl_fnmatch_gnu_end + return result; ; return 0; @@ -27541,13 +28122,15 @@ eval ac_res=\$$gl_fnmatch_cache_var { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\"" - if test "$gl_fnmatch_result" = yes; then - rm -f "$gl_source_base/fnmatch.h" - else - FNMATCH_H=fnmatch.h + eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\"" + if test "$gl_fnmatch_result" != yes; then + REPLACE_FNMATCH=1 + fi fi + if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then + + FNMATCH_H='fnmatch.h' if test -n "$FNMATCH_H"; then GL_GENERATE_FNMATCH_H_TRUE= GL_GENERATE_FNMATCH_H_FALSE='#' @@ -27557,22 +28140,19 @@ fi - if test -n "$FNMATCH_H"; then - + fi + if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then - gl_LIBOBJS="$gl_LIBOBJS fnmatch.$ac_objext" + gl_LIBOBJS="$gl_LIBOBJS fnmatch.$ac_objext" -cat >>confdefs.h <<_ACEOF -#define fnmatch ${gl_fnmatch_required_lowercase}_fnmatch -_ACEOF ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include @@ -27594,6 +28174,22 @@ + + + GNULIB_FNMATCH=1 + + + + + +$as_echo "#define GNULIB_TEST_FNMATCH 1" >>confdefs.h + + + + + + + case "$host_os" in mingw* | pw*) REPLACE_FOPEN=1 @@ -27686,6 +28282,126 @@ + + ac_fn_c_check_decl "$LINENO" "fpurge" "ac_cv_have_decl_fpurge" "#include +" +if test "x$ac_cv_have_decl_fpurge" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FPURGE $ac_have_decl +_ACEOF + + if test "x$ac_cv_func_fpurge" = xyes; then + HAVE_FPURGE=1 + # Detect BSD bug. Only cygwin 1.7 is known to be immune. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fpurge works" >&5 +$as_echo_n "checking whether fpurge works... " >&6; } +if ${gl_cv_func_fpurge_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + gl_cv_func_fpurge_works='guessing no' +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ +FILE *f = fopen ("conftest.txt", "w+"); + if (!f) + return 1; + if (fputc ('a', f) != 'a') + { fclose (f); return 2; } + rewind (f); + if (fgetc (f) != 'a') + { fclose (f); return 3; } + if (fgetc (f) != EOF) + { fclose (f); return 4; } + if (fpurge (f) != 0) + { fclose (f); return 5; } + if (putc ('b', f) != 'b') + { fclose (f); return 6; } + if (fclose (f) != 0) + return 7; + if ((f = fopen ("conftest.txt", "r")) == NULL) + return 8; + if (fgetc (f) != 'a') + { fclose (f); return 9; } + if (fgetc (f) != 'b') + { fclose (f); return 10; } + if (fgetc (f) != EOF) + { fclose (f); return 11; } + if (fclose (f) != 0) + return 12; + if (remove ("conftest.txt") != 0) + return 13; + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_fpurge_works=yes +else + gl_cv_func_fpurge_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fpurge_works" >&5 +$as_echo "$gl_cv_func_fpurge_works" >&6; } + if test "x$gl_cv_func_fpurge_works" != xyes; then + REPLACE_FPURGE=1 + fi + else + HAVE_FPURGE=0 + fi + if test "x$ac_cv_have_decl_fpurge" = xno; then + HAVE_DECL_FPURGE=0 + fi + + if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS fpurge.$ac_objext" + + fi + + + + + + GNULIB_FPURGE=1 + + + + + +$as_echo "#define GNULIB_TEST_FPURGE 1" >>confdefs.h + + + + + + + + + if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then REPLACE_FSEEK=1 fi @@ -27770,6 +28486,106 @@ REPLACE_FSEEKO=1 fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5 +$as_echo_n "checking whether fflush works on input streams... " >&6; } +if ${gl_cv_func_fflush_stdin+:} false; then : + $as_echo_n "(cached) " >&6 +else + echo hello world > conftest.txt + if test "$cross_compiling" = yes; then : + case "$host_os" in + # Guess no on native Windows. + mingw*) gl_cv_func_fflush_stdin="guessing no" ;; + *) gl_cv_func_fflush_stdin=cross ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if HAVE_UNISTD_H +# include +#else /* on Windows with MSVC */ +# include +#endif + +int +main () +{ +FILE *f = fopen ("conftest.txt", "r"); + char buffer[10]; + int fd; + int c; + if (f == NULL) + return 1; + fd = fileno (f); + if (fd < 0 || fread (buffer, 1, 5, f) != 5) + { fclose (f); return 2; } + /* For deterministic results, ensure f read a bigger buffer. */ + if (lseek (fd, 0, SEEK_CUR) == 5) + { fclose (f); return 3; } + /* POSIX requires fflush-fseek to set file offset of fd. This fails + on BSD systems and on mingw. */ + if (fflush (f) != 0 || fseek (f, 0, SEEK_CUR) != 0) + { fclose (f); return 4; } + if (lseek (fd, 0, SEEK_CUR) != 5) + { fclose (f); return 5; } + /* Verify behaviour of fflush after ungetc. See + */ + /* Verify behaviour of fflush after a backup ungetc. This fails on + mingw. */ + c = fgetc (f); + ungetc (c, f); + fflush (f); + if (fgetc (f) != c) + { fclose (f); return 6; } + /* Verify behaviour of fflush after a non-backup ungetc. This fails + on glibc 2.8 and on BSD systems. */ + c = fgetc (f); + ungetc ('@', f); + fflush (f); + if (fgetc (f) != c) + { fclose (f); return 7; } + fclose (f); + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_fflush_stdin=yes +else + gl_cv_func_fflush_stdin=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + rm conftest.txt + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 +$as_echo "$gl_cv_func_fflush_stdin" >&6; } + case "$gl_cv_func_fflush_stdin" in + *yes) gl_func_fflush_stdin=1 ;; + *no) gl_func_fflush_stdin=0 ;; + *) gl_func_fflush_stdin='(-1)' ;; + esac + +cat >>confdefs.h <<_ACEOF +#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin +_ACEOF + + + case "$gl_cv_func_fflush_stdin" in + *yes) ;; + *) REPLACE_FSEEKO=1 ;; + esac + fi if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then @@ -27795,6 +28611,19 @@ fi done + if test $ac_cv_func__fseeki64 = yes; then + ac_fn_c_check_decl "$LINENO" "_fseeki64" "ac_cv_have_decl__fseeki64" "$ac_includes_default" +if test "x$ac_cv_have_decl__fseeki64" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL__FSEEKI64 $ac_have_decl +_ACEOF + + fi fi @@ -28949,7 +29778,7 @@ int main () { -/* On Ultrix 4.3, getgroups (0, 0) always fails. */ +/* On NeXTstep 3.2, getgroups (0, 0) always fails. */ return getgroups (0, 0) == -1; ; return 0; @@ -29263,18 +30092,178 @@ fi + if test $HAVE_GETPASS = 0 || test $REPLACE_GETPASS = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS getpass.$ac_objext" + + + + + ac_fn_c_check_decl "$LINENO" "__fsetlocking" "ac_cv_have_decl___fsetlocking" "#include + #if HAVE_STDIO_EXT_H + #include + #endif +" +if test "x$ac_cv_have_decl___fsetlocking" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL___FSETLOCKING $ac_have_decl +_ACEOF + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcgetattr" >&5 +$as_echo_n "checking for tcgetattr... " >&6; } +if ${gl_cv_func_tcgetattr+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + struct termios x; + +int +main () +{ +return tcgetattr(0,&x); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_func_tcgetattr=yes +else + gl_cv_func_tcgetattr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_tcgetattr" >&5 +$as_echo "$gl_cv_func_tcgetattr" >&6; } + if test $gl_cv_func_tcgetattr = yes; then + HAVE_TCGETATTR=1 + else + HAVE_TCGETATTR=0 + fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_TCGETATTR $HAVE_TCGETATTR +_ACEOF + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcsetattr" >&5 +$as_echo_n "checking for tcsetattr... " >&6; } +if ${gl_cv_func_tcsetattr+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + struct termios x; + +int +main () +{ +return tcsetattr(0,0,&x); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_func_tcsetattr=yes +else + gl_cv_func_tcsetattr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_tcsetattr" >&5 +$as_echo "$gl_cv_func_tcsetattr" >&6; } + if test $gl_cv_func_tcsetattr = yes; then + HAVE_TCSETATTR=1 + else + HAVE_TCSETATTR=0 + fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_TCSETATTR $HAVE_TCSETATTR +_ACEOF + + + fi + + + + + GNULIB_GETPASS=1 - REPLACE_GETPASS=1 - if test $REPLACE_GETPASS = 1; then -$as_echo "#define getpass gnu_getpass" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETPASS 1" >>confdefs.h + + + + + + + + if test $ac_cv_func_getpass = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpass without length limitations" >&5 +$as_echo_n "checking for getpass without length limitations... " >&6; } +if ${gl_cv_func_getpass_good+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ + Lucky GNU user + #endif +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Lucky GNU user" >/dev/null 2>&1; then : + gl_cv_func_getpass_good=yes +else + gl_cv_func_getpass_good=no +fi +rm -f conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getpass_good" >&5 +$as_echo "$gl_cv_func_getpass_good" >&6; } + if test $gl_cv_func_getpass_good != yes; then + REPLACE_GETPASS=1 + fi fi - if test $REPLACE_GETPASS = 1; then + if test $HAVE_GETPASS = 0 || test $REPLACE_GETPASS = 1; then @@ -29308,10 +30297,106 @@ - : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcgetattr" >&5 +$as_echo_n "checking for tcgetattr... " >&6; } +if ${gl_cv_func_tcgetattr+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + struct termios x; + +int +main () +{ +return tcgetattr(0,&x); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_func_tcgetattr=yes +else + gl_cv_func_tcgetattr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_tcgetattr" >&5 +$as_echo "$gl_cv_func_tcgetattr" >&6; } + if test $gl_cv_func_tcgetattr = yes; then + HAVE_TCGETATTR=1 + else + HAVE_TCGETATTR=0 + fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_TCGETATTR $HAVE_TCGETATTR +_ACEOF + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcsetattr" >&5 +$as_echo_n "checking for tcsetattr... " >&6; } +if ${gl_cv_func_tcsetattr+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + struct termios x; + +int +main () +{ +return tcsetattr(0,0,&x); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_func_tcsetattr=yes +else + gl_cv_func_tcsetattr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_tcsetattr" >&5 +$as_echo "$gl_cv_func_tcsetattr" >&6; } + if test $gl_cv_func_tcsetattr = yes; then + HAVE_TCSETATTR=1 + else + HAVE_TCSETATTR=0 + fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_TCSETATTR $HAVE_TCSETATTR +_ACEOF + fi + + + + + GNULIB_GETPASS=1 + + + + + +$as_echo "#define GNULIB_TEST_GETPASS 1" >>confdefs.h + + + + if test "$ac_cv_header_winsock2_h" = yes; then @@ -29705,10 +30790,6 @@ - : - - - HOSTENT_LIB= gl_saved_libs="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 @@ -29925,6 +31006,10 @@ + + + + HAVE_INET_NTOP=1 INET_NTOP_LIB= @@ -30640,12 +31725,13 @@ HAVE_LANGINFO_CODESET=0 HAVE_LANGINFO_T_FMT_AMPM=0 + HAVE_LANGINFO_ALTMON=0 HAVE_LANGINFO_ERA=0 HAVE_LANGINFO_YESEXPR=0 if test $ac_cv_header_langinfo_h = yes; then HAVE_LANGINFO_H=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5 $as_echo_n "checking whether langinfo.h defines CODESET... " >&6; } if ${gl_cv_header_langinfo_codeset+:} false; then : $as_echo_n "(cached) " >&6 @@ -30707,6 +31793,37 @@ if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then HAVE_LANGINFO_T_FMT_AMPM=1 fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ALTMON_1" >&5 +$as_echo_n "checking whether langinfo.h defines ALTMON_1... " >&6; } +if ${gl_cv_header_langinfo_altmon+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int a = ALTMON_1; + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_header_langinfo_altmon=yes +else + gl_cv_header_langinfo_altmon=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_altmon" >&5 +$as_echo "$gl_cv_header_langinfo_altmon" >&6; } + if test $gl_cv_header_langinfo_altmon = yes; then + HAVE_LANGINFO_ALTMON=1 + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ERA" >&5 $as_echo_n "checking whether langinfo.h defines ERA... " >&6; } if ${gl_cv_header_langinfo_era+:} false; then : @@ -30779,46 +31896,43 @@ - for gl_func in nl_langinfo; 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 "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5 +$as_echo_n "checking whether the compiler supports the __inline keyword... " >&6; } +if ${gl_cv_c___inline+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - +typedef int foo_t; + static __inline foo_t foo (void) { return 0; } int main () { -#undef $gl_func - (void) $gl_func; +return foo (); ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - eval "$as_gl_Symbol=yes" + gl_cv_c___inline=yes else - eval "$as_gl_Symbol=no" + gl_cv_c___inline=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}: result: $gl_cv_c___inline" >&5 +$as_echo "$gl_cv_c___inline" >&6; } + if test $gl_cv_c___inline = yes; then +$as_echo "#define HAVE___INLINE 1" >>confdefs.h + fi @@ -30847,10 +31961,12 @@ fi if test "$cross_compiling" = yes; then : case "$host_os" in - # 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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_link_works="guessing yes" ;; + # 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 @@ -30958,12 +32074,7 @@ - - - - - - LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" + LOCALCHARSET_TESTS_ENVIRONMENT= @@ -31156,48 +32267,7 @@ - for gl_func in setlocale duplocale; 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 systems provide declarations in a non-standard header. */ -#if HAVE_XLOCALE_H -# 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 @@ -32367,6 +33437,7 @@ gl_LIBOBJS="$gl_LIBOBJS mbrtowc.$ac_objext" + : fi @@ -33095,10 +34166,12 @@ rm -rf conftest.dir if test "$cross_compiling" = yes; then : case "$host_os" in - # 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 + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # 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 @@ -33114,9 +34187,9 @@ fi rm -f conftest* - ;; - # If we don't know, assume the worst. - *) 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 else @@ -33506,6 +34579,8 @@ + + nanosleep_save_libs=$LIBS # Solaris 2.5.1 needs -lposix4 to get the nanosleep function. @@ -33613,40 +34688,49 @@ ? (t) -1 \ : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) + #if HAVE_DECL_ALARM static void check_for_SIGALRM (int sig) { if (sig != SIGALRM) _exit (1); } + #endif int main () { static struct timespec ts_sleep; static struct timespec ts_remaining; - static struct sigaction act; /* Test for major problems first. */ if (! nanosleep) return 2; - act.sa_handler = check_for_SIGALRM; - sigemptyset (&act.sa_mask); - sigaction (SIGALRM, &act, NULL); ts_sleep.tv_sec = 0; ts_sleep.tv_nsec = 1; - alarm (1); - if (nanosleep (&ts_sleep, NULL) != 0) + #if HAVE_DECL_ALARM + { + static struct sigaction act; + act.sa_handler = check_for_SIGALRM; + sigemptyset (&act.sa_mask); + sigaction (SIGALRM, &act, NULL); + alarm (1); + if (nanosleep (&ts_sleep, NULL) != 0) + return 3; + /* Test for a minor problem: the handling of large arguments. */ + ts_sleep.tv_sec = TYPE_MAXIMUM (time_t); + ts_sleep.tv_nsec = 999999999; + alarm (1); + if (nanosleep (&ts_sleep, &ts_remaining) != -1) + return 4; + if (errno != EINTR) + return 5; + if (ts_remaining.tv_sec <= TYPE_MAXIMUM (time_t) - 10) + return 6; + } + #else /* A simpler test for native Windows. */ + if (nanosleep (&ts_sleep, &ts_remaining) < 0) return 3; - /* Test for a minor problem: the handling of large arguments. */ - ts_sleep.tv_sec = TYPE_MAXIMUM (time_t); - ts_sleep.tv_nsec = 999999999; - alarm (1); - if (nanosleep (&ts_sleep, &ts_remaining) != -1) - return 4; - if (errno != EINTR) - return 5; - if (ts_remaining.tv_sec <= TYPE_MAXIMUM (time_t) - 10) - return 6; + #endif return 0; } _ACEOF @@ -33812,67 +34896,31 @@ - for gl_func in getaddrinfo freeaddrinfo gai_strerror getnameinfo; 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 "$as_me:${as_lineno-$LINENO}: checking whether is self-contained" >&5 +$as_echo_n "checking whether is self-contained... " >&6; } +if ${gl_cv_header_netinet_in_h_selfcontained+:} 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 () { -#undef $gl_func - (void) $gl_func; + ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - eval "$as_gl_Symbol=yes" + gl_cv_header_netinet_in_h_selfcontained=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_netinet_in_h_selfcontained+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_header_netinet_in_h_selfcontained=yes -else - gl_cv_header_netinet_in_h_selfcontained=no + gl_cv_header_netinet_in_h_selfcontained=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -34047,8 +35095,11 @@ #define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_WORKS _ACEOF - if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \ - && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then + if test $HAVE_LANGINFO_CODESET = 1 \ + && test $HAVE_LANGINFO_T_FMT_AMPM = 1 \ + && test $HAVE_LANGINFO_ALTMON = 1 \ + && test $HAVE_LANGINFO_ERA = 1 \ + && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then : else REPLACE_NL_LANGINFO=1 @@ -34389,7 +35440,7 @@ esac fi - if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then @@ -34473,7 +35524,7 @@ esac fi - if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then @@ -34559,7 +35610,7 @@ esac fi - if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then @@ -35652,10 +36703,12 @@ if test "$cross_compiling" = yes; then : case "$host_os" in - # 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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_select_detects_ebadf="guessing yes" ;; + # 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 @@ -35938,6 +36991,9 @@ + + + if test $ac_cv_func_sigaction = yes; then ac_fn_c_check_member "$LINENO" "struct sigaction" "sa_sigaction" "ac_cv_member_struct_sigaction_sa_sigaction" "#include " @@ -36112,44 +37168,7 @@ - for gl_func in pthread_sigmask sigaction sigaddset sigdelset sigemptyset sigfillset sigismember sigpending sigprocmask; 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 @@ -36548,7 +37567,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5 $as_echo_n "checking for socklen_t equivalent... " >&6; } - if ${gl_cv_socklen_t_equiv+:} false; then : +if ${gl_cv_socklen_t_equiv+:} false; then : $as_echo_n "(cached) " >&6 else # Systems have either "struct sockaddr *" or @@ -36579,13 +37598,12 @@ done test "$gl_cv_socklen_t_equiv" != "" && break done + if test "$gl_cv_socklen_t_equiv" = ""; then + as_fn_error $? "Cannot find a type to use in place of socklen_t" "$LINENO" 5 + fi fi - - if test "$gl_cv_socklen_t_equiv" = ""; then - as_fn_error $? "Cannot find a type to use in place of socklen_t" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5 $as_echo "$gl_cv_socklen_t_equiv" >&6; } cat >>confdefs.h <<_ACEOF @@ -36724,44 +37742,7 @@ - for gl_func in posix_spawn posix_spawnp posix_spawnattr_init posix_spawnattr_destroy posix_spawnattr_getsigdefault posix_spawnattr_setsigdefault posix_spawnattr_getsigmask posix_spawnattr_setsigmask posix_spawnattr_getflags posix_spawnattr_setflags posix_spawnattr_getpgroup posix_spawnattr_setpgroup posix_spawnattr_getschedpolicy posix_spawnattr_setschedpolicy posix_spawnattr_getschedparam posix_spawnattr_setschedparam posix_spawn_file_actions_init posix_spawn_file_actions_destroy posix_spawn_file_actions_addopen posix_spawn_file_actions_addclose posix_spawn_file_actions_adddup2; 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 @@ -36821,10 +37802,12 @@ fi if test "$cross_compiling" = yes; then : 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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;; + # 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 @@ -37162,19 +38145,49 @@ STDDEF_H= - ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include -" -if test "x$ac_cv_type_max_align_t" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5 +$as_echo_n "checking for good max_align_t... " >&6; } +if ${gl_cv_type_max_align_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + unsigned int s = sizeof (max_align_t); + #if defined __GNUC__ || defined __IBM__ALIGNOF__ + int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; + int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1]; + #endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_type_max_align_t=yes else - HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h + gl_cv_type_max_align_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5 +$as_echo "$gl_cv_type_max_align_t" >&6; } + if test $gl_cv_type_max_align_t = no; then + HAVE_MAX_ALIGN_T=0 + STDDEF_H=stddef.h + fi if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 STDDEF_H=stddef.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5 $as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; } if ${gl_cv_decl_null_works+:} false; then : @@ -37207,6 +38220,7 @@ STDDEF_H=stddef.h fi + if test -n "$STDDEF_H"; then GL_GENERATE_STDDEF_H_TRUE= GL_GENERATE_STDDEF_H_FALSE='#' @@ -37381,7 +38395,7 @@ /* For non-mingw systems, compilation will trivially succeed. For mingw, compilation will succeed for older mingw (system printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ - #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \ + #if (defined _WIN32 && ! defined __CYGWIN__) && \ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; #endif @@ -37463,44 +38477,7 @@ - for gl_func in dprintf fpurge fseeko ftello getdelim getline gets pclose popen renameat snprintf tmpfile vdprintf vsnprintf; 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 @@ -37578,50 +38555,7 @@ - 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; } -if eval \${$as_gl_Symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#if HAVE_SYS_LOADAVG_H -# include -#endif -#if HAVE_RANDOM_H -# 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 @@ -38546,10 +39480,12 @@ else if test "$cross_compiling" = yes; then : case "$host_os" in - # 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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_symlink_works="guessing yes" ;; + # 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 @@ -38711,44 +39647,7 @@ - for gl_func in flock; 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 @@ -38869,48 +39768,7 @@ - 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 @@ -39027,44 +39885,7 @@ - for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat mknod mknodat stat utimensat; 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 @@ -39247,43 +40068,7 @@ - for gl_func in waitpid; 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 @@ -39828,56 +40613,7 @@ - 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; } -if eval \${$as_gl_Symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#if HAVE_UNISTD_H -# include -#endif -/* Some systems declare various items in the wrong headers. */ -#if !(defined __GLIBC__ && !defined __UCLIBC__) -# include -# include -# include -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -# include -# endif -#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 @@ -40140,12 +40876,14 @@ fi if test "$cross_compiling" = yes; then : 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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # 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 else @@ -40383,6 +41121,7 @@ + if test $gl_cv_have_include_next = yes; then gl_cv_next_utime_h='<'utime.h'>' else @@ -40461,14 +41200,19 @@ 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 false; then + UTIME_H=utime.h + else + 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 + fi + if test -n "$UTIME_H"; then GL_GENERATE_UTIME_H_TRUE= @@ -40480,44 +41224,7 @@ - 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 @@ -40534,10 +41241,12 @@ touch conftest.file if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_futimesat_works="guessing no" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_futimesat_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_futimesat_works="guessing no" ;; esac else @@ -41062,54 +41771,7 @@ - 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; } -if eval \${$as_gl_Symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be - included before . */ -#if !(defined __GLIBC__ && !defined __UCLIBC__) -# include -# include -# include -#endif -#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 @@ -41723,55 +42385,7 @@ fi - for gl_func in wctype iswctype wctrans towctrans ; 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. */ - -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be - included before . */ -#if !(defined __GLIBC__ && !defined __UCLIBC__) -# include -# include -# include -# include -#endif -#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 @@ -41927,6 +42541,10 @@ gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext" + + + : + fi @@ -42054,13 +42672,10 @@ - LIBGNU_LIBDEPS="$gl_libdeps" LIBGNU_LTLIBDEPS="$gl_ltlibdeps" - LIBTESTS_LIBDEPS="$gltests_libdeps" - @@ -43254,7 +43869,6 @@ - use_additional=yes acl_save_prefix="$prefix" @@ -43292,7 +43906,7 @@ additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then + && test ! -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -43709,7 +44323,6 @@ - ac_save_CPPFLAGS="$CPPFLAGS" for element in $INCSSL; do @@ -43959,7 +44572,6 @@ - use_additional=yes acl_save_prefix="$prefix" @@ -43997,7 +44609,7 @@ additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then + && test ! -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -44414,7 +45026,6 @@ - ac_save_CPPFLAGS="$CPPFLAGS" for element in $INCGNUTLS; do @@ -44622,305 +45233,36 @@ fi -# Check whether --with-gpgme-prefix was given. -if test "${with_gpgme_prefix+set}" = set; then : - withval=$with_gpgme_prefix; gpgme_config_prefix="$withval" -else - gpgme_config_prefix="" -fi - - if test x"${GPGME_CONFIG}" = x ; then - if test x"${gpgme_config_prefix}" != x ; then - GPGME_CONFIG="${gpgme_config_prefix}/bin/gpgme-config" - else - case "${SYSROOT}" in - /*) - if test -x "${SYSROOT}/bin/gpgme-config" ; then - GPGME_CONFIG="${SYSROOT}/bin/gpgme-config" - fi - ;; - '') - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5 -$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;} - ;; - esac - fi - fi - # Extract the first word of "gpgme-config", so it can be a program name with args. -set dummy gpgme-config; 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_path_GPGME_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GPGME_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GPGME_CONFIG="$GPGME_CONFIG" # Let the user override the test with a path. - ;; - *) - 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_path_GPGME_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $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 +# Check whether --enable-ipv6 was given. +if test "${enable_ipv6+set}" = set; then : + enableval=$enable_ipv6; case "${enable_ipv6}" in + no) + { $as_echo "$as_me:${as_lineno-$LINENO}: disabling IPv6 at user request" >&5 +$as_echo "$as_me: disabling IPv6 at user request" >&6;} + ipv6=no + ;; + yes) + ipv6=yes + force_ipv6=yes + ;; + auto) + ipv6=yes + ;; + *) + as_fn_error $? "Invalid --enable-ipv6 argument \`$enable_ipv6'" "$LINENO" 5 + ;; + esac - test -z "$ac_cv_path_GPGME_CONFIG" && ac_cv_path_GPGME_CONFIG="no" - ;; -esac -fi -GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG -if test -n "$GPGME_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGME_CONFIG" >&5 -$as_echo "$GPGME_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + ipv6=yes - if test "$GPGME_CONFIG" != "no" ; then - gpgme_version=`$GPGME_CONFIG --version` - fi - gpgme_version_major=`echo $gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` - gpgme_version_minor=`echo $gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` - gpgme_version_micro=`echo $gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` +fi -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; } - -if test -n "$METALINK_CFLAGS"; then - pkg_cv_METALINK_CFLAGS="$METALINK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmetalink\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libmetalink") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_METALINK_CFLAGS=`$PKG_CONFIG --cflags "libmetalink" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$METALINK_LIBS"; then - pkg_cv_METALINK_LIBS="$METALINK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmetalink\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libmetalink") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_METALINK_LIBS=`$PKG_CONFIG --libs "libmetalink" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - METALINK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmetalink" 2>&1` - else - METALINK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmetalink" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$METALINK_PKG_ERRORS" >&5 - - - with_metalink=no - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - - with_metalink=no - -else - METALINK_CFLAGS=$pkg_cv_METALINK_CFLAGS - METALINK_LIBS=$pkg_cv_METALINK_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - LIBS="$METALINK_LIBS $LIBS" - CFLAGS="$METALINK_CFLAGS $CFLAGS" - -$as_echo "#define HAVE_METALINK 1" >>confdefs.h - - with_metalink=yes - -fi - - have_gpg=no - if test x"$with_metalink" = xyes; then : - - - tmp=1:0.4.2 - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` - min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` - else - req_gpgme_api=0 - min_gpgme_version="$tmp" - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGME - version >= $min_gpgme_version" >&5 -$as_echo_n "checking for GPGME - version >= $min_gpgme_version... " >&6; } - ok=no - if test "$GPGME_CONFIG" != "no" ; then - req_major=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` - req_minor=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` - req_micro=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` - if test "$gpgme_version_major" -gt "$req_major"; then - ok=yes - else - if test "$gpgme_version_major" -eq "$req_major"; then - if test "$gpgme_version_minor" -gt "$req_minor"; then - ok=yes - else - if test "$gpgme_version_minor" -eq "$req_minor"; then - if test "$gpgme_version_micro" -ge "$req_micro"; then - ok=yes - fi - fi - fi - fi - fi - fi - if test $ok = yes; then - # If we have a recent GPGME, we should also check that the - # API is compatible. - if test "$req_gpgme_api" -gt 0 ; then - tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - if test "$req_gpgme_api" -ne "$tmp" ; then - ok=no - fi - fi - fi - fi - if test $ok = yes; then - GPGME_CFLAGS=`$GPGME_CONFIG --cflags` - GPGME_LIBS=`$GPGME_CONFIG --libs` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - LIBS="$GPGME_LIBS $LIBS" - CFLAGS="$GPGME_CFLAGS $CFLAGS" - -$as_echo "#define HAVE_GPGME 1" >>confdefs.h - - have_gpg=yes - - - gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none` - if test x"$gpgme_config_host" != xnone ; then - if test x"$gpgme_config_host" != x"$host" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -*** -*** The config script $GPGME_CONFIG was -*** built for $gpgme_config_host and thus may not match the -*** used host $host. -*** You may want to use the configure option --with-gpgme-prefix -*** to specify a matching config script or use \$SYSROOT. -***" >&5 -$as_echo "$as_me: WARNING: -*** -*** The config script $GPGME_CONFIG was -*** built for $gpgme_config_host and thus may not match the -*** used host $host. -*** You may want to use the configure option --with-gpgme-prefix -*** to specify a matching config script or use \$SYSROOT. -***" >&2;} - gpg_config_script_warn="$gpg_config_script_warn gpgme" - fi - fi - - else - GPGME_CFLAGS="" - GPGME_LIBS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : - fi - - - - - -fi - -fi - - - -# Check whether --enable-ipv6 was given. -if test "${enable_ipv6+set}" = set; then : - enableval=$enable_ipv6; case "${enable_ipv6}" in - no) - { $as_echo "$as_me:${as_lineno-$LINENO}: disabling IPv6 at user request" >&5 -$as_echo "$as_me: disabling IPv6 at user request" >&6;} - ipv6=no - ;; - yes) - ipv6=yes - force_ipv6=yes - ;; - auto) - ipv6=yes - ;; - *) - as_fn_error $? "Invalid --enable-ipv6 argument \`$enable_ipv6'" "$LINENO" 5 - ;; - esac - -else - - ipv6=yes - - -fi - - -if test "X$ipv6" = "Xyes"; then +if test "X$ipv6" = "Xyes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for INET6 protocol support" >&5 $as_echo_n "checking for INET6 protocol support... " >&6; } @@ -45686,13 +46028,210 @@ fi +# Check whether --enable-pcre2 was given. +if test "${enable_pcre2+set}" = set; then : + enableval=$enable_pcre2; +fi + # Check whether --enable-pcre was given. if test "${enable_pcre+set}" = set; then : enableval=$enable_pcre; fi -if test "X$enable_pcre" != "Xno"; then : +if test "X$enable_pcre2" != "Xno"; then : + + enable_pcre2=no + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE2" >&5 +$as_echo_n "checking for PCRE2... " >&6; } + +if test -n "$PCRE2_CFLAGS"; then + pkg_cv_PCRE2_CFLAGS="$PCRE2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre2-8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PCRE2_CFLAGS=`$PKG_CONFIG --cflags "libpcre2-8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PCRE2_LIBS"; then + pkg_cv_PCRE2_LIBS="$PCRE2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpcre2-8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs "libpcre2-8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + PCRE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre2-8" 2>&1` + else + PCRE2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre2-8" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PCRE2_PKG_ERRORS" >&5 + + + ac_fn_c_check_header_mongrel "$LINENO" "pcre2.h" "ac_cv_header_pcre2_h" "$ac_includes_default" +if test "x$ac_cv_header_pcre2_h" = xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre2_compile_8 in -lpcre2-8" >&5 +$as_echo_n "checking for pcre2_compile_8 in -lpcre2-8... " >&6; } +if ${ac_cv_lib_pcre2_8_pcre2_compile_8+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcre2-8 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pcre2_compile_8 (); +int +main () +{ +return pcre2_compile_8 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pcre2_8_pcre2_compile_8=yes +else + ac_cv_lib_pcre2_8_pcre2_compile_8=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre2_8_pcre2_compile_8" >&5 +$as_echo "$ac_cv_lib_pcre2_8_pcre2_compile_8" >&6; } +if test "x$ac_cv_lib_pcre2_8_pcre2_compile_8" = xyes; then : + + LIBS="${LIBS} -lpcre2-8" + +$as_echo "#define HAVE_LIBPCRE2 1" >>confdefs.h + + enable_pcre2=yes + +fi + + +fi + + + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + ac_fn_c_check_header_mongrel "$LINENO" "pcre2.h" "ac_cv_header_pcre2_h" "$ac_includes_default" +if test "x$ac_cv_header_pcre2_h" = xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre2_compile_8 in -lpcre2-8" >&5 +$as_echo_n "checking for pcre2_compile_8 in -lpcre2-8... " >&6; } +if ${ac_cv_lib_pcre2_8_pcre2_compile_8+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcre2-8 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pcre2_compile_8 (); +int +main () +{ +return pcre2_compile_8 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pcre2_8_pcre2_compile_8=yes +else + ac_cv_lib_pcre2_8_pcre2_compile_8=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre2_8_pcre2_compile_8" >&5 +$as_echo "$ac_cv_lib_pcre2_8_pcre2_compile_8" >&6; } +if test "x$ac_cv_lib_pcre2_8_pcre2_compile_8" = xyes; then : + + LIBS="${LIBS} -lpcre2-8" + +$as_echo "#define HAVE_LIBPCRE2 1" >>confdefs.h + + enable_pcre2=yes + +fi + + +fi + + + +else + PCRE2_CFLAGS=$pkg_cv_PCRE2_CFLAGS + PCRE2_LIBS=$pkg_cv_PCRE2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CFLAGS="$PCRE2_CFLAGS $CFLAGS" + LIBS="$PCRE2_LIBS $LIBS" + +$as_echo "#define HAVE_LIBPCRE2 1" >>confdefs.h + + enable_pcre2=yes + +fi + +fi + +if test "X$enable_pcre" != "Xno" && test "X$enable_pcre2" != "Xyes"; then : pkg_failed=no @@ -45878,6 +46417,7 @@ $as_echo "#define HAVE_LIBPCRE 1" >>confdefs.h + enable_pcre=yes fi @@ -45887,6 +46427,14 @@ fi +if test "X$enable_pcre2" = Xyes; then : + PCRE_INFO="yes, via libpcre2" +elif test "X$enable_pcre" = Xyes; then : + PCRE_INFO="yes, via libpcre" +else + PCRE_INFO=no +fi + if test "X$with_cares" = "Xyes"; then : @@ -46091,6 +46639,278 @@ fi +# Check whether --with-gpgme-prefix was given. +if test "${with_gpgme_prefix+set}" = set; then : + withval=$with_gpgme_prefix; gpgme_config_prefix="$withval" +else + gpgme_config_prefix="" +fi + + if test x"${GPGME_CONFIG}" = x ; then + if test x"${gpgme_config_prefix}" != x ; then + GPGME_CONFIG="${gpgme_config_prefix}/bin/gpgme-config" + else + case "${SYSROOT}" in + /*) + if test -x "${SYSROOT}/bin/gpgme-config" ; then + GPGME_CONFIG="${SYSROOT}/bin/gpgme-config" + fi + ;; + '') + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5 +$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;} + ;; + esac + fi + fi + + # Extract the first word of "gpgme-config", so it can be a program name with args. +set dummy gpgme-config; 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_path_GPGME_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GPGME_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_GPGME_CONFIG="$GPGME_CONFIG" # Let the user override the test with a path. + ;; + *) + 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_path_GPGME_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $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 + + test -z "$ac_cv_path_GPGME_CONFIG" && ac_cv_path_GPGME_CONFIG="no" + ;; +esac +fi +GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG +if test -n "$GPGME_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGME_CONFIG" >&5 +$as_echo "$GPGME_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + if test "$GPGME_CONFIG" != "no" ; then + gpgme_version=`$GPGME_CONFIG --version` + fi + gpgme_version_major=`echo $gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` + gpgme_version_minor=`echo $gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` + gpgme_version_micro=`echo $gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` + +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; } + +if test -n "$METALINK_CFLAGS"; then + pkg_cv_METALINK_CFLAGS="$METALINK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmetalink\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmetalink") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_METALINK_CFLAGS=`$PKG_CONFIG --cflags "libmetalink" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$METALINK_LIBS"; then + pkg_cv_METALINK_LIBS="$METALINK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmetalink\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmetalink") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_METALINK_LIBS=`$PKG_CONFIG --libs "libmetalink" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + METALINK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmetalink" 2>&1` + else + METALINK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmetalink" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$METALINK_PKG_ERRORS" >&5 + + + with_metalink=no + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + with_metalink=no + +else + METALINK_CFLAGS=$pkg_cv_METALINK_CFLAGS + METALINK_LIBS=$pkg_cv_METALINK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + LIBS="$METALINK_LIBS $LIBS" + CFLAGS="$METALINK_CFLAGS $CFLAGS" + +$as_echo "#define HAVE_METALINK 1" >>confdefs.h + + with_metalink=yes + +fi + + have_gpg=no + if test x"$with_metalink" = xyes; then : + + + tmp=1:0.4.2 + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` + min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` + else + req_gpgme_api=0 + min_gpgme_version="$tmp" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGME - version >= $min_gpgme_version" >&5 +$as_echo_n "checking for GPGME - version >= $min_gpgme_version... " >&6; } + ok=no + if test "$GPGME_CONFIG" != "no" ; then + req_major=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` + req_minor=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` + req_micro=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` + if test "$gpgme_version_major" -gt "$req_major"; then + ok=yes + else + if test "$gpgme_version_major" -eq "$req_major"; then + if test "$gpgme_version_minor" -gt "$req_minor"; then + ok=yes + else + if test "$gpgme_version_minor" -eq "$req_minor"; then + if test "$gpgme_version_micro" -ge "$req_micro"; then + ok=yes + fi + fi + fi + fi + fi + fi + if test $ok = yes; then + # If we have a recent GPGME, we should also check that the + # API is compatible. + if test "$req_gpgme_api" -gt 0 ; then + tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + if test "$req_gpgme_api" -ne "$tmp" ; then + ok=no + fi + fi + fi + fi + if test $ok = yes; then + GPGME_CFLAGS=`$GPGME_CONFIG --cflags` + GPGME_LIBS=`$GPGME_CONFIG --libs` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + # Put libgpgme to the end of the library list since it introduces a -L linker flags. + # That -L might break the build if there are two different version of + # a library (e.g. GnuTLS) in /usr/local and in the system directory. + LIBS="$LIBS $GPGME_LIBS" + CFLAGS="$GPGME_CFLAGS $CFLAGS" + +$as_echo "#define HAVE_GPGME 1" >>confdefs.h + + have_gpg=yes + + + gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none` + if test x"$gpgme_config_host" != xnone ; then + if test x"$gpgme_config_host" != x"$host" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +*** +*** The config script $GPGME_CONFIG was +*** built for $gpgme_config_host and thus may not match the +*** used host $host. +*** You may want to use the configure option --with-gpgme-prefix +*** to specify a matching config script or use \$SYSROOT. +***" >&5 +$as_echo "$as_me: WARNING: +*** +*** The config script $GPGME_CONFIG was +*** built for $gpgme_config_host and thus may not match the +*** used host $host. +*** You may want to use the configure option --with-gpgme-prefix +*** to specify a matching config script or use \$SYSROOT. +***" >&2;} + gpg_config_script_warn="$gpg_config_script_warn gpgme" + fi + fi + + else + GPGME_CFLAGS="" + GPGME_LIBS="" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : + fi + + + + + +fi + +fi + + # Check whether --enable-xattr was given. if test "${enable_xattr+set}" = set; then : enableval=$enable_xattr; ENABLE_XATTR=$enableval @@ -46318,6 +47138,10 @@ as_fn_error $? "conditional \"GL_GENERATE_ALLOCA_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GL_GENERATE_BYTESWAP_H_TRUE}" && test -z "${GL_GENERATE_BYTESWAP_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_BYTESWAP_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GL_GENERATE_ERRNO_H_TRUE}" && test -z "${GL_GENERATE_ERRNO_H_FALSE}"; then as_fn_error $? "conditional \"GL_GENERATE_ERRNO_H\" was never defined. @@ -46331,6 +47155,10 @@ as_fn_error $? "conditional \"GL_GENERATE_FNMATCH_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GL_GENERATE_FNMATCH_H_TRUE}" && test -z "${GL_GENERATE_FNMATCH_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_FNMATCH_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GL_GENERATE_ICONV_H_TRUE}" && test -z "${GL_GENERATE_ICONV_H_FALSE}"; then as_fn_error $? "conditional \"GL_GENERATE_ICONV_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -46871,7 +47699,7 @@ # 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.5, which was +This file was extended by wget $as_me 1.20.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -46941,7 +47769,7 @@ 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.5 +wget config.status 1.20.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -47060,7 +47888,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it # from automake < 1.5. @@ -47724,29 +48552,35 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -47764,53 +48598,48 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "po-directories":C) @@ -47977,6 +48806,7 @@ SSL: $with_ssl Zlib: $with_zlib PSL: $with_libpsl + PCRE: $PCRE_INFO Digest: $ENABLE_DIGEST NTLM: $ENABLE_NTLM OPIE: $ENABLE_OPIE @@ -48002,6 +48832,7 @@ SSL: $with_ssl Zlib: $with_zlib PSL: $with_libpsl + PCRE: $PCRE_INFO Digest: $ENABLE_DIGEST NTLM: $ENABLE_NTLM OPIE: $ENABLE_OPIE diff -Nru wget-1.19.5/configure.ac wget-1.20.1/configure.ac --- wget-1.19.5/configure.ac 2018-05-05 20:46:22.000000000 +0000 +++ wget-1.20.1/configure.ac 2018-12-26 19:58:38.000000000 +0000 @@ -33,7 +33,7 @@ AC_INIT([wget], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [bug-wget@gnu.org]) -AC_PREREQ(2.61) +AC_PREREQ(2.63) dnl dnl What version of Wget are we building? @@ -493,35 +493,6 @@ fi fi -dnl -dnl Check for libmetalink -dnl -AS_IF([test x"$with_metalink" != xno], [ - PKG_CHECK_MODULES([METALINK], libmetalink, [ - LIBS="$METALINK_LIBS $LIBS" - CFLAGS="$METALINK_CFLAGS $CFLAGS" - AC_DEFINE([HAVE_METALINK], [1], [Define if using metalink.]) - with_metalink=yes - ], [ - with_metalink=no - ]) - - have_gpg=no - AS_IF([test x"$with_metalink" = xyes], [ - dnl - dnl Check for GPGME - dnl - m4_ifdef([AM_PATH_GPGME], [ - AM_PATH_GPGME([], [ - LIBS="$GPGME_LIBS $LIBS" - CFLAGS="$GPGME_CFLAGS $CFLAGS" - AC_DEFINE([HAVE_GPGME], [1], [Define if GPGME is available.]) - have_gpg=yes - ]) - ]) - ]) -]) - dnl ********************************************************************** dnl Checks for IPv6 dnl ********************************************************************** @@ -715,18 +686,39 @@ ]) dnl -dnl Check for PCRE +dnl Check for PCRE2 / PCRE dnl +AC_ARG_ENABLE(pcre2, AC_HELP_STRING([--disable-pcre2], + [Disable PCRE2 style regular expressions])) AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre], [Disable PCRE style regular expressions])) -AS_IF([test "X$enable_pcre" != "Xno"],[ +AS_IF([test "X$enable_pcre2" != "Xno"],[ + enable_pcre2=no + PKG_CHECK_MODULES([PCRE2], libpcre2-8, [ + CFLAGS="$PCRE2_CFLAGS $CFLAGS" + LIBS="$PCRE2_LIBS $LIBS" + AC_DEFINE([HAVE_LIBPCRE2], [1], [Define if libpcre2 is available.]) + enable_pcre2=yes + ], [ + AC_CHECK_HEADER(pcre2.h, [ + AC_CHECK_LIB(pcre2-8, pcre2_compile_8, [ + LIBS="${LIBS} -lpcre2-8" + AC_DEFINE([HAVE_LIBPCRE2], 1, [Define if libpcre2 is available.]) + enable_pcre2=yes + ]) + ]) + ]) +]) + +AS_IF([test "X$enable_pcre" != "Xno" && test "X$enable_pcre2" != "Xyes"],[ PKG_CHECK_MODULES([PCRE], libpcre, [ CFLAGS="$PCRE_CFLAGS $CFLAGS" AC_CHECK_HEADER(pcre.h, [ LIBS="$PCRE_LIBS $LIBS" AC_DEFINE([HAVE_LIBPCRE], [1], [Define if libpcre is available.]) + enable_pcre=yes ]) ], [ AC_CHECK_HEADER(pcre.h, [ @@ -738,6 +730,8 @@ ]) ]) +AS_IF([test "X$enable_pcre2" = Xyes], [PCRE_INFO="yes, via libpcre2"], [test "X$enable_pcre" = Xyes], [PCRE_INFO="yes, via libpcre"], [PCRE_INFO=no]) + dnl dnl Check for libcares (resolver library) dnl @@ -764,6 +758,38 @@ ]) dnl +dnl Check for libmetalink +dnl +AS_IF([test x"$with_metalink" != xno], [ + PKG_CHECK_MODULES([METALINK], libmetalink, [ + LIBS="$METALINK_LIBS $LIBS" + CFLAGS="$METALINK_CFLAGS $CFLAGS" + AC_DEFINE([HAVE_METALINK], [1], [Define if using metalink.]) + with_metalink=yes + ], [ + with_metalink=no + ]) + + have_gpg=no + AS_IF([test x"$with_metalink" = xyes], [ + dnl + dnl Check for GPGME + dnl + m4_ifdef([AM_PATH_GPGME], [ + AM_PATH_GPGME([], [ + # Put libgpgme to the end of the library list since it introduces a -L linker flags. + # That -L might break the build if there are two different version of + # a library (e.g. GnuTLS) in /usr/local and in the system directory. + LIBS="$LIBS $GPGME_LIBS" + CFLAGS="$GPGME_CFLAGS $CFLAGS" + AC_DEFINE([HAVE_GPGME], [1], [Define if GPGME is available.]) + have_gpg=yes + ]) + ]) + ]) +]) + +dnl dnl Extended Attribute support dnl @@ -817,6 +843,7 @@ SSL: $with_ssl Zlib: $with_zlib PSL: $with_libpsl + PCRE: $PCRE_INFO Digest: $ENABLE_DIGEST NTLM: $ENABLE_NTLM OPIE: $ENABLE_OPIE diff -Nru wget-1.19.5/debian/changelog wget-1.20.1/debian/changelog --- wget-1.19.5/debian/changelog 2018-11-12 09:54:07.000000000 +0000 +++ wget-1.20.1/debian/changelog 2019-01-23 16:56:34.000000000 +0000 @@ -1,3 +1,43 @@ +wget (1.20.1-1ubuntu3) disco; urgency=medium + + * Revert switching to pcre3 since pcre2 is in main (LP: #1792544) + + -- Jeremy Bicha Wed, 23 Jan 2019 11:56:34 -0500 + +wget (1.20.1-1ubuntu2) disco; urgency=medium + + * TEMPORARY: Switch back to pcre3 until pcre2 is in main (see LP #1636666) + + -- Julian Andres Klode Wed, 09 Jan 2019 13:37:13 +0100 + +wget (1.20.1-1ubuntu1) disco; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Don't Build-Depend on libgnutls28-dev. + - Pass --with-ssl=openssl + - Enable parallel builds. + - debian/patches/disable-SSLv3.patch: properly detect SSLv3 being + disabled on Ubuntu because the method still exists for ABI reasons. + - debian/control: add pkg-config to Build-Depends. + + -- Julian Andres Klode Mon, 07 Jan 2019 08:36:22 +0100 + +wget (1.20.1-1) unstable; urgency=high + + * new upstream release 2018-12-26 + fixes CVE-2018-20483 set_file_metadata in xattr.c in GNU Wget before 1.20.1 + * debian/control: updated Standard-Version to 4.30, no changes needed + + -- Noël Köthe Thu, 27 Dec 2018 18:53:18 +0100 + +wget (1.20-1) unstable; urgency=medium + + * new upstream release 2018-11-29 + removed patch wget-add-TLS-13-support-for-GnuTLS.patch + * debian/control: updated Standard-Version to 4.2.1 + + -- Noël Köthe Sat, 15 Dec 2018 18:07:46 +0100 + wget (1.19.5-2ubuntu1) disco; urgency=low * Merge from Debian unstable. Remaining changes: @@ -17,7 +57,7 @@ * cherry pick wget-add-TLS-13-support-for-GnuTLS.patch from upstream git to add TLS 1.3 support - -- Noël Köthe Sun, 16 Sep 2018 19:38:18 +0200 + -- Noël Köthe Mon, 17 Sep 2018 12:08:18 +0200 wget (1.19.5-1ubuntu1) cosmic; urgency=low @@ -90,7 +130,7 @@ * new upstream release from 2018-01-19 - removed upstream included patches: wget_813158fixsegfault.patch - and gnulib.git.patch + and gnulib.git.patch * debian/upstream/signing-key.asc added Darshit Shah -- Noël Köthe Sat, 20 Jan 2018 20:47:22 +0100 @@ -212,7 +252,7 @@ wget (1.18-3) unstable; urgency=medium - * make the build reproducible (Thanks Reiner!). closes: #833070 + * make the build reproducible (Thanks Reiner!). closes: #833070 -- Noël Köthe Thu, 22 Sep 2016 17:04:27 +0200 @@ -612,7 +652,7 @@ wget (1.13.4-2) unstable; urgency=low * added hardened build flag. thx Moritz for the patch - closes: Bug#654908 + closes: Bug#654908 -- Noël Köthe Fri, 13 Jan 2012 16:31:57 +0100 @@ -662,8 +702,8 @@ wget (1.13-1) unstable; urgency=low * new upstream release 1.13 from 2011-08-09 - - updated wget-doc-remove-usr-local-in-wget.texi, - wget-fr.po-spelling-correction, + - updated wget-doc-remove-usr-local-in-wget.texi, + wget-fr.po-spelling-correction, - removed wget-de.po-remove-double-quote-signs (latest de.po), CVE-2010-2252 (included upstream), wget-zh_CN.po-translation-correction, fix-paramter-spelling-error-in-wget.texi, refresh-pofiles @@ -703,7 +743,7 @@ * debian/control correct spelling in description. closes: Bug#635241 * debian/control replace libssl-dev by libgnutls-dev in build dependency - + -- Noël Köthe Tue, 12 Aug 2011 15:34:52 +0200 wget (1.12-5) unstable; urgency=low @@ -1533,9 +1573,9 @@ -- Noel Koethe Fri, 8 Feb 2002 00:02:00 +0100 -wget (1.8.1-0.1) unstable; urgency=low +wget (1.8.1-0.1) unstable; urgency=low - * NMU + * NMU with help from Guillaume Morin * new upstream version (closes: Bug#123878) @@ -1758,15 +1798,15 @@ wget (1.4.4-6) frozen unstable; urgency=low - * Closes bug #8370: applied small patch by the upstream author - * Hrvoje Niksic . - * Patch sent to me by Barak Pearlmutter . + * Closes bug #8370: applied small patch by the upstream author + * Hrvoje Niksic + * Patch sent to me by Barak Pearlmutter -- J. Ramos Goncalves Fri, 28 Mar 1997 14:38:42 +0000 wget (1.4.4-5) frozen unstable; urgency=low - * Closes bug #8335: wget man page was referring to /usr/local/lib/wgetrc + * Closes bug #8335: wget man page was referring to /usr/local/lib/wgetrc * instead of /etc/wgetrc (corrected also for the html documentation). -- J. Ramos Goncalves Wed, 26 Mar 1997 15:15:12 +0000 diff -Nru wget-1.19.5/debian/control wget-1.20.1/debian/control --- wget-1.19.5/debian/control 2018-11-12 09:52:53.000000000 +0000 +++ wget-1.20.1/debian/control 2019-01-23 16:55:21.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Noël Köthe Build-Depends: debhelper (>> 11.0.0), pkg-config, gettext, texinfo, libidn2-0-dev, uuid-dev, libpsl-dev, libpcre2-dev, automake, libssl-dev (>= 0.9.8k), zlib1g-dev, dh-strip-nondeterminism, pkg-config -Standards-Version: 4.1.4 +Standards-Version: 4.3.0 Homepage: https://www.gnu.org/software/wget/ Package: wget diff -Nru wget-1.19.5/debian/patches/series wget-1.20.1/debian/patches/series --- wget-1.19.5/debian/patches/series 2018-11-12 09:53:06.000000000 +0000 +++ wget-1.20.1/debian/patches/series 2019-01-07 07:36:12.000000000 +0000 @@ -2,4 +2,3 @@ wget-doc-remove-usr-local-in-wget.texi wget-passive_ftp-default disable-SSLv3.patch -wget-add-TLS-13-support-for-GnuTLS.patch diff -Nru wget-1.19.5/debian/patches/wget-add-TLS-13-support-for-GnuTLS.patch wget-1.20.1/debian/patches/wget-add-TLS-13-support-for-GnuTLS.patch --- wget-1.19.5/debian/patches/wget-add-TLS-13-support-for-GnuTLS.patch 2018-09-16 17:38:18.000000000 +0000 +++ wget-1.20.1/debian/patches/wget-add-TLS-13-support-for-GnuTLS.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -From 2bbdfd76dab187ab29e22bed18d737f94343e629 Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Tue, 4 Sep 2018 11:22:14 +0200 -Subject: [PATCH] Add TLS 1.3 support for GnuTLS - ---- - doc/wget.texi | 6 +++--- - src/gnutls.c | 28 ++++++++++++++++++++++++++++ - 2 files changed, 31 insertions(+), 3 deletions(-) - -diff --git a/doc/wget.texi b/doc/wget.texi -index 38b4a24..7ae19d8 100644 ---- a/doc/wget.texi -+++ b/doc/wget.texi -@@ -1784,9 +1784,9 @@ If Wget is compiled without SSL support, none of these options are available. - @cindex SSL protocol, choose - @item --secure-protocol=@var{protocol} - Choose the secure protocol to be used. Legal values are @samp{auto}, --@samp{SSLv2}, @samp{SSLv3}, @samp{TLSv1}, @samp{TLSv1_1}, @samp{TLSv1_2} --and @samp{PFS}. If @samp{auto} is used, the SSL library is given the --liberty of choosing the appropriate protocol automatically, which is -+@samp{SSLv2}, @samp{SSLv3}, @samp{TLSv1}, @samp{TLSv1_1}, @samp{TLSv1_2}, -+@samp{TLSv1_3} and @samp{PFS}. If @samp{auto} is used, the SSL library is -+given the liberty of choosing the appropriate protocol automatically, which is - achieved by sending a TLSv1 greeting. This is the default. - - Specifying @samp{SSLv2}, @samp{SSLv3}, @samp{TLSv1}, @samp{TLSv1_1}, -diff --git a/src/gnutls.c b/src/gnutls.c -index 07844c5..206d0b0 100644 ---- a/src/gnutls.c -+++ b/src/gnutls.c -@@ -565,6 +565,15 @@ set_prio_default (gnutls_session_t session) - err = gnutls_priority_set_direct (session, "NORMAL:-VERS-SSL3.0:-VERS-TLS1.0:-VERS-TLS1.1", NULL); - break; - -+ case secure_protocol_tlsv1_3: -+#if GNUTLS_VERSION_NUMBER >= 0x030603 -+ err = gnutls_priority_set_direct (session, "NORMAL:-VERS-SSL3.0:+VERS-TLS1.3:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-TLS1.2", NULL); -+ break; -+#else -+ logprintf (LOG_NOTQUIET, _("Your GnuTLS version is too old to support TLS 1.3\n")); -+ return -1; -+#endif -+ - case secure_protocol_pfs: - err = gnutls_priority_set_direct (session, "PFS:-VERS-SSL3.0", NULL); - if (err != GNUTLS_E_SUCCESS) -@@ -596,19 +605,38 @@ set_prio_default (gnutls_session_t session) - allowed_protocols[0] = GNUTLS_TLS1_0; - allowed_protocols[1] = GNUTLS_TLS1_1; - allowed_protocols[2] = GNUTLS_TLS1_2; -+#if GNUTLS_VERSION_NUMBER >= 0x030603 -+ allowed_protocols[3] = GNUTLS_TLS1_3; -+#endif - err = gnutls_protocol_set_priority (session, allowed_protocols); - break; - - case secure_protocol_tlsv1_1: - allowed_protocols[0] = GNUTLS_TLS1_1; - allowed_protocols[1] = GNUTLS_TLS1_2; -+#if GNUTLS_VERSION_NUMBER >= 0x030603 -+ allowed_protocols[2] = GNUTLS_TLS1_3; -+#endif - err = gnutls_protocol_set_priority (session, allowed_protocols); - break; - - case secure_protocol_tlsv1_2: - allowed_protocols[0] = GNUTLS_TLS1_2; -+#if GNUTLS_VERSION_NUMBER >= 0x030603 -+ allowed_protocols[1] = GNUTLS_TLS1_3; -+#endif -+ err = gnutls_protocol_set_priority (session, allowed_protocols); -+ break; -+ -+ case secure_protocol_tlsv1_3: -+#if GNUTLS_VERSION_NUMBER >= 0x030603 -+ allowed_protocols[0] = GNUTLS_TLS1_3; - err = gnutls_protocol_set_priority (session, allowed_protocols); - break; -+#else -+ logprintf (LOG_NOTQUIET, _("Your GnuTLS version is too old to support TLS 1.3\n")); -+ return -1; -+#endif - - default: - logprintf (LOG_NOTQUIET, _("GnuTLS: unimplemented 'secure-protocol' option value %d\n"), opt.secure_protocol); --- -libgit2 0.27.4 - diff -Nru wget-1.19.5/debian/rules wget-1.20.1/debian/rules --- wget-1.19.5/debian/rules 2018-09-17 16:50:53.000000000 +0000 +++ wget-1.20.1/debian/rules 2018-12-27 22:53:51.000000000 +0000 @@ -75,7 +75,7 @@ cd build-udeb && $(MAKE) $(NJOBS) touch build-udeb-stamp -clean: +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp build-udeb-stamp configure-udeb-stamp diff -Nru wget-1.19.5/doc/Makefile.in wget-1.20.1/doc/Makefile.in --- wget-1.19.5/doc/Makefile.in 2018-05-06 16:47:51.000000000 +0000 +++ wget-1.20.1/doc/Makefile.in 2018-12-26 20:09:02.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,6 +93,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -110,12 +111,13 @@ subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/arpa_inet_h.m4 \ + $(top_srcdir)/m4/__inline.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/af_alg.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 $(top_srcdir)/m4/base32.m4 \ $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ - $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \ + $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/clock_time.m4 \ + $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ @@ -124,9 +126,11 @@ $(top_srcdir)/m4/extern-inline.m4 \ $(top_srcdir)/m4/fatal-signal.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ - $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \ - $(top_srcdir)/m4/flock.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fseek.m4 \ + $(top_srcdir)/m4/fflush.m4 $(top_srcdir)/m4/flexmember.m4 \ + $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/flock.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fnmatch_h.m4 \ + $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fpurge.m4 \ + $(top_srcdir)/m4/freading.m4 $(top_srcdir)/m4/fseek.m4 \ $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/fstat.m4 \ $(top_srcdir)/m4/ftell.m4 $(top_srcdir)/m4/ftello.m4 \ $(top_srcdir)/m4/futimens.m4 $(top_srcdir)/m4/getaddrinfo.m4 \ @@ -139,7 +143,6 @@ $(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/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 \ @@ -184,29 +187,29 @@ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/sched_h.m4 \ $(top_srcdir)/m4/secure_getenv.m4 $(top_srcdir)/m4/select.m4 \ - $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sha1.m4 \ - $(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \ - $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sh-filename.m4 \ + $(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sha256.m4 \ + $(top_srcdir)/m4/sha512.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sigpipe.m4 \ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/snprintf.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/spawn-pipe.m4 $(top_srcdir)/m4/spawn_h.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \ - $(top_srcdir)/m4/strptime.m4 $(top_srcdir)/m4/strtok_r.m4 \ - $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_file_h.m4 \ - $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/std-gnu11.m4 \ + $(top_srcdir)/m4/stdalign.m4 $(top_srcdir)/m4/stdbool.m4 \ + $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strptime.m4 \ + $(top_srcdir)/m4/strtok_r.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_file_h.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ @@ -329,7 +332,6 @@ $(top_srcdir)/build-aux/mdate-sh \ $(top_srcdir)/build-aux/texinfo.tex $(wget_TEXINFOS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ @@ -348,6 +350,7 @@ BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +BYTESWAP_H = @BYTESWAP_H@ CARES_CFLAGS = @CARES_CFLAGS@ CARES_LIBS = @CARES_LIBS@ CC = @CC@ @@ -416,6 +419,7 @@ GNULIB_FGETC = @GNULIB_FGETC@ GNULIB_FGETS = @GNULIB_FGETS@ GNULIB_FLOCK = @GNULIB_FLOCK@ +GNULIB_FNMATCH = @GNULIB_FNMATCH@ GNULIB_FOPEN = @GNULIB_FOPEN@ GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ @@ -449,6 +453,7 @@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ +GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ @@ -473,6 +478,7 @@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALENAME = @GNULIB_LOCALENAME@ GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ @@ -543,6 +549,7 @@ GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT@ GNULIB_POSIX_SPAWNATTR_SETSIGMASK = @GNULIB_POSIX_SPAWNATTR_SETSIGMASK@ GNULIB_POSIX_SPAWNP = @GNULIB_POSIX_SPAWNP@ +GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -745,6 +752,7 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ @@ -767,6 +775,9 @@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FLOCK = @HAVE_FLOCK@ +HAVE_FNMATCH = @HAVE_FNMATCH@ +HAVE_FNMATCH_H = @HAVE_FNMATCH_H@ +HAVE_FREELOCALE = @HAVE_FREELOCALE@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ @@ -779,13 +790,16 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ +HAVE_GETPASS = @HAVE_GETPASS@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@ HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ @@ -823,6 +837,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NETDB_H = @HAVE_NETDB_H@ HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ +HAVE_NEWLOCALE = @HAVE_NEWLOCALE@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ @@ -834,6 +849,7 @@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@ HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@ +HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PSELECT = @HAVE_PSELECT@ @@ -904,7 +920,6 @@ 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@ @@ -962,8 +977,6 @@ 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@ @@ -998,7 +1011,6 @@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1043,6 +1055,7 @@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ +NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1077,6 +1090,7 @@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ +NEXT_FNMATCH_H = @NEXT_FNMATCH_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1119,6 +1133,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCRE2_CFLAGS = @PCRE2_CFLAGS@ +PCRE2_LIBS = @PCRE2_LIBS@ PCRE_CFLAGS = @PCRE_CFLAGS@ PCRE_LIBS = @PCRE_LIBS@ PERL = @PERL@ @@ -1155,9 +1171,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ +REPLACE_FNMATCH = @REPLACE_FNMATCH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ REPLACE_FPURGE = @REPLACE_FPURGE@ +REPLACE_FREELOCALE = @REPLACE_FREELOCALE@ REPLACE_FREOPEN = @REPLACE_FREOPEN@ REPLACE_FSEEK = @REPLACE_FSEEK@ REPLACE_FSEEKO = @REPLACE_FSEEKO@ @@ -1176,6 +1194,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ +REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ @@ -1212,6 +1231,7 @@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@ REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ @@ -1220,6 +1240,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@ +REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -1376,7 +1397,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -1448,8 +1468,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1628,7 +1648,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru wget-1.19.5/doc/stamp-vti wget-1.20.1/doc/stamp-vti --- wget-1.19.5/doc/stamp-vti 2018-05-06 16:48:19.000000000 +0000 +++ wget-1.20.1/doc/stamp-vti 2018-12-26 20:10:48.000000000 +0000 @@ -1,4 +1,4 @@ -@set UPDATED 5 May 2018 -@set UPDATED-MONTH May 2018 -@set EDITION 1.19.5 -@set VERSION 1.19.5 +@set UPDATED 26 December 2018 +@set UPDATED-MONTH December 2018 +@set EDITION 1.20.1 +@set VERSION 1.20.1 diff -Nru wget-1.19.5/doc/version.texi wget-1.20.1/doc/version.texi --- wget-1.19.5/doc/version.texi 2018-05-06 16:48:19.000000000 +0000 +++ wget-1.20.1/doc/version.texi 2018-12-26 20:10:48.000000000 +0000 @@ -1,4 +1,4 @@ -@set UPDATED 5 May 2018 -@set UPDATED-MONTH May 2018 -@set EDITION 1.19.5 -@set VERSION 1.19.5 +@set UPDATED 26 December 2018 +@set UPDATED-MONTH December 2018 +@set EDITION 1.20.1 +@set VERSION 1.20.1 diff -Nru wget-1.19.5/doc/wget.info wget-1.20.1/doc/wget.info --- wget-1.19.5/doc/wget.info 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/doc/wget.info 2018-12-26 20:10:48.000000000 +0000 @@ -18,7 +18,7 @@  File: wget.info, Node: Top, Next: Overview, Prev: (dir), Up: (dir) -Wget 1.19.5 +Wget 1.20.1 *********** This file documents the GNU Wget utility for downloading network data. @@ -406,6 +406,13 @@ Set preferred location for Metalink resources. This has effect if multiple resources with same priority are available. +‘--xattr’ + Enable use of file system’s extended attributes to save the + original URL and the Referer HTTP header value if used. + + Be aware that the URL might contain private information like access + tokens or credentials. + ‘-F’ ‘--force-html’ When input is read from a file, force it to be treated as an HTML @@ -1508,6 +1515,10 @@ authentication challenges, but accept unsolicited auth info, say, in addition to form-based authentication. +‘--retry-on-host-error’ + Consider host errors, such as “Temporary failure in name + resolutionâ€, as non-fatal, transient errors. + ‘--retry-on-http-error=CODE[,CODE,...]’ Consider given HTTP response codes as non-fatal, transient errors. Supply a comma-separated list of 3-digit HTTP response codes as @@ -1536,10 +1547,10 @@ ‘--secure-protocol=PROTOCOL’ Choose the secure protocol to be used. Legal values are ‘auto’, - ‘SSLv2’, ‘SSLv3’, ‘TLSv1’, ‘TLSv1_1’, ‘TLSv1_2’ and ‘PFS’. If - ‘auto’ is used, the SSL library is given the liberty of choosing - the appropriate protocol automatically, which is achieved by - sending a TLSv1 greeting. This is the default. + ‘SSLv2’, ‘SSLv3’, ‘TLSv1’, ‘TLSv1_1’, ‘TLSv1_2’, ‘TLSv1_3’ and + ‘PFS’. If ‘auto’ is used, the SSL library is given the liberty of + choosing the appropriate protocol automatically, which is achieved + by sending a TLSv1 greeting. This is the default. Specifying ‘SSLv2’, ‘SSLv3’, ‘TLSv1’, ‘TLSv1_1’, ‘TLSv1_2’ or ‘TLSv1_3’ forces the use of the corresponding protocol. This is @@ -3794,8 +3805,8 @@ 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.5 can be found at - +1.20.1 can be found at +  File: wget.info, Node: Web Site, Next: Mailing Lists, Prev: Distribution, Up: Various @@ -4732,7 +4743,7 @@ * backing up files: Download Options. (line 107) * bandwidth, limit: Download Options. (line 330) * base for relative links in input file: Logging and Input File Options. - (line 104) + (line 111) * bind address: Download Options. (line 6) * bind DNS address: Download Options. (line 11) * bug reports: Reporting Bugs. (line 6) @@ -4804,7 +4815,7 @@ * following ftp links: FTP Links. (line 6) * following links: Following Links. (line 6) * force html: Logging and Input File Options. - (line 97) + (line 104) * ftp authentication: FTP Options. (line 6) * ftp password: FTP Options. (line 6) * ftp time-stamping: FTP Time-Stamping Internals. @@ -4934,7 +4945,7 @@ * signal handling: Signals. (line 6) * spanning hosts: Spanning Hosts. (line 6) * specify config: Logging and Input File Options. - (line 117) + (line 124) * spider: Download Options. (line 279) * SSL: HTTPS (SSL/TLS) Options. (line 6) @@ -4996,6 +5007,8 @@ * wildcards, accept: Types of Files. (line 15) * wildcards, reject: Types of Files. (line 39) * Windows file names: Download Options. (line 433) +* xattr: Logging and Input File Options. + (line 97)  @@ -5008,51 +5021,51 @@ 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) Options71357 -Node: FTP Options84501 -Node: Recursive Retrieval Options91563 -Node: Recursive Accept/Reject Options100820 -Node: Exit Status105025 -Node: Recursive Download106060 -Node: Following Links109299 -Node: Spanning Hosts110265 -Node: Types of Files112534 -Node: Directory-Based Limits117428 -Node: Relative Links120695 -Node: FTP Links121545 -Node: Time-Stamping122436 -Node: Time-Stamping Usage124108 -Node: HTTP Time-Stamping Internals125980 -Ref: HTTP Time-Stamping Internals-Footnote-1127328 -Node: FTP Time-Stamping Internals127531 -Node: Startup File129018 -Node: Wgetrc Location129958 -Node: Wgetrc Syntax130812 -Node: Wgetrc Commands131577 -Node: Sample Wgetrc148170 -Node: Examples154198 -Node: Simple Usage154559 -Node: Advanced Usage156008 -Node: Very Advanced Usage159824 -Node: Various161368 -Node: Proxies162077 -Node: Distribution165034 -Node: Web Site165378 -Node: Mailing Lists165678 -Node: Internet Relay Chat167415 -Node: Reporting Bugs167710 -Node: Portability170438 -Node: Signals172085 -Node: Appendices172792 -Node: Robot Exclusion173140 -Node: Security Considerations177002 -Node: Contributors178212 -Node: Copying this manual183942 -Node: GNU Free Documentation License184182 -Node: Concept Index209534 +Node: Download Options18678 +Node: Directory Options48244 +Node: HTTP Options51095 +Node: HTTPS (SSL/TLS) Options71747 +Node: FTP Options84906 +Node: Recursive Retrieval Options91968 +Node: Recursive Accept/Reject Options101225 +Node: Exit Status105430 +Node: Recursive Download106465 +Node: Following Links109704 +Node: Spanning Hosts110670 +Node: Types of Files112939 +Node: Directory-Based Limits117833 +Node: Relative Links121100 +Node: FTP Links121950 +Node: Time-Stamping122841 +Node: Time-Stamping Usage124513 +Node: HTTP Time-Stamping Internals126385 +Ref: HTTP Time-Stamping Internals-Footnote-1127733 +Node: FTP Time-Stamping Internals127936 +Node: Startup File129423 +Node: Wgetrc Location130363 +Node: Wgetrc Syntax131217 +Node: Wgetrc Commands131982 +Node: Sample Wgetrc148575 +Node: Examples154603 +Node: Simple Usage154964 +Node: Advanced Usage156413 +Node: Very Advanced Usage160229 +Node: Various161773 +Node: Proxies162482 +Node: Distribution165439 +Node: Web Site165783 +Node: Mailing Lists166083 +Node: Internet Relay Chat167820 +Node: Reporting Bugs168115 +Node: Portability170843 +Node: Signals172490 +Node: Appendices173197 +Node: Robot Exclusion173545 +Node: Security Considerations177407 +Node: Contributors178617 +Node: Copying this manual184347 +Node: GNU Free Documentation License184587 +Node: Concept Index209939  End Tag Table diff -Nru wget-1.19.5/doc/wget.texi wget-1.20.1/doc/wget.texi --- wget-1.19.5/doc/wget.texi 2018-05-05 20:50:23.000000000 +0000 +++ wget-1.20.1/doc/wget.texi 2018-12-26 19:58:38.000000000 +0000 @@ -540,6 +540,14 @@ Set preferred location for Metalink resources. This has effect if multiple resources with same priority are available. +@cindex xattr +@item --xattr +Enable use of file system's extended attributes to save the +original URL and the Referer HTTP header value if used. + +Be aware that the URL might contain private information like +access tokens or credentials. + @cindex force html @item -F @@ -1750,6 +1758,10 @@ challenges, but accept unsolicited auth info, say, in addition to form-based authentication. +@item --retry-on-host-error +Consider host errors, such as ``Temporary failure in name resolution'', +as non-fatal, transient errors. + @item --retry-on-http-error=@var{code[,code,...]} Consider given HTTP response codes as non-fatal, transient errors. Supply a comma-separated list of 3-digit HTTP response codes as @@ -1780,9 +1792,9 @@ @cindex SSL protocol, choose @item --secure-protocol=@var{protocol} Choose the secure protocol to be used. Legal values are @samp{auto}, -@samp{SSLv2}, @samp{SSLv3}, @samp{TLSv1}, @samp{TLSv1_1}, @samp{TLSv1_2} -and @samp{PFS}. If @samp{auto} is used, the SSL library is given the -liberty of choosing the appropriate protocol automatically, which is +@samp{SSLv2}, @samp{SSLv3}, @samp{TLSv1}, @samp{TLSv1_1}, @samp{TLSv1_2}, +@samp{TLSv1_3} and @samp{PFS}. If @samp{auto} is used, the SSL library is +given the liberty of choosing the appropriate protocol automatically, which is achieved by sending a TLSv1 greeting. This is the default. Specifying @samp{SSLv2}, @samp{SSLv3}, @samp{TLSv1}, @samp{TLSv1_1}, diff -Nru wget-1.19.5/fuzz/Makefile.am wget-1.20.1/fuzz/Makefile.am --- wget-1.19.5/fuzz/Makefile.am 2018-05-05 20:46:22.000000000 +0000 +++ wget-1.20.1/fuzz/Makefile.am 2018-12-26 19:58:38.000000000 +0000 @@ -4,8 +4,8 @@ LDADD = ../lib/libgnu.a \ $(GETADDRINFO_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) \ $(LIBSOCKET) $(LIB_CLOCK_GETTIME) $(LIB_CRYPTO) $(LIB_GETLOGIN) $(LIB_NANOSLEEP) $(LIB_POLL) \ - $(LIB_POSIX_SPAWN) $(LIB_PTHREAD_SIGMASK) $(LIB_SELECT) $(LTLIBICONV) $(LTLIBINTL) \ - $(LTLIBMULTITHREAD) $(LTLIBTHREAD) $(SERVENT_LIB) @INTL_MACOSX_LIBS@ \ + $(LIB_POSIX_SPAWN) $(LIB_PTHREAD_SIGMASK) $(LIB_SELECT) $(LIBICONV) $(LIBINTL) \ + $(LIBMULTITHREAD) $(LIBTHREAD) $(SERVENT_LIB) @INTL_MACOSX_LIBS@ \ -ldl WGET_TESTS = \ diff -Nru wget-1.19.5/fuzz/Makefile.in wget-1.20.1/fuzz/Makefile.in --- wget-1.19.5/fuzz/Makefile.in 2018-05-06 16:47:51.000000000 +0000 +++ wget-1.20.1/fuzz/Makefile.in 2018-12-26 20:09:02.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -73,6 +73,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -93,12 +94,13 @@ subdir = fuzz ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/arpa_inet_h.m4 \ + $(top_srcdir)/m4/__inline.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/af_alg.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 $(top_srcdir)/m4/base32.m4 \ $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ - $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \ + $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/clock_time.m4 \ + $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ @@ -107,9 +109,11 @@ $(top_srcdir)/m4/extern-inline.m4 \ $(top_srcdir)/m4/fatal-signal.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ - $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \ - $(top_srcdir)/m4/flock.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fseek.m4 \ + $(top_srcdir)/m4/fflush.m4 $(top_srcdir)/m4/flexmember.m4 \ + $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/flock.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fnmatch_h.m4 \ + $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fpurge.m4 \ + $(top_srcdir)/m4/freading.m4 $(top_srcdir)/m4/fseek.m4 \ $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/fstat.m4 \ $(top_srcdir)/m4/ftell.m4 $(top_srcdir)/m4/ftello.m4 \ $(top_srcdir)/m4/futimens.m4 $(top_srcdir)/m4/getaddrinfo.m4 \ @@ -122,7 +126,6 @@ $(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/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 \ @@ -167,29 +170,29 @@ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/sched_h.m4 \ $(top_srcdir)/m4/secure_getenv.m4 $(top_srcdir)/m4/select.m4 \ - $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sha1.m4 \ - $(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \ - $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sh-filename.m4 \ + $(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sha256.m4 \ + $(top_srcdir)/m4/sha512.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sigpipe.m4 \ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/snprintf.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/spawn-pipe.m4 $(top_srcdir)/m4/spawn_h.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \ - $(top_srcdir)/m4/strptime.m4 $(top_srcdir)/m4/strtok_r.m4 \ - $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_file_h.m4 \ - $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/std-gnu11.m4 \ + $(top_srcdir)/m4/stdalign.m4 $(top_srcdir)/m4/stdbool.m4 \ + $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strptime.m4 \ + $(top_srcdir)/m4/strtok_r.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_file_h.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ @@ -299,7 +302,16 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/main.Po \ + ./$(DEPDIR)/wget_cookie_fuzzer.Po \ + ./$(DEPDIR)/wget_css_fuzzer.Po \ + ./$(DEPDIR)/wget_ftpls_fuzzer.Po \ + ./$(DEPDIR)/wget_html_fuzzer.Po \ + ./$(DEPDIR)/wget_netrc_fuzzer.Po \ + ./$(DEPDIR)/wget_options_fuzzer.Po \ + ./$(DEPDIR)/wget_robots_fuzzer.Po \ + ./$(DEPDIR)/wget_url_fuzzer.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -557,7 +569,6 @@ $(top_srcdir)/build-aux/depcomp \ $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ @@ -576,6 +587,7 @@ BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +BYTESWAP_H = @BYTESWAP_H@ CARES_CFLAGS = @CARES_CFLAGS@ CARES_LIBS = @CARES_LIBS@ CC = @CC@ @@ -644,6 +656,7 @@ GNULIB_FGETC = @GNULIB_FGETC@ GNULIB_FGETS = @GNULIB_FGETS@ GNULIB_FLOCK = @GNULIB_FLOCK@ +GNULIB_FNMATCH = @GNULIB_FNMATCH@ GNULIB_FOPEN = @GNULIB_FOPEN@ GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ @@ -677,6 +690,7 @@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ +GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ @@ -701,6 +715,7 @@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALENAME = @GNULIB_LOCALENAME@ GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ @@ -771,6 +786,7 @@ GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT@ GNULIB_POSIX_SPAWNATTR_SETSIGMASK = @GNULIB_POSIX_SPAWNATTR_SETSIGMASK@ GNULIB_POSIX_SPAWNP = @GNULIB_POSIX_SPAWNP@ +GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -973,6 +989,7 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ @@ -995,6 +1012,9 @@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FLOCK = @HAVE_FLOCK@ +HAVE_FNMATCH = @HAVE_FNMATCH@ +HAVE_FNMATCH_H = @HAVE_FNMATCH_H@ +HAVE_FREELOCALE = @HAVE_FREELOCALE@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ @@ -1007,13 +1027,16 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ +HAVE_GETPASS = @HAVE_GETPASS@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@ HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ @@ -1051,6 +1074,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NETDB_H = @HAVE_NETDB_H@ HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ +HAVE_NEWLOCALE = @HAVE_NEWLOCALE@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ @@ -1062,6 +1086,7 @@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@ HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@ +HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PSELECT = @HAVE_PSELECT@ @@ -1132,7 +1157,6 @@ 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@ @@ -1190,8 +1214,6 @@ 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@ @@ -1226,7 +1248,6 @@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1271,6 +1292,7 @@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ +NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1305,6 +1327,7 @@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ +NEXT_FNMATCH_H = @NEXT_FNMATCH_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1347,6 +1370,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCRE2_CFLAGS = @PCRE2_CFLAGS@ +PCRE2_LIBS = @PCRE2_LIBS@ PCRE_CFLAGS = @PCRE_CFLAGS@ PCRE_LIBS = @PCRE_LIBS@ PERL = @PERL@ @@ -1383,9 +1408,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ +REPLACE_FNMATCH = @REPLACE_FNMATCH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ REPLACE_FPURGE = @REPLACE_FPURGE@ +REPLACE_FREELOCALE = @REPLACE_FREELOCALE@ REPLACE_FREOPEN = @REPLACE_FREOPEN@ REPLACE_FSEEK = @REPLACE_FSEEK@ REPLACE_FSEEKO = @REPLACE_FSEEKO@ @@ -1404,6 +1431,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ +REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ @@ -1440,6 +1468,7 @@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@ REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ @@ -1448,6 +1477,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@ +REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -1604,7 +1634,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -1634,8 +1663,8 @@ $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) \ $(LIB_CLOCK_GETTIME) $(LIB_CRYPTO) $(LIB_GETLOGIN) \ $(LIB_NANOSLEEP) $(LIB_POLL) $(LIB_POSIX_SPAWN) \ - $(LIB_PTHREAD_SIGMASK) $(LIB_SELECT) $(LTLIBICONV) \ - $(LTLIBINTL) $(LTLIBMULTITHREAD) $(LTLIBTHREAD) $(SERVENT_LIB) \ + $(LIB_PTHREAD_SIGMASK) $(LIB_SELECT) $(LIBICONV) $(LIBINTL) \ + $(LIBMULTITHREAD) $(LIBTHREAD) $(SERVENT_LIB) \ @INTL_MACOSX_LIBS@ -ldl $(am__append_1) WGET_TESTS = \ wget_css_fuzzer$(EXEEXT) \ @@ -1690,8 +1719,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1786,15 +1815,21 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_cookie_fuzzer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_css_fuzzer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_ftpls_fuzzer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_html_fuzzer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_netrc_fuzzer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_options_fuzzer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_robots_fuzzer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_url_fuzzer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_cookie_fuzzer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_css_fuzzer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_ftpls_fuzzer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_html_fuzzer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_netrc_fuzzer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_options_fuzzer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_robots_fuzzer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wget_url_fuzzer.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1982,7 +2017,7 @@ fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -2074,7 +2109,10 @@ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -2155,7 +2193,15 @@ clean-local mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/main.Po + -rm -f ./$(DEPDIR)/wget_cookie_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_css_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_ftpls_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_html_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_netrc_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_options_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_robots_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_url_fuzzer.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -2201,7 +2247,15 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/main.Po + -rm -f ./$(DEPDIR)/wget_cookie_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_css_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_ftpls_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_html_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_netrc_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_options_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_robots_fuzzer.Po + -rm -f ./$(DEPDIR)/wget_url_fuzzer.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2221,20 +2275,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ - clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ - clean-local cscopelist-am ctags ctags-am dist-hook distclean \ - distclean-compile distclean-generic distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - recheck tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ + check-am clean clean-binPROGRAMS clean-checkPROGRAMS \ + clean-generic clean-local cscopelist-am ctags ctags-am \ + dist-hook distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am uninstall-binPROGRAMS .PRECIOUS: Makefile diff -Nru wget-1.19.5/lib/af_alg.c wget-1.20.1/lib/af_alg.c --- wget-1.19.5/lib/af_alg.c 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/lib/af_alg.c 2018-12-26 20:08:18.000000000 +0000 @@ -0,0 +1,213 @@ +/* af_alg.c - Compute message digests from file streams and buffers. + Copyright (C) 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 Matteo Croce , 2018. */ + +#include + +#if USE_LINUX_CRYPTO_API + +#include "af_alg.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "sys-limits.h" + +#define BLOCKSIZE 32768 + +/* Return a newly created socket for ALG. + On error, return a negative error number. */ +static int +alg_socket (char const *alg) +{ + struct sockaddr_alg salg = { + .salg_family = AF_ALG, + .salg_type = "hash", + }; + /* Copy alg into salg.salg_name, without calling strcpy nor strlen. */ + for (size_t i = 0; (salg.salg_name[i] = alg[i]) != '\0'; i++) + if (i == sizeof salg.salg_name - 1) + /* alg is too long. */ + return -EINVAL; + + int cfd = socket (AF_ALG, SOCK_SEQPACKET | SOCK_CLOEXEC, 0); + if (cfd < 0) + return -EAFNOSUPPORT; + int ofd = (bind (cfd, (struct sockaddr *) &salg, sizeof salg) == 0 + ? accept4 (cfd, NULL, 0, SOCK_CLOEXEC) + : -1); + close (cfd); + return ofd < 0 ? -EAFNOSUPPORT : ofd; +} + +int +afalg_buffer (const char *buffer, size_t len, const char *alg, + void *resblock, ssize_t hashlen) +{ + /* On Linux < 4.9, the value for an empty stream is wrong (all zeroes). + See . + This was not fixed properly until November 2016, + see . */ + if (len == 0) + return -EAFNOSUPPORT; + + int ofd = alg_socket (alg); + if (ofd < 0) + return ofd; + + int result; + + for (;;) + { + ssize_t size = (len > BLOCKSIZE ? BLOCKSIZE : len); + if (send (ofd, buffer, size, MSG_MORE) != size) + { + result = -EAFNOSUPPORT; + break; + } + buffer += size; + len -= size; + if (len == 0) + { + result = read (ofd, resblock, hashlen) == hashlen ? 0 : -EAFNOSUPPORT; + break; + } + } + + close (ofd); + return result; +} + +int +afalg_stream (FILE *stream, const char *alg, + void *resblock, ssize_t hashlen) +{ + int ofd = alg_socket (alg); + if (ofd < 0) + return ofd; + + /* If STREAM's size is known and nonzero and not too large, attempt + sendfile to pipe the data. The nonzero restriction avoids issues + with /proc files that pretend to be empty, and lets the classic + read-write loop work around an empty-input bug noted below. */ + int fd = fileno (stream); + int result; + struct stat st; + off_t off = ftello (stream); + if (0 <= off && fstat (fd, &st) == 0 + && (S_ISREG (st.st_mode) || S_TYPEISSHM (&st) || S_TYPEISTMO (&st)) + && off < st.st_size && st.st_size - off < SYS_BUFSIZE_MAX) + { + /* Make sure the offset of fileno (stream) reflects how many bytes + have been read from stream before this function got invoked. + Note: fflush on an input stream after ungetc does not work as expected + on some platforms. Therefore this situation is not supported here. */ + if (fflush (stream)) + result = -EIO; + else + { + off_t nbytes = st.st_size - off; + if (sendfile (ofd, fd, &off, nbytes) == nbytes) + { + if (read (ofd, resblock, hashlen) == hashlen) + { + /* The input buffers of stream are no longer valid. */ + if (lseek (fd, off, SEEK_SET) != (off_t)-1) + result = 0; + else + /* The file position of fd has not changed. */ + result = -EAFNOSUPPORT; + } + else + /* The file position of fd has not changed. */ + result = -EAFNOSUPPORT; + } + else + /* The file position of fd has not changed. */ + result = -EAFNOSUPPORT; + } + } + else + { + /* sendfile not possible, do a classic read-write loop. */ + + /* Number of bytes to seek (backwards) in case of error. */ + off_t nseek = 0; + + for (;;) + { + char buf[BLOCKSIZE]; + /* When the stream is not seekable, start with a single-byte block, + so that we can use ungetc() in the case that send() fails. */ + size_t blocksize = (nseek == 0 && off < 0 ? 1 : BLOCKSIZE); + ssize_t size = fread (buf, 1, blocksize, stream); + if (size == 0) + { + /* On Linux < 4.9, the value for an empty stream is wrong (all 0). + See . + This was not fixed properly until November 2016, + see . */ + result = ferror (stream) ? -EIO : nseek == 0 ? -EAFNOSUPPORT : 0; + break; + } + nseek -= size; + if (send (ofd, buf, size, MSG_MORE) != size) + { + if (nseek == -1) + { + /* 1 byte of pushback buffer is guaranteed on stream, even + if stream is not seekable. */ + ungetc ((unsigned char) buf[0], stream); + result = -EAFNOSUPPORT; + } + else if (fseeko (stream, nseek, SEEK_CUR) == 0) + /* The position of stream has been restored. */ + result = -EAFNOSUPPORT; + else + result = -EIO; + break; + } + + /* Don't assume that EOF is sticky. See: + . */ + if (feof (stream)) + { + result = 0; + break; + } + } + + if (result == 0 && read (ofd, resblock, hashlen) != hashlen) + { + if (nseek == 0 || fseeko (stream, nseek, SEEK_CUR) == 0) + /* The position of stream has been restored. */ + result = -EAFNOSUPPORT; + else + result = -EIO; + } + } + close (ofd); + return result; +} + +#endif diff -Nru wget-1.19.5/lib/af_alg.h wget-1.20.1/lib/af_alg.h --- wget-1.19.5/lib/af_alg.h 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/lib/af_alg.h 2018-12-26 20:08:18.000000000 +0000 @@ -0,0 +1,115 @@ +/* af_alg.h - Compute message digests from file streams and buffers. + Copyright (C) 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 Matteo Croce , 2018. + Documentation by Bruno Haible , 2018. */ + +/* Declare specific functions for computing message digests + using the Linux kernel crypto API, if available. This kernel API gives + access to specialized crypto instructions (that would also be available + in user space) or to crypto devices (not directly available in user space). + + For a more complete set of facilities that use the Linux kernel crypto API, + look at libkcapi. */ + +#ifndef AF_ALG_H +# define AF_ALG_H 1 + +# include +# include + +# ifdef __cplusplus +extern "C" { +# endif + +# if USE_LINUX_CRYPTO_API + +/* Compute a message digest of a memory region. + + The memory region starts at BUFFER and is LEN bytes long. + + ALG is the message digest algorithm; see the file /proc/crypto. + + RESBLOCK points to a block of HASHLEN bytes, for the result. + HASHLEN must be the length of the message digest, in bytes, in particular: + + alg | hashlen + -------+-------- + md5 | 16 + sha1 | 20 + sha224 | 28 + sha256 | 32 + sha384 | 48 + sha512 | 64 + + If successful, fill RESBLOCK and return 0. + Upon failure, return a negated error number. */ +int +afalg_buffer (const char *buffer, size_t len, const char *alg, + void *resblock, ssize_t hashlen); + +/* Compute a message digest of data read from STREAM. + + STREAM is an open file stream. The last operation on STREAM should + not be 'ungetc', and if STREAM is also open for writing it should + have been fflushed since its last write. Read from the current + position to the end of STREAM. Handle regular files efficently. + + ALG is the message digest algorithm; see the file /proc/crypto. + + RESBLOCK points to a block of HASHLEN bytes, for the result. + HASHLEN must be the length of the message digest, in bytes, in particular: + + alg | hashlen + -------+-------- + md5 | 16 + sha1 | 20 + sha224 | 28 + sha256 | 32 + sha384 | 48 + sha512 | 64 + + If successful, fill RESBLOCK and return 0. + Upon failure, return a negated error number. + Unless returning 0 or -EIO, restore STREAM's file position so that + the caller can fall back on some other method. */ +int +afalg_stream (FILE *stream, const char *alg, + void *resblock, ssize_t hashlen); + +# else + +static inline int +afalg_buffer (const char *buffer, size_t len, const char *alg, + void *resblock, ssize_t hashlen) +{ + return -EAFNOSUPPORT; +} + +static inline int +afalg_stream (FILE *stream, const char *alg, + void *resblock, ssize_t hashlen) +{ + return -EAFNOSUPPORT; +} + +# endif + +# ifdef __cplusplus +} +# endif + +#endif /* AF_ALG_H */ diff -Nru wget-1.19.5/lib/binary-io.h wget-1.20.1/lib/binary-io.h --- wget-1.19.5/lib/binary-io.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/binary-io.h 2018-12-26 20:08:18.000000000 +0000 @@ -47,10 +47,8 @@ /* Use a function rather than a macro, to avoid gcc warnings "warning: statement with no effect". */ BINARY_IO_INLINE int -__gl_setmode (int fd, int mode) +__gl_setmode (int fd _GL_UNUSED, int mode _GL_UNUSED) { - (void) fd; - (void) mode; return O_BINARY; } #endif @@ -59,7 +57,7 @@ extern int __gl_setmode_check (int); #else BINARY_IO_INLINE int -__gl_setmode_check (int fd) { return 0; } +__gl_setmode_check (int fd _GL_UNUSED) { return 0; } #endif /* Set FD's mode to MODE, which should be either O_TEXT or O_BINARY. diff -Nru wget-1.19.5/lib/byteswap.in.h wget-1.20.1/lib/byteswap.in.h --- wget-1.19.5/lib/byteswap.in.h 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/lib/byteswap.in.h 2018-12-26 20:08:18.000000000 +0000 @@ -0,0 +1,44 @@ +/* byteswap.h - Byte swapping + Copyright (C) 2005, 2007, 2009-2018 Free Software Foundation, Inc. + Written by Oskar Liljeblad , 2005. + + This 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_BYTESWAP_H +#define _GL_BYTESWAP_H + +/* Given an unsigned 16-bit argument X, return the value corresponding to + X with reversed byte order. */ +#define bswap_16(x) ((((x) & 0x00FF) << 8) | \ + (((x) & 0xFF00) >> 8)) + +/* Given an unsigned 32-bit argument X, return the value corresponding to + X with reversed byte order. */ +#define bswap_32(x) ((((x) & 0x000000FF) << 24) | \ + (((x) & 0x0000FF00) << 8) | \ + (((x) & 0x00FF0000) >> 8) | \ + (((x) & 0xFF000000) >> 24)) + +/* Given an unsigned 64-bit argument X, return the value corresponding to + X with reversed byte order. */ +#define bswap_64(x) ((((x) & 0x00000000000000FFULL) << 56) | \ + (((x) & 0x000000000000FF00ULL) << 40) | \ + (((x) & 0x0000000000FF0000ULL) << 24) | \ + (((x) & 0x00000000FF000000ULL) << 8) | \ + (((x) & 0x000000FF00000000ULL) >> 8) | \ + (((x) & 0x0000FF0000000000ULL) >> 24) | \ + (((x) & 0x00FF000000000000ULL) >> 40) | \ + (((x) & 0xFF00000000000000ULL) >> 56)) + +#endif /* _GL_BYTESWAP_H */ diff -Nru wget-1.19.5/lib/cdefs.h wget-1.20.1/lib/cdefs.h --- wget-1.19.5/lib/cdefs.h 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/lib/cdefs.h 2018-12-26 20:08:18.000000000 +0000 @@ -0,0 +1,514 @@ +/* Copyright (C) 1992-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + 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 _SYS_CDEFS_H +#define _SYS_CDEFS_H 1 + +/* We are almost always included from features.h. */ +#ifndef _FEATURES_H +# include +#endif + +/* The GNU libc does not support any K&R compilers or the traditional mode + of ISO C compilers anymore. Check for some of the combinations not + anymore supported. */ +#if defined __GNUC__ && !defined __STDC__ +# error "You need a ISO C conforming compiler to use the glibc headers" +#endif + +/* Some user header file might have defined this before. */ +#undef __P +#undef __PMT + +#ifdef __GNUC__ + +/* All functions, except those with callbacks or those that + synchronize memory, are leaf functions. */ +# if __GNUC_PREREQ (4, 6) && !defined _LIBC +# define __LEAF , __leaf__ +# define __LEAF_ATTR __attribute__ ((__leaf__)) +# else +# define __LEAF +# define __LEAF_ATTR +# endif + +/* GCC can always grok prototypes. For C++ programs we add throw() + to help it optimize the function calls. But this works only with + gcc 2.8.x and egcs. For gcc 3.2 and up we even mark C functions + as non-throwing using a function attribute since programs can use + the -fexceptions options for C code as well. */ +# if !defined __cplusplus && __GNUC_PREREQ (3, 3) +# define __THROW __attribute__ ((__nothrow__ __LEAF)) +# define __THROWNL __attribute__ ((__nothrow__)) +# define __NTH(fct) __attribute__ ((__nothrow__ __LEAF)) fct +# define __NTHNL(fct) __attribute__ ((__nothrow__)) fct +# else +# if defined __cplusplus && __GNUC_PREREQ (2,8) +# define __THROW throw () +# define __THROWNL throw () +# define __NTH(fct) __LEAF_ATTR fct throw () +# define __NTHNL(fct) fct throw () +# else +# define __THROW +# define __THROWNL +# define __NTH(fct) fct +# define __NTHNL(fct) fct +# endif +# endif + +#else /* Not GCC. */ + +# if (defined __cplusplus \ + || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)) +# define __inline inline +# else +# define __inline /* No inline functions. */ +# endif + +# define __THROW +# define __THROWNL +# define __NTH(fct) fct + +#endif /* GCC. */ + +/* Compilers that are not clang may object to + #if defined __clang__ && __has_extension(...) + even though they do not need to evaluate the right-hand side of the &&. */ +#if defined __clang__ && defined __has_extension +# define __glibc_clang_has_extension(ext) __has_extension (ext) +#else +# define __glibc_clang_has_extension(ext) 0 +#endif + +/* These two macros are not used in glibc anymore. They are kept here + only because some other projects expect the macros to be defined. */ +#define __P(args) args +#define __PMT(args) args + +/* For these things, GCC behaves the ANSI way normally, + and the non-ANSI way under -traditional. */ + +#define __CONCAT(x,y) x ## y +#define __STRING(x) #x + +/* This is not a typedef so `const __ptr_t' does the right thing. */ +#define __ptr_t void * + + +/* C++ needs to know that types and declarations are C, not C++. */ +#ifdef __cplusplus +# define __BEGIN_DECLS extern "C" { +# define __END_DECLS } +#else +# define __BEGIN_DECLS +# define __END_DECLS +#endif + + +/* Fortify support. */ +#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) +#define __bos0(ptr) __builtin_object_size (ptr, 0) + +#if __GNUC_PREREQ (4,3) +# define __warndecl(name, msg) \ + extern void name (void) __attribute__((__warning__ (msg))) +# define __warnattr(msg) __attribute__((__warning__ (msg))) +# define __errordecl(name, msg) \ + extern void name (void) __attribute__((__error__ (msg))) +#else +# define __warndecl(name, msg) extern void name (void) +# define __warnattr(msg) +# define __errordecl(name, msg) extern void name (void) +#endif + +/* Support for flexible arrays. + Headers that should use flexible arrays only if they're "real" + (e.g. only if they won't affect sizeof()) should test + #if __glibc_c99_flexarr_available. */ +#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +# define __flexarr [] +# define __glibc_c99_flexarr_available 1 +#elif __GNUC_PREREQ (2,97) +/* GCC 2.97 supports C99 flexible array members as an extension, + even when in C89 mode or compiling C++ (any version). */ +# define __flexarr [] +# define __glibc_c99_flexarr_available 1 +#elif defined __GNUC__ +/* Pre-2.97 GCC did not support C99 flexible arrays but did have + an equivalent extension with slightly different notation. */ +# define __flexarr [0] +# define __glibc_c99_flexarr_available 1 +#else +/* Some other non-C99 compiler. Approximate with [1]. */ +# define __flexarr [1] +# define __glibc_c99_flexarr_available 0 +#endif + + +/* __asm__ ("xyz") is used throughout the headers to rename functions + at the assembly language level. This is wrapped by the __REDIRECT + macro, in order to support compilers that can do this some other + way. When compilers don't support asm-names at all, we have to do + preprocessor tricks instead (which don't have exactly the right + semantics, but it's the best we can do). + + Example: + int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid); */ + +#if defined __GNUC__ && __GNUC__ >= 2 + +# define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias)) +# ifdef __cplusplus +# define __REDIRECT_NTH(name, proto, alias) \ + name proto __THROW __asm__ (__ASMNAME (#alias)) +# define __REDIRECT_NTHNL(name, proto, alias) \ + name proto __THROWNL __asm__ (__ASMNAME (#alias)) +# else +# define __REDIRECT_NTH(name, proto, alias) \ + name proto __asm__ (__ASMNAME (#alias)) __THROW +# define __REDIRECT_NTHNL(name, proto, alias) \ + name proto __asm__ (__ASMNAME (#alias)) __THROWNL +# endif +# define __ASMNAME(cname) __ASMNAME2 (__USER_LABEL_PREFIX__, cname) +# define __ASMNAME2(prefix, cname) __STRING (prefix) cname + +/* +#elif __SOME_OTHER_COMPILER__ + +# define __REDIRECT(name, proto, alias) name proto; \ + _Pragma("let " #name " = " #alias) +*/ +#endif + +/* GCC has various useful declarations that can be made with the + `__attribute__' syntax. All of the ways we use this do fine if + they are omitted for compilers that don't understand it. */ +#if !defined __GNUC__ || __GNUC__ < 2 +# define __attribute__(xyz) /* Ignore */ +#endif + +/* At some point during the gcc 2.96 development the `malloc' attribute + for functions was introduced. We don't want to use it unconditionally + (although this would be possible) since it generates warnings. */ +#if __GNUC_PREREQ (2,96) +# define __attribute_malloc__ __attribute__ ((__malloc__)) +#else +# define __attribute_malloc__ /* Ignore */ +#endif + +/* Tell the compiler which arguments to an allocation function + indicate the size of the allocation. */ +#if __GNUC_PREREQ (4, 3) +# define __attribute_alloc_size__(params) \ + __attribute__ ((__alloc_size__ params)) +#else +# define __attribute_alloc_size__(params) /* Ignore. */ +#endif + +/* At some point during the gcc 2.96 development the `pure' attribute + for functions was introduced. We don't want to use it unconditionally + (although this would be possible) since it generates warnings. */ +#if __GNUC_PREREQ (2,96) +# define __attribute_pure__ __attribute__ ((__pure__)) +#else +# define __attribute_pure__ /* Ignore */ +#endif + +/* This declaration tells the compiler that the value is constant. */ +#if __GNUC_PREREQ (2,5) +# define __attribute_const__ __attribute__ ((__const__)) +#else +# define __attribute_const__ /* Ignore */ +#endif + +/* At some point during the gcc 3.1 development the `used' attribute + for functions was introduced. We don't want to use it unconditionally + (although this would be possible) since it generates warnings. */ +#if __GNUC_PREREQ (3,1) +# define __attribute_used__ __attribute__ ((__used__)) +# define __attribute_noinline__ __attribute__ ((__noinline__)) +#else +# define __attribute_used__ __attribute__ ((__unused__)) +# define __attribute_noinline__ /* Ignore */ +#endif + +/* Since version 3.2, gcc allows marking deprecated functions. */ +#if __GNUC_PREREQ (3,2) +# define __attribute_deprecated__ __attribute__ ((__deprecated__)) +#else +# define __attribute_deprecated__ /* Ignore */ +#endif + +/* Since version 4.5, gcc also allows one to specify the message printed + when a deprecated function is used. clang claims to be gcc 4.2, but + may also support this feature. */ +#if __GNUC_PREREQ (4,5) || \ + __glibc_clang_has_extension (__attribute_deprecated_with_message__) +# define __attribute_deprecated_msg__(msg) \ + __attribute__ ((__deprecated__ (msg))) +#else +# define __attribute_deprecated_msg__(msg) __attribute_deprecated__ +#endif + +/* At some point during the gcc 2.8 development the `format_arg' attribute + for functions was introduced. We don't want to use it unconditionally + (although this would be possible) since it generates warnings. + If several `format_arg' attributes are given for the same function, in + gcc-3.0 and older, all but the last one are ignored. In newer gccs, + all designated arguments are considered. */ +#if __GNUC_PREREQ (2,8) +# define __attribute_format_arg__(x) __attribute__ ((__format_arg__ (x))) +#else +# define __attribute_format_arg__(x) /* Ignore */ +#endif + +/* At some point during the gcc 2.97 development the `strfmon' format + attribute for functions was introduced. We don't want to use it + unconditionally (although this would be possible) since it + generates warnings. */ +#if __GNUC_PREREQ (2,97) +# define __attribute_format_strfmon__(a,b) \ + __attribute__ ((__format__ (__strfmon__, a, b))) +#else +# define __attribute_format_strfmon__(a,b) /* Ignore */ +#endif + +/* The nonnull function attribute marks pointer parameters that + must not be NULL. Do not define __nonnull if it is already defined, + for portability when this file is used in Gnulib. */ +#ifndef __nonnull +# if __GNUC_PREREQ (3,3) +# define __nonnull(params) __attribute__ ((__nonnull__ params)) +# else +# define __nonnull(params) +# endif +#endif + +/* If fortification mode, we warn about unused results of certain + function calls which can lead to problems. */ +#if __GNUC_PREREQ (3,4) +# define __attribute_warn_unused_result__ \ + __attribute__ ((__warn_unused_result__)) +# if defined __USE_FORTIFY_LEVEL && __USE_FORTIFY_LEVEL > 0 +# define __wur __attribute_warn_unused_result__ +# endif +#else +# define __attribute_warn_unused_result__ /* empty */ +#endif +#ifndef __wur +# define __wur /* Ignore */ +#endif + +/* Forces a function to be always inlined. */ +#if __GNUC_PREREQ (3,2) +/* The Linux kernel defines __always_inline in stddef.h (283d7573), and + it conflicts with this definition. Therefore undefine it first to + allow either header to be included first. */ +# undef __always_inline +# define __always_inline __inline __attribute__ ((__always_inline__)) +#else +# undef __always_inline +# define __always_inline __inline +#endif + +/* Associate error messages with the source location of the call site rather + than with the source location inside the function. */ +#if __GNUC_PREREQ (4,3) +# define __attribute_artificial__ __attribute__ ((__artificial__)) +#else +# define __attribute_artificial__ /* Ignore */ +#endif + +/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 + inline semantics, unless -fgnu89-inline is used. Using __GNUC_STDC_INLINE__ + or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions + older than 4.3 may define these macros and still not guarantee GNU inlining + semantics. + + clang++ identifies itself as gcc-4.2, but has support for GNU inlining + semantics, that can be checked fot by using the __GNUC_STDC_INLINE_ and + __GNUC_GNU_INLINE__ macro definitions. */ +#if (!defined __cplusplus || __GNUC_PREREQ (4,3) \ + || (defined __clang__ && (defined __GNUC_STDC_INLINE__ \ + || defined __GNUC_GNU_INLINE__))) +# if defined __GNUC_STDC_INLINE__ || defined __cplusplus +# define __extern_inline extern __inline __attribute__ ((__gnu_inline__)) +# define __extern_always_inline \ + extern __always_inline __attribute__ ((__gnu_inline__)) +# else +# define __extern_inline extern __inline +# define __extern_always_inline extern __always_inline +# endif +#endif + +#ifdef __extern_always_inline +# define __fortify_function __extern_always_inline __attribute_artificial__ +#endif + +/* GCC 4.3 and above allow passing all anonymous arguments of an + __extern_always_inline function to some other vararg function. */ +#if __GNUC_PREREQ (4,3) +# define __va_arg_pack() __builtin_va_arg_pack () +# define __va_arg_pack_len() __builtin_va_arg_pack_len () +#endif + +/* It is possible to compile containing GCC extensions even if GCC is + run in pedantic mode if the uses are carefully marked using the + `__extension__' keyword. But this is not generally available before + version 2.8. */ +#if !__GNUC_PREREQ (2,8) +# define __extension__ /* Ignore */ +#endif + +/* __restrict is known in EGCS 1.2 and above. */ +#if !__GNUC_PREREQ (2,92) +# if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +# define __restrict restrict +# else +# define __restrict /* Ignore */ +# endif +#endif + +/* ISO C99 also allows to declare arrays as non-overlapping. The syntax is + array_name[restrict] + GCC 3.1 supports this. */ +#if __GNUC_PREREQ (3,1) && !defined __GNUG__ +# define __restrict_arr __restrict +#else +# ifdef __GNUC__ +# define __restrict_arr /* Not supported in old GCC. */ +# else +# if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +# define __restrict_arr restrict +# else +/* Some other non-C99 compiler. */ +# define __restrict_arr /* Not supported. */ +# endif +# endif +#endif + +#if __GNUC__ >= 3 +# define __glibc_unlikely(cond) __builtin_expect ((cond), 0) +# define __glibc_likely(cond) __builtin_expect ((cond), 1) +#else +# define __glibc_unlikely(cond) (cond) +# define __glibc_likely(cond) (cond) +#endif + +#ifdef __has_attribute +# define __glibc_has_attribute(attr) __has_attribute (attr) +#else +# define __glibc_has_attribute(attr) 0 +#endif + +#if (!defined _Noreturn \ + && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \ + && !__GNUC_PREREQ (4,7)) +# if __GNUC_PREREQ (2,8) +# define _Noreturn __attribute__ ((__noreturn__)) +# else +# define _Noreturn +# endif +#endif + +#if __GNUC_PREREQ (8, 0) +/* Describes a char array whose address can safely be passed as the first + argument to strncpy and strncat, as the char array is not necessarily + a NUL-terminated string. */ +# define __attribute_nonstring__ __attribute__ ((__nonstring__)) +#else +# define __attribute_nonstring__ +#endif + +#if (!defined _Static_assert && !defined __cplusplus \ + && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \ + && (!__GNUC_PREREQ (4, 6) || defined __STRICT_ANSI__)) +# define _Static_assert(expr, diagnostic) \ + extern int (*__Static_assert_function (void)) \ + [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] +#endif + +/* The #ifndef lets Gnulib avoid including these on non-glibc + platforms, where the includes typically do not exist. */ +#ifndef __WORDSIZE +# include +# include +#endif + +#if defined __LONG_DOUBLE_MATH_OPTIONAL && defined __NO_LONG_DOUBLE_MATH +# define __LDBL_COMPAT 1 +# ifdef __REDIRECT +# define __LDBL_REDIR1(name, proto, alias) __REDIRECT (name, proto, alias) +# define __LDBL_REDIR(name, proto) \ + __LDBL_REDIR1 (name, proto, __nldbl_##name) +# define __LDBL_REDIR1_NTH(name, proto, alias) __REDIRECT_NTH (name, proto, alias) +# define __LDBL_REDIR_NTH(name, proto) \ + __LDBL_REDIR1_NTH (name, proto, __nldbl_##name) +# define __LDBL_REDIR1_DECL(name, alias) \ + extern __typeof (name) name __asm (__ASMNAME (#alias)); +# define __LDBL_REDIR_DECL(name) \ + extern __typeof (name) name __asm (__ASMNAME ("__nldbl_" #name)); +# define __REDIRECT_LDBL(name, proto, alias) \ + __LDBL_REDIR1 (name, proto, __nldbl_##alias) +# define __REDIRECT_NTH_LDBL(name, proto, alias) \ + __LDBL_REDIR1_NTH (name, proto, __nldbl_##alias) +# endif +#endif +#if !defined __LDBL_COMPAT || !defined __REDIRECT +# define __LDBL_REDIR1(name, proto, alias) name proto +# define __LDBL_REDIR(name, proto) name proto +# define __LDBL_REDIR1_NTH(name, proto, alias) name proto __THROW +# define __LDBL_REDIR_NTH(name, proto) name proto __THROW +# define __LDBL_REDIR_DECL(name) +# ifdef __REDIRECT +# define __REDIRECT_LDBL(name, proto, alias) __REDIRECT (name, proto, alias) +# define __REDIRECT_NTH_LDBL(name, proto, alias) \ + __REDIRECT_NTH (name, proto, alias) +# endif +#endif + +/* __glibc_macro_warning (MESSAGE) issues warning MESSAGE. This is + intended for use in preprocessor macros. + + Note: MESSAGE must be a _single_ string; concatenation of string + literals is not supported. */ +#if __GNUC_PREREQ (4,8) || __glibc_clang_prereq (3,5) +# define __glibc_macro_warning1(message) _Pragma (#message) +# define __glibc_macro_warning(message) \ + __glibc_macro_warning1 (GCC warning message) +#else +# define __glibc_macro_warning(msg) +#endif + +/* Generic selection (ISO C11) is a C-only feature, available in GCC + since version 4.9. Previous versions do not provide generic + selection, even though they might set __STDC_VERSION__ to 201112L, + when in -std=c11 mode. Thus, we must check for !defined __GNUC__ + when testing __STDC_VERSION__ for generic selection support. + On the other hand, Clang also defines __GNUC__, so a clang-specific + check is required to enable the use of generic selection. */ +#if !defined __cplusplus \ + && (__GNUC_PREREQ (4, 9) \ + || __glibc_clang_has_extension (c_generic_selections) \ + || (!defined __GNUC__ && defined __STDC_VERSION__ \ + && __STDC_VERSION__ >= 201112L)) +# define __HAVE_GENERIC_SELECTION 1 +#else +# define __HAVE_GENERIC_SELECTION 0 +#endif + +#endif /* sys/cdefs.h */ diff -Nru wget-1.19.5/lib/config.charset wget-1.20.1/lib/config.charset --- wget-1.19.5/lib/config.charset 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/config.charset 1970-01-01 00:00:00.000000000 +0000 @@ -1,682 +0,0 @@ -#! /bin/sh -# Output a system dependent table of character encoding aliases. -# -# 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 -# 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 . -# -# The table consists of lines of the form -# ALIAS CANONICAL -# -# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)". -# ALIAS is compared in a case sensitive way. -# -# CANONICAL is the GNU canonical name for this character encoding. -# It must be an encoding supported by libiconv. Support by GNU libc is -# also desirable. CANONICAL is case insensitive. Usually an upper case -# MIME charset name is preferred. -# The current list of GNU canonical charset names is as follows. -# -# name MIME? used by which systems -# (darwin = Mac OS X, woe32 = native Windows) -# -# ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin cygwin -# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin -# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin -# ISO-8859-3 Y glibc solaris cygwin -# ISO-8859-4 Y osf solaris freebsd netbsd openbsd darwin -# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin -# ISO-8859-6 Y glibc aix hpux solaris cygwin -# ISO-8859-7 Y glibc aix hpux irix osf solaris netbsd openbsd darwin cygwin -# ISO-8859-8 Y glibc aix hpux osf solaris cygwin -# ISO-8859-9 Y glibc aix hpux irix osf solaris darwin cygwin -# ISO-8859-13 glibc netbsd openbsd darwin cygwin -# ISO-8859-14 glibc cygwin -# ISO-8859-15 glibc aix osf solaris freebsd netbsd openbsd darwin cygwin -# KOI8-R Y glibc solaris freebsd netbsd openbsd darwin -# KOI8-U Y glibc freebsd netbsd openbsd darwin cygwin -# KOI8-T glibc -# CP437 dos -# CP775 dos -# CP850 aix osf dos -# CP852 dos -# CP855 dos -# CP856 aix -# CP857 dos -# CP861 dos -# CP862 dos -# CP864 dos -# CP865 dos -# CP866 freebsd netbsd openbsd darwin dos -# CP869 dos -# CP874 woe32 dos -# CP922 aix -# CP932 aix cygwin woe32 dos -# CP943 aix -# CP949 osf darwin woe32 dos -# CP950 woe32 dos -# CP1046 aix -# CP1124 aix -# CP1125 dos -# CP1129 aix -# CP1131 darwin -# CP1250 woe32 -# CP1251 glibc solaris netbsd openbsd darwin cygwin woe32 -# CP1252 aix woe32 -# CP1253 woe32 -# CP1254 woe32 -# CP1255 glibc woe32 -# CP1256 woe32 -# CP1257 woe32 -# GB2312 Y glibc aix hpux irix solaris freebsd netbsd darwin -# EUC-JP Y glibc aix hpux irix osf solaris freebsd netbsd darwin -# EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin -# EUC-TW glibc aix hpux irix osf solaris netbsd -# BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin cygwin -# BIG5-HKSCS glibc solaris darwin -# GBK glibc aix osf solaris darwin cygwin woe32 dos -# GB18030 glibc solaris netbsd darwin -# SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin -# JOHAB glibc solaris woe32 -# TIS-620 glibc aix hpux osf solaris cygwin -# VISCII Y glibc -# TCVN5712-1 glibc -# ARMSCII-8 glibc darwin -# GEORGIAN-PS glibc cygwin -# PT154 glibc -# HP-ROMAN8 hpux -# HP-ARABIC8 hpux -# HP-GREEK8 hpux -# HP-HEBREW8 hpux -# HP-TURKISH8 hpux -# HP-KANA8 hpux -# DEC-KANJI osf -# DEC-HANYU osf -# UTF-8 Y glibc aix hpux osf solaris netbsd darwin cygwin -# -# Note: Names which are not marked as being a MIME name should not be used in -# Internet protocols for information interchange (mail, news, etc.). -# -# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications -# must understand both names and treat them as equivalent. -# -# The first argument passed to this file is the canonical host specification, -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - -host="$1" -os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'` -echo "# This file contains a table of character encoding aliases," -echo "# suitable for operating system '${os}'." -echo "# It was automatically generated from config.charset." -# List of references, updated during installation: -echo "# Packages using this file: " -case "$os" in - linux-gnulibc1*) - # Linux libc5 doesn't have nl_langinfo(CODESET); therefore - # localcharset.c falls back to using the full locale name - # from the environment variables. - echo "C ASCII" - echo "POSIX ASCII" - for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \ - en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \ - en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \ - es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \ - et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \ - fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \ - it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \ - sv_FI sv_SE; do - echo "$l ISO-8859-1" - echo "$l.iso-8859-1 ISO-8859-1" - echo "$l.iso-8859-15 ISO-8859-15" - echo "$l.iso-8859-15@euro ISO-8859-15" - echo "$l@euro ISO-8859-15" - echo "$l.cp-437 CP437" - echo "$l.cp-850 CP850" - echo "$l.cp-1252 CP1252" - echo "$l.cp-1252@euro CP1252" - #echo "$l.atari-st ATARI-ST" # not a commonly used encoding - echo "$l.utf-8 UTF-8" - echo "$l.utf-8@euro UTF-8" - done - for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \ - sl_SI sr sr_CS sr_YU; do - echo "$l ISO-8859-2" - echo "$l.iso-8859-2 ISO-8859-2" - echo "$l.cp-852 CP852" - echo "$l.cp-1250 CP1250" - echo "$l.utf-8 UTF-8" - done - for l in mk mk_MK ru ru_RU; do - echo "$l ISO-8859-5" - echo "$l.iso-8859-5 ISO-8859-5" - echo "$l.koi8-r KOI8-R" - echo "$l.cp-866 CP866" - echo "$l.cp-1251 CP1251" - echo "$l.utf-8 UTF-8" - done - for l in ar ar_SA; do - echo "$l ISO-8859-6" - echo "$l.iso-8859-6 ISO-8859-6" - echo "$l.cp-864 CP864" - #echo "$l.cp-868 CP868" # not a commonly used encoding - echo "$l.cp-1256 CP1256" - echo "$l.utf-8 UTF-8" - done - for l in el el_GR gr gr_GR; do - echo "$l ISO-8859-7" - echo "$l.iso-8859-7 ISO-8859-7" - echo "$l.cp-869 CP869" - echo "$l.cp-1253 CP1253" - echo "$l.cp-1253@euro CP1253" - echo "$l.utf-8 UTF-8" - echo "$l.utf-8@euro UTF-8" - done - for l in he he_IL iw iw_IL; do - echo "$l ISO-8859-8" - echo "$l.iso-8859-8 ISO-8859-8" - echo "$l.cp-862 CP862" - echo "$l.cp-1255 CP1255" - echo "$l.utf-8 UTF-8" - done - for l in tr tr_TR; do - echo "$l ISO-8859-9" - echo "$l.iso-8859-9 ISO-8859-9" - echo "$l.cp-857 CP857" - echo "$l.cp-1254 CP1254" - echo "$l.utf-8 UTF-8" - done - for l in lt lt_LT lv lv_LV; do - #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name - echo "$l ISO-8859-13" - done - for l in ru_UA uk uk_UA; do - echo "$l KOI8-U" - done - for l in zh zh_CN; do - #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name - echo "$l GB2312" - done - for l in ja ja_JP ja_JP.EUC; do - echo "$l EUC-JP" - done - for l in ko ko_KR; do - echo "$l EUC-KR" - done - for l in th th_TH; do - echo "$l TIS-620" - done - for l in fa fa_IR; do - #echo "$l ISIRI-3342" # a broken encoding - echo "$l.utf-8 UTF-8" - done - ;; - linux* | *-gnu*) - # With glibc-2.1 or newer, we don't need any canonicalization, - # because glibc has iconv and both glibc and libiconv support all - # GNU canonical names directly. Therefore, the Makefile does not - # need to install the alias file at all. - # The following applies only to glibc-2.0.x and older libcs. - echo "ISO_646.IRV:1983 ASCII" - ;; - aix*) - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-6 ISO-8859-6" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-8 ISO-8859-8" - echo "ISO8859-9 ISO-8859-9" - echo "ISO8859-15 ISO-8859-15" - echo "IBM-850 CP850" - echo "IBM-856 CP856" - echo "IBM-921 ISO-8859-13" - echo "IBM-922 CP922" - echo "IBM-932 CP932" - echo "IBM-943 CP943" - echo "IBM-1046 CP1046" - echo "IBM-1124 CP1124" - echo "IBM-1129 CP1129" - echo "IBM-1252 CP1252" - echo "IBM-eucCN GB2312" - echo "IBM-eucJP EUC-JP" - echo "IBM-eucKR EUC-KR" - echo "IBM-eucTW EUC-TW" - echo "big5 BIG5" - echo "GBK GBK" - echo "TIS-620 TIS-620" - echo "UTF-8 UTF-8" - ;; - hpux*) - echo "iso88591 ISO-8859-1" - echo "iso88592 ISO-8859-2" - echo "iso88595 ISO-8859-5" - echo "iso88596 ISO-8859-6" - echo "iso88597 ISO-8859-7" - echo "iso88598 ISO-8859-8" - echo "iso88599 ISO-8859-9" - echo "iso885915 ISO-8859-15" - echo "roman8 HP-ROMAN8" - echo "arabic8 HP-ARABIC8" - echo "greek8 HP-GREEK8" - echo "hebrew8 HP-HEBREW8" - echo "turkish8 HP-TURKISH8" - echo "kana8 HP-KANA8" - echo "tis620 TIS-620" - echo "big5 BIG5" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "eucTW EUC-TW" - echo "hp15CN GB2312" - #echo "ccdc ?" # what is this? - echo "SJIS SHIFT_JIS" - echo "utf8 UTF-8" - ;; - irix*) - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-9 ISO-8859-9" - echo "eucCN GB2312" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "eucTW EUC-TW" - ;; - osf*) - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-4 ISO-8859-4" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-8 ISO-8859-8" - echo "ISO8859-9 ISO-8859-9" - echo "ISO8859-15 ISO-8859-15" - echo "cp850 CP850" - echo "big5 BIG5" - echo "dechanyu DEC-HANYU" - echo "dechanzi GB2312" - echo "deckanji DEC-KANJI" - echo "deckorean EUC-KR" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "eucTW EUC-TW" - echo "GBK GBK" - echo "KSC5601 CP949" - echo "sdeckanji EUC-JP" - echo "SJIS SHIFT_JIS" - echo "TACTIS TIS-620" - echo "UTF-8 UTF-8" - ;; - solaris*) - echo "646 ASCII" - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-3 ISO-8859-3" - echo "ISO8859-4 ISO-8859-4" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-6 ISO-8859-6" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-8 ISO-8859-8" - echo "ISO8859-9 ISO-8859-9" - echo "ISO8859-15 ISO-8859-15" - echo "koi8-r KOI8-R" - echo "ansi-1251 CP1251" - echo "BIG5 BIG5" - echo "Big5-HKSCS BIG5-HKSCS" - echo "gb2312 GB2312" - echo "GBK GBK" - echo "GB18030 GB18030" - echo "cns11643 EUC-TW" - echo "5601 EUC-KR" - echo "ko_KR.johap92 JOHAB" - echo "eucJP EUC-JP" - echo "PCK SHIFT_JIS" - echo "TIS620.2533 TIS-620" - #echo "sun_eu_greek ?" # what is this? - echo "UTF-8 UTF-8" - ;; - freebsd*) - # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore - # localcharset.c falls back to using the full locale name - # from the environment variables. - echo "C ASCII" - echo "US-ASCII ASCII" - for l in la_LN lt_LN; do - echo "$l.ASCII ASCII" - done - for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ - fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \ - lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do - echo "$l.ISO_8859-1 ISO-8859-1" - echo "$l.DIS_8859-15 ISO-8859-15" - done - for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do - echo "$l.ISO_8859-2 ISO-8859-2" - done - for l in la_LN lt_LT; do - echo "$l.ISO_8859-4 ISO-8859-4" - done - for l in ru_RU ru_SU; do - echo "$l.KOI8-R KOI8-R" - echo "$l.ISO_8859-5 ISO-8859-5" - echo "$l.CP866 CP866" - done - echo "uk_UA.KOI8-U KOI8-U" - echo "zh_TW.BIG5 BIG5" - echo "zh_TW.Big5 BIG5" - echo "zh_CN.EUC GB2312" - echo "ja_JP.EUC EUC-JP" - echo "ja_JP.SJIS SHIFT_JIS" - echo "ja_JP.Shift_JIS SHIFT_JIS" - echo "ko_KR.EUC EUC-KR" - ;; - netbsd*) - echo "646 ASCII" - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-4 ISO-8859-4" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-13 ISO-8859-13" - echo "ISO8859-15 ISO-8859-15" - echo "eucCN GB2312" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "eucTW EUC-TW" - echo "BIG5 BIG5" - echo "SJIS SHIFT_JIS" - ;; - openbsd*) - echo "646 ASCII" - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-4 ISO-8859-4" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-13 ISO-8859-13" - echo "ISO8859-15 ISO-8859-15" - ;; - darwin[56]*) - # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore - # localcharset.c falls back to using the full locale name - # from the environment variables. - echo "C ASCII" - for l in en_AU en_CA en_GB en_US la_LN; do - echo "$l.US-ASCII ASCII" - done - for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ - fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \ - nl_NL no_NO pt_PT sv_SE; do - echo "$l ISO-8859-1" - echo "$l.ISO8859-1 ISO-8859-1" - echo "$l.ISO8859-15 ISO-8859-15" - done - for l in la_LN; do - echo "$l.ISO8859-1 ISO-8859-1" - echo "$l.ISO8859-15 ISO-8859-15" - done - for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do - echo "$l.ISO8859-2 ISO-8859-2" - done - for l in la_LN lt_LT; do - echo "$l.ISO8859-4 ISO-8859-4" - done - for l in ru_RU; do - echo "$l.KOI8-R KOI8-R" - echo "$l.ISO8859-5 ISO-8859-5" - echo "$l.CP866 CP866" - done - for l in bg_BG; do - echo "$l.CP1251 CP1251" - done - echo "uk_UA.KOI8-U KOI8-U" - echo "zh_TW.BIG5 BIG5" - echo "zh_TW.Big5 BIG5" - echo "zh_CN.EUC GB2312" - echo "ja_JP.EUC EUC-JP" - echo "ja_JP.SJIS SHIFT_JIS" - echo "ko_KR.EUC EUC-KR" - ;; - darwin*) - # Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is - # useless: - # - It returns the empty string when LANG is set to a locale of the - # form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8 - # LC_CTYPE file. - # - The environment variables LANG, LC_CTYPE, LC_ALL are not set by - # the system; nl_langinfo(CODESET) returns "US-ASCII" in this case. - # - The documentation says: - # "... all code that calls BSD system routines should ensure - # that the const *char parameters of these routines are in UTF-8 - # encoding. All BSD system functions expect their string - # parameters to be in UTF-8 encoding and nothing else." - # It also says - # "An additional caveat is that string parameters for files, - # paths, and other file-system entities must be in canonical - # UTF-8. In a canonical UTF-8 Unicode string, all decomposable - # characters are decomposed ..." - # but this is not true: You can pass non-decomposed UTF-8 strings - # to file system functions, and it is the OS which will convert - # them to decomposed UTF-8 before accessing the file system. - # - The Apple Terminal application displays UTF-8 by default. - # - However, other applications are free to use different encodings: - # - xterm uses ISO-8859-1 by default. - # - TextEdit uses MacRoman by default. - # We prefer UTF-8 over decomposed UTF-8-MAC because one should - # minimize the use of decomposed Unicode. Unfortunately, through the - # Darwin file system, decomposed UTF-8 strings are leaked into user - # space nevertheless. - # Then there are also the locales with encodings other than US-ASCII - # and UTF-8. These locales can be occasionally useful to users (e.g. - # when grepping through ISO-8859-1 encoded text files), when all their - # file names are in US-ASCII. - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-4 ISO-8859-4" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-9 ISO-8859-9" - echo "ISO8859-13 ISO-8859-13" - echo "ISO8859-15 ISO-8859-15" - echo "KOI8-R KOI8-R" - echo "KOI8-U KOI8-U" - echo "CP866 CP866" - echo "CP949 CP949" - echo "CP1131 CP1131" - echo "CP1251 CP1251" - echo "eucCN GB2312" - echo "GB2312 GB2312" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "Big5 BIG5" - echo "Big5HKSCS BIG5-HKSCS" - echo "GBK GBK" - echo "GB18030 GB18030" - echo "SJIS SHIFT_JIS" - echo "ARMSCII-8 ARMSCII-8" - echo "PT154 PT154" - #echo "ISCII-DEV ?" - echo "* UTF-8" - ;; - beos* | haiku*) - # BeOS and Haiku have a single locale, and it has UTF-8 encoding. - echo "* UTF-8" - ;; - msdosdjgpp*) - # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore - # localcharset.c falls back to using the full locale name - # from the environment variables. - echo "#" - echo "# The encodings given here may not all be correct." - echo "# If you find that the encoding given for your language and" - echo "# country is not the one your DOS machine actually uses, just" - echo "# correct it in this file, and send a mail to" - echo "# Juan Manuel Guerrero " - echo "# and Bruno Haible ." - echo "#" - echo "C ASCII" - # ISO-8859-1 languages - echo "ca CP850" - echo "ca_ES CP850" - echo "da CP865" # not CP850 ?? - echo "da_DK CP865" # not CP850 ?? - echo "de CP850" - echo "de_AT CP850" - echo "de_CH CP850" - echo "de_DE CP850" - echo "en CP850" - echo "en_AU CP850" # not CP437 ?? - echo "en_CA CP850" - echo "en_GB CP850" - echo "en_NZ CP437" - echo "en_US CP437" - echo "en_ZA CP850" # not CP437 ?? - echo "es CP850" - echo "es_AR CP850" - echo "es_BO CP850" - echo "es_CL CP850" - echo "es_CO CP850" - echo "es_CR CP850" - echo "es_CU CP850" - echo "es_DO CP850" - echo "es_EC CP850" - echo "es_ES CP850" - echo "es_GT CP850" - echo "es_HN CP850" - echo "es_MX CP850" - echo "es_NI CP850" - echo "es_PA CP850" - echo "es_PY CP850" - echo "es_PE CP850" - echo "es_SV CP850" - echo "es_UY CP850" - echo "es_VE CP850" - echo "et CP850" - echo "et_EE CP850" - echo "eu CP850" - echo "eu_ES CP850" - echo "fi CP850" - echo "fi_FI CP850" - echo "fr CP850" - echo "fr_BE CP850" - echo "fr_CA CP850" - echo "fr_CH CP850" - echo "fr_FR CP850" - echo "ga CP850" - echo "ga_IE CP850" - echo "gd CP850" - echo "gd_GB CP850" - echo "gl CP850" - echo "gl_ES CP850" - echo "id CP850" # not CP437 ?? - echo "id_ID CP850" # not CP437 ?? - echo "is CP861" # not CP850 ?? - echo "is_IS CP861" # not CP850 ?? - echo "it CP850" - echo "it_CH CP850" - echo "it_IT CP850" - echo "lt CP775" - echo "lt_LT CP775" - echo "lv CP775" - echo "lv_LV CP775" - echo "nb CP865" # not CP850 ?? - echo "nb_NO CP865" # not CP850 ?? - echo "nl CP850" - echo "nl_BE CP850" - echo "nl_NL CP850" - echo "nn CP865" # not CP850 ?? - echo "nn_NO CP865" # not CP850 ?? - echo "no CP865" # not CP850 ?? - echo "no_NO CP865" # not CP850 ?? - echo "pt CP850" - echo "pt_BR CP850" - echo "pt_PT CP850" - echo "sv CP850" - echo "sv_SE CP850" - # ISO-8859-2 languages - echo "cs CP852" - echo "cs_CZ CP852" - echo "hr CP852" - echo "hr_HR CP852" - echo "hu CP852" - echo "hu_HU CP852" - echo "pl CP852" - echo "pl_PL CP852" - echo "ro CP852" - echo "ro_RO CP852" - echo "sk CP852" - echo "sk_SK CP852" - echo "sl CP852" - echo "sl_SI CP852" - echo "sq CP852" - echo "sq_AL CP852" - echo "sr CP852" # CP852 or CP866 or CP855 ?? - echo "sr_CS CP852" # CP852 or CP866 or CP855 ?? - echo "sr_YU CP852" # CP852 or CP866 or CP855 ?? - # ISO-8859-3 languages - echo "mt CP850" - echo "mt_MT CP850" - # ISO-8859-5 languages - echo "be CP866" - echo "be_BE CP866" - echo "bg CP866" # not CP855 ?? - echo "bg_BG CP866" # not CP855 ?? - echo "mk CP866" # not CP855 ?? - echo "mk_MK CP866" # not CP855 ?? - echo "ru CP866" - echo "ru_RU CP866" - echo "uk CP1125" - echo "uk_UA CP1125" - # ISO-8859-6 languages - echo "ar CP864" - echo "ar_AE CP864" - echo "ar_DZ CP864" - echo "ar_EG CP864" - echo "ar_IQ CP864" - echo "ar_IR CP864" - echo "ar_JO CP864" - echo "ar_KW CP864" - echo "ar_MA CP864" - echo "ar_OM CP864" - echo "ar_QA CP864" - echo "ar_SA CP864" - echo "ar_SY CP864" - # ISO-8859-7 languages - echo "el CP869" - echo "el_GR CP869" - # ISO-8859-8 languages - echo "he CP862" - echo "he_IL CP862" - # ISO-8859-9 languages - echo "tr CP857" - echo "tr_TR CP857" - # Japanese - echo "ja CP932" - echo "ja_JP CP932" - # Chinese - echo "zh_CN GBK" - echo "zh_TW CP950" # not CP938 ?? - # Korean - echo "kr CP949" # not CP934 ?? - echo "kr_KR CP949" # not CP934 ?? - # Thai - echo "th CP874" - echo "th_TH CP874" - # Other - echo "eo CP850" - echo "eo_EO CP850" - ;; -esac diff -Nru wget-1.19.5/lib/dirname.h wget-1.20.1/lib/dirname.h --- wget-1.19.5/lib/dirname.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/dirname.h 2018-12-26 20:08:18.000000000 +0000 @@ -36,7 +36,7 @@ #endif # if GNULIB_DIRNAME -char *base_name (char const *file); +char *base_name (char const *file) _GL_ATTRIBUTE_MALLOC; char *dir_name (char const *file); # endif diff -Nru wget-1.19.5/lib/dosname.h wget-1.20.1/lib/dosname.h --- wget-1.19.5/lib/dosname.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/dosname.h 2018-12-26 20:08:18.000000000 +0000 @@ -20,9 +20,8 @@ #ifndef _DOSNAME_H #define _DOSNAME_H -#if (defined _WIN32 || defined __WIN32__ || \ - defined __MSDOS__ || defined __CYGWIN__ || \ - defined __EMX__ || defined __DJGPP__) +#if (defined _WIN32 || defined __CYGWIN__ \ + || defined __EMX__ || defined __MSDOS__ || defined __DJGPP__) /* This internal macro assumes ASCII, but all hosts that support drive letters use ASCII. */ # define _IS_DRIVE_LETTER(C) (((unsigned int) (C) | ('a' - 'A')) - 'a' \ diff -Nru wget-1.19.5/lib/dup2.c wget-1.20.1/lib/dup2.c --- wget-1.19.5/lib/dup2.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/dup2.c 2018-12-26 20:08:18.000000000 +0000 @@ -29,7 +29,7 @@ # undef dup2 -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ /* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN diff -Nru wget-1.19.5/lib/errno.in.h wget-1.20.1/lib/errno.in.h --- wget-1.19.5/lib/errno.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/errno.in.h 2018-12-26 20:08:18.000000000 +0000 @@ -30,7 +30,7 @@ /* On native Windows platforms, many macros are not defined. */ -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ /* These are the same values as defined by MSVC 10, for interoperability. */ @@ -248,7 +248,7 @@ interoperability. */ # define EOWNERDEAD 58 # define ENOTRECOVERABLE 59 -# elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# elif defined _WIN32 && ! defined __CYGWIN__ /* We have a conflict here: pthreads-win32 defines these values differently than MSVC 10. It's hairy to decide which one to use. */ # if defined __MINGW32__ && !defined USE_WINDOWS_THREADS diff -Nru wget-1.19.5/lib/error.c wget-1.20.1/lib/error.c --- wget-1.19.5/lib/error.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/error.c 2018-12-26 20:08:18.000000000 +0000 @@ -93,7 +93,7 @@ # include # include -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ /* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include @@ -131,7 +131,7 @@ static int is_open (int fd) { -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ /* On native Windows: The initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE. There is no fcntl, and the gnulib replacement fcntl does not support diff -Nru wget-1.19.5/lib/fcntl.c wget-1.20.1/lib/fcntl.c --- wget-1.19.5/lib/fcntl.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/fcntl.c 2018-12-26 20:08:18.000000000 +0000 @@ -27,12 +27,12 @@ #include #include -#if !HAVE_FCNTL -# define rpl_fcntl fcntl +#ifdef __KLIBC__ +# define INCL_DOS +# include #endif -#undef fcntl -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include @@ -166,93 +166,18 @@ } #endif /* W32 */ +/* Forward declarations, because we '#undef fcntl' in the middle of this + compilation unit. */ +/* Our implementation of fcntl (fd, F_DUPFD, target). */ +static int rpl_fcntl_DUPFD (int fd, int target); +/* Our implementation of fcntl (fd, F_DUPFD_CLOEXEC, target). */ +static int rpl_fcntl_DUPFD_CLOEXEC (int fd, int target); #ifdef __KLIBC__ - -# define INCL_DOS -# include - -static int -klibc_fcntl (int fd, int action, /* arg */...) -{ - va_list arg_ptr; - int arg; - struct stat sbuf; - int result = -1; - - va_start (arg_ptr, action); - arg = va_arg (arg_ptr, int); - result = fcntl (fd, action, arg); - /* EPERM for F_DUPFD, ENOTSUP for others */ - if (result == -1 && (errno == EPERM || errno == ENOTSUP) - && !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode)) - { - ULONG ulMode; - - switch (action) - { - case F_DUPFD: - /* Find available fd */ - while (fcntl (arg, F_GETFL) != -1 || errno != EBADF) - arg++; - - result = dup2 (fd, arg); - break; - - /* Using underlying APIs is right ? */ - case F_GETFD: - if (DosQueryFHState (fd, &ulMode)) - break; - - result = (ulMode & OPEN_FLAGS_NOINHERIT) ? FD_CLOEXEC : 0; - break; - - case F_SETFD: - if (arg & ~FD_CLOEXEC) - break; - - if (DosQueryFHState (fd, &ulMode)) - break; - - if (arg & FD_CLOEXEC) - ulMode |= OPEN_FLAGS_NOINHERIT; - else - ulMode &= ~OPEN_FLAGS_NOINHERIT; - - /* Filter supported flags. */ - ulMode &= (OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_FAIL_ON_ERROR - | OPEN_FLAGS_NO_CACHE | OPEN_FLAGS_NOINHERIT); - - if (DosSetFHState (fd, ulMode)) - break; - - result = 0; - break; - - case F_GETFL: - result = 0; - break; - - case F_SETFL: - if (arg != 0) - break; - - result = 0; - break; - - default : - errno = EINVAL; - break; - } - } - - va_end (arg_ptr); - - return result; -} - -# define fcntl klibc_fcntl +/* Adds support for fcntl on directories. */ +static int klibc_fcntl (int fd, int action, /* arg */...); #endif + /* Perform the specified ACTION on the file descriptor FD, possibly using the argument ARG further described below. This replacement handles the following actions, and forwards all others on to the @@ -273,110 +198,35 @@ return -1 and set errno. */ int -rpl_fcntl (int fd, int action, /* arg */...) +fcntl (int fd, int action, /* arg */...) +#undef fcntl +#ifdef __KLIBC__ +# define fcntl klibc_fcntl +#endif { va_list arg; int result = -1; va_start (arg, action); switch (action) { - -#if !HAVE_FCNTL case F_DUPFD: { int target = va_arg (arg, int); - result = dupfd (fd, target, 0); + result = rpl_fcntl_DUPFD (fd, target); break; } -#elif FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR - case F_DUPFD: - { - int target = va_arg (arg, int); - /* Detect invalid target; needed for cygwin 1.5.x. */ - if (target < 0 || getdtablesize () <= target) - errno = EINVAL; - else - { - /* Haiku alpha 2 loses fd flags on original. */ - int flags = fcntl (fd, F_GETFD); - if (flags < 0) - { - result = -1; - break; - } - result = fcntl (fd, action, target); - if (0 <= result && fcntl (fd, F_SETFD, flags) == -1) - { - int saved_errno = errno; - close (result); - result = -1; - errno = saved_errno; - } -# if REPLACE_FCHDIR - if (0 <= result) - result = _gl_register_dup (fd, result); -# endif - } - break; - } /* F_DUPFD */ -#endif /* FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR */ case F_DUPFD_CLOEXEC: { int target = va_arg (arg, int); - -#if !HAVE_FCNTL - result = dupfd (fd, target, O_CLOEXEC); - break; -#else /* HAVE_FCNTL */ - /* Try the system call first, if the headers claim it exists - (that is, if GNULIB_defined_F_DUPFD_CLOEXEC is 0), since we - may be running with a glibc that has the macro but with an - older kernel that does not support it. Cache the - information on whether the system call really works, but - avoid caching failure if the corresponding F_DUPFD fails - for any reason. 0 = unknown, 1 = yes, -1 = no. */ - static int have_dupfd_cloexec = GNULIB_defined_F_DUPFD_CLOEXEC ? -1 : 0; - if (0 <= have_dupfd_cloexec) - { - result = fcntl (fd, action, target); - if (0 <= result || errno != EINVAL) - { - have_dupfd_cloexec = 1; -# if REPLACE_FCHDIR - if (0 <= result) - result = _gl_register_dup (fd, result); -# endif - } - else - { - result = rpl_fcntl (fd, F_DUPFD, target); - if (result < 0) - break; - have_dupfd_cloexec = -1; - } - } - else - result = rpl_fcntl (fd, F_DUPFD, target); - if (0 <= result && have_dupfd_cloexec == -1) - { - int flags = fcntl (result, F_GETFD); - if (flags < 0 || fcntl (result, F_SETFD, flags | FD_CLOEXEC) == -1) - { - int saved_errno = errno; - close (result); - errno = saved_errno; - result = -1; - } - } + result = rpl_fcntl_DUPFD_CLOEXEC (fd, target); break; -#endif /* HAVE_FCNTL */ - } /* F_DUPFD_CLOEXEC */ + } #if !HAVE_FCNTL case F_GETFD: { -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ HANDLE handle = (HANDLE) _get_osfhandle (fd); DWORD flags; if (handle == INVALID_HANDLE_VALUE @@ -405,8 +255,183 @@ default: { #if HAVE_FCNTL - void *p = va_arg (arg, void *); - result = fcntl (fd, action, p); + switch (action) + { + #ifdef F_BARRIERFSYNC /* macOS */ + case F_BARRIERFSYNC: + #endif + #ifdef F_CHKCLEAN /* macOS */ + case F_CHKCLEAN: + #endif + #ifdef F_CLOSEM /* NetBSD, HP-UX */ + case F_CLOSEM: + #endif + #ifdef F_FLUSH_DATA /* macOS */ + case F_FLUSH_DATA: + #endif + #ifdef F_FREEZE_FS /* macOS */ + case F_FREEZE_FS: + #endif + #ifdef F_FULLFSYNC /* macOS */ + case F_FULLFSYNC: + #endif + #ifdef F_GETCONFINED /* macOS */ + case F_GETCONFINED: + #endif + #ifdef F_GETDEFAULTPROTLEVEL /* macOS */ + case F_GETDEFAULTPROTLEVEL: + #endif + #ifdef F_GETFD /* POSIX */ + case F_GETFD: + #endif + #ifdef F_GETFL /* POSIX */ + case F_GETFL: + #endif + #ifdef F_GETLEASE /* Linux */ + case F_GETLEASE: + #endif + #ifdef F_GETNOSIGPIPE /* macOS */ + case F_GETNOSIGPIPE: + #endif + #ifdef F_GETOWN /* POSIX */ + case F_GETOWN: + #endif + #ifdef F_GETPIPE_SZ /* Linux */ + case F_GETPIPE_SZ: + #endif + #ifdef F_GETPROTECTIONCLASS /* macOS */ + case F_GETPROTECTIONCLASS: + #endif + #ifdef F_GETPROTECTIONLEVEL /* macOS */ + case F_GETPROTECTIONLEVEL: + #endif + #ifdef F_GET_SEALS /* Linux */ + case F_GET_SEALS: + #endif + #ifdef F_GETSIG /* Linux */ + case F_GETSIG: + #endif + #ifdef F_MAXFD /* NetBSD */ + case F_MAXFD: + #endif + #ifdef F_RECYCLE /* macOS */ + case F_RECYCLE: + #endif + #ifdef F_SETFIFOENH /* HP-UX */ + case F_SETFIFOENH: + #endif + #ifdef F_THAW_FS /* macOS */ + case F_THAW_FS: + #endif + /* These actions take no argument. */ + result = fcntl (fd, action); + break; + + #ifdef F_ADD_SEALS /* Linux */ + case F_ADD_SEALS: + #endif + #ifdef F_BADFD /* Solaris */ + case F_BADFD: + #endif + #ifdef F_CHECK_OPENEVT /* macOS */ + case F_CHECK_OPENEVT: + #endif + #ifdef F_DUP2FD /* FreeBSD, AIX, Solaris */ + case F_DUP2FD: + #endif + #ifdef F_DUP2FD_CLOEXEC /* FreeBSD, Solaris */ + case F_DUP2FD_CLOEXEC: + #endif + #ifdef F_DUP2FD_CLOFORK /* Solaris */ + case F_DUP2FD_CLOFORK: + #endif + #ifdef F_DUPFD /* POSIX */ + case F_DUPFD: + #endif + #ifdef F_DUPFD_CLOEXEC /* POSIX */ + case F_DUPFD_CLOEXEC: + #endif + #ifdef F_DUPFD_CLOFORK /* Solaris */ + case F_DUPFD_CLOFORK: + #endif + #ifdef F_GETXFL /* Solaris */ + case F_GETXFL: + #endif + #ifdef F_GLOBAL_NOCACHE /* macOS */ + case F_GLOBAL_NOCACHE: + #endif + #ifdef F_MAKECOMPRESSED /* macOS */ + case F_MAKECOMPRESSED: + #endif + #ifdef F_MOVEDATAEXTENTS /* macOS */ + case F_MOVEDATAEXTENTS: + #endif + #ifdef F_NOCACHE /* macOS */ + case F_NOCACHE: + #endif + #ifdef F_NODIRECT /* macOS */ + case F_NODIRECT: + #endif + #ifdef F_NOTIFY /* Linux */ + case F_NOTIFY: + #endif + #ifdef F_OPLKACK /* IRIX */ + case F_OPLKACK: + #endif + #ifdef F_OPLKREG /* IRIX */ + case F_OPLKREG: + #endif + #ifdef F_RDAHEAD /* macOS */ + case F_RDAHEAD: + #endif + #ifdef F_SETBACKINGSTORE /* macOS */ + case F_SETBACKINGSTORE: + #endif + #ifdef F_SETCONFINED /* macOS */ + case F_SETCONFINED: + #endif + #ifdef F_SETFD /* POSIX */ + case F_SETFD: + #endif + #ifdef F_SETFL /* POSIX */ + case F_SETFL: + #endif + #ifdef F_SETLEASE /* Linux */ + case F_SETLEASE: + #endif + #ifdef F_SETNOSIGPIPE /* macOS */ + case F_SETNOSIGPIPE: + #endif + #ifdef F_SETOWN /* POSIX */ + case F_SETOWN: + #endif + #ifdef F_SETPIPE_SZ /* Linux */ + case F_SETPIPE_SZ: + #endif + #ifdef F_SETPROTECTIONCLASS /* macOS */ + case F_SETPROTECTIONCLASS: + #endif + #ifdef F_SETSIG /* Linux */ + case F_SETSIG: + #endif + #ifdef F_SINGLE_WRITER /* macOS */ + case F_SINGLE_WRITER: + #endif + /* These actions take an 'int' argument. */ + { + int x = va_arg (arg, int); + result = fcntl (fd, action, x); + } + break; + + default: + /* Other actions take a pointer argument. */ + { + void *p = va_arg (arg, void *); + result = fcntl (fd, action, p); + } + break; + } #else errno = EINVAL; #endif @@ -416,3 +441,186 @@ va_end (arg); return result; } + +static int +rpl_fcntl_DUPFD (int fd, int target) +{ + int result; +#if !HAVE_FCNTL + result = dupfd (fd, target, 0); +#elif FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR + /* Detect invalid target; needed for cygwin 1.5.x. */ + if (target < 0 || getdtablesize () <= target) + { + result = -1; + errno = EINVAL; + } + else + { + /* Haiku alpha 2 loses fd flags on original. */ + int flags = fcntl (fd, F_GETFD); + if (flags < 0) + result = -1; + else + { + result = fcntl (fd, F_DUPFD, target); + if (0 <= result && fcntl (fd, F_SETFD, flags) == -1) + { + int saved_errno = errno; + close (result); + result = -1; + errno = saved_errno; + } +# if REPLACE_FCHDIR + if (0 <= result) + result = _gl_register_dup (fd, result); +# endif + } + } +#else + result = fcntl (fd, F_DUPFD, target); +#endif + return result; +} + +static int +rpl_fcntl_DUPFD_CLOEXEC (int fd, int target) +{ + int result; +#if !HAVE_FCNTL + result = dupfd (fd, target, O_CLOEXEC); +#else /* HAVE_FCNTL */ +# if defined __HAIKU__ + /* On Haiku, the system fcntl (fd, F_DUPFD_CLOEXEC, target) sets + the FD_CLOEXEC flag on fd, not on target. Therefore avoid the + system fcntl in this case. */ +# define have_dupfd_cloexec -1 +# else + /* Try the system call first, if the headers claim it exists + (that is, if GNULIB_defined_F_DUPFD_CLOEXEC is 0), since we + may be running with a glibc that has the macro but with an + older kernel that does not support it. Cache the + information on whether the system call really works, but + avoid caching failure if the corresponding F_DUPFD fails + for any reason. 0 = unknown, 1 = yes, -1 = no. */ + static int have_dupfd_cloexec = GNULIB_defined_F_DUPFD_CLOEXEC ? -1 : 0; + if (0 <= have_dupfd_cloexec) + { + result = fcntl (fd, F_DUPFD_CLOEXEC, target); + if (0 <= result || errno != EINVAL) + { + have_dupfd_cloexec = 1; +# if REPLACE_FCHDIR + if (0 <= result) + result = _gl_register_dup (fd, result); +# endif + } + else + { + result = rpl_fcntl_DUPFD (fd, target); + if (result >= 0) + have_dupfd_cloexec = -1; + } + } + else +# endif + result = rpl_fcntl_DUPFD (fd, target); + if (0 <= result && have_dupfd_cloexec == -1) + { + int flags = fcntl (result, F_GETFD); + if (flags < 0 || fcntl (result, F_SETFD, flags | FD_CLOEXEC) == -1) + { + int saved_errno = errno; + close (result); + errno = saved_errno; + result = -1; + } + } +#endif /* HAVE_FCNTL */ + return result; +} + +#undef fcntl + +#ifdef __KLIBC__ + +static int +klibc_fcntl (int fd, int action, /* arg */...); +{ + va_list arg_ptr; + int arg; + struct stat sbuf; + int result; + + va_start (arg_ptr, action); + arg = va_arg (arg_ptr, int); + result = fcntl (fd, action, arg); + /* EPERM for F_DUPFD, ENOTSUP for others */ + if (result == -1 && (errno == EPERM || errno == ENOTSUP) + && !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode)) + { + ULONG ulMode; + + switch (action) + { + case F_DUPFD: + /* Find available fd */ + while (fcntl (arg, F_GETFL) != -1 || errno != EBADF) + arg++; + + result = dup2 (fd, arg); + break; + + /* Using underlying APIs is right ? */ + case F_GETFD: + if (DosQueryFHState (fd, &ulMode)) + break; + + result = (ulMode & OPEN_FLAGS_NOINHERIT) ? FD_CLOEXEC : 0; + break; + + case F_SETFD: + if (arg & ~FD_CLOEXEC) + break; + + if (DosQueryFHState (fd, &ulMode)) + break; + + if (arg & FD_CLOEXEC) + ulMode |= OPEN_FLAGS_NOINHERIT; + else + ulMode &= ~OPEN_FLAGS_NOINHERIT; + + /* Filter supported flags. */ + ulMode &= (OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_FAIL_ON_ERROR + | OPEN_FLAGS_NO_CACHE | OPEN_FLAGS_NOINHERIT); + + if (DosSetFHState (fd, ulMode)) + break; + + result = 0; + break; + + case F_GETFL: + result = 0; + break; + + case F_SETFL: + if (arg != 0) + break; + + result = 0; + break; + + default: + errno = EINVAL; + break; + } + } + + va_end (arg_ptr); + + return result; +} + +#endif diff -Nru wget-1.19.5/lib/fcntl.in.h wget-1.20.1/lib/fcntl.in.h --- wget-1.19.5/lib/fcntl.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/fcntl.in.h 2018-12-26 20:08:18.000000000 +0000 @@ -68,7 +68,7 @@ /* Native Windows platforms declare open(), creat() in . */ #if (@GNULIB_OPEN@ || defined GNULIB_POSIXCHECK) \ - && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) + && (defined _WIN32 && ! defined __CYGWIN__) # include #endif diff -Nru wget-1.19.5/lib/fflush.c wget-1.20.1/lib/fflush.c --- wget-1.19.5/lib/fflush.c 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/lib/fflush.c 2018-12-26 20:08:18.000000000 +0000 @@ -0,0 +1,232 @@ +/* fflush.c -- allow flushing input streams + 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 + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Eric Blake. */ + +#include + +/* Specification. */ +#include + +#include +#include + +#include "freading.h" + +#include "stdio-impl.h" + +#include "unused-parameter.h" + +#undef fflush + + +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 +/* GNU libc, BeOS, Haiku, Linux libc5 */ + +/* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ +static void +clear_ungetc_buffer_preserving_position (FILE *fp) +{ + if (fp->_flags & _IO_IN_BACKUP) + /* _IO_free_backup_area is a bit complicated. Simply call fseek. */ + fseeko (fp, 0, SEEK_CUR); +} + +#else + +/* Clear the stream's ungetc buffer. May modify the value of ftello (fp). */ +static void +clear_ungetc_buffer (FILE *fp) +{ +# if defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + if (HASUB (fp)) + { + fp_->_p += fp_->_r; + fp_->_r = 0; + } +# elif defined __EMX__ /* emx+gcc */ + if (fp->_ungetc_count > 0) + { + fp->_ungetc_count = 0; + fp->_rcount = - fp->_rcount; + } +# elif defined _IOERR /* Minix, AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ + /* Nothing to do. */ +# else /* other implementations */ + fseeko (fp, 0, SEEK_CUR); +# endif +} + +#endif + +#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1) +/* GNU libc, BeOS, Haiku, Linux libc5 */ + +# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT +/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + +static int +disable_seek_optimization (FILE *fp) +{ + int saved_flags = fp_->_flags & (__SOPT | __SNPT); + fp_->_flags = (fp_->_flags & ~__SOPT) | __SNPT; + return saved_flags; +} + +static void +restore_seek_optimization (FILE *fp, int saved_flags) +{ + fp_->_flags = (fp_->_flags & ~(__SOPT | __SNPT)) | saved_flags; +} + +# else + +static void +update_fpos_cache (FILE *fp _GL_UNUSED_PARAMETER, + off_t pos _GL_UNUSED_PARAMETER) +{ +# if defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +# if defined __CYGWIN__ + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; +# else + /* fp_->_offset is an fpos_t. */ + /* Use a union, since on NetBSD, the compilation flags determine + whether fpos_t is typedef'd to off_t or a struct containing a + single off_t member. */ + union + { + fpos_t f; + off_t o; + } u; + u.o = pos; + fp_->_offset = u.f; +# endif + fp_->_flags |= __SOFF; +# endif +} +# endif +#endif + +/* Flush all pending data on STREAM according to POSIX rules. Both + output and seekable input streams are supported. */ +int +rpl_fflush (FILE *stream) +{ + /* When stream is NULL, POSIX and C99 only require flushing of "output + streams and update streams in which the most recent operation was not + input", and all implementations do this. + + When stream is "an output stream or an update stream in which the most + recent operation was not input", POSIX and C99 requires that fflush + writes out any buffered data, and all implementations do this. + + When stream is, however, an input stream or an update stream in + which the most recent operation was input, C99 specifies nothing, + and POSIX only specifies behavior if the stream is seekable. + mingw, in particular, drops the input buffer, leaving the file + descriptor positioned at the end of the input buffer. I.e. ftell + (stream) is lost. We don't want to call the implementation's + fflush in this case. + + We test ! freading (stream) here, rather than fwriting (stream), because + what we need to know is whether the stream holds a "read buffer", and on + mingw this is indicated by _IOREAD, regardless of _IOWRT. */ + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + + return fflush (stream); + +#else + { + /* Notes about the file-position indicator: + 1) The file position indicator is incremented by fgetc() and decremented + by ungetc(): + + "... the fgetc() function shall ... advance the associated file + position indicator for the stream ..." + + "The file-position indicator is decremented by each successful + call to ungetc()..." + 2) says: + "The value of the file-position indicator for the stream after + reading or discarding all pushed-back bytes shall be the same + as it was before the bytes were pushed back." + Here we are discarding all pushed-back bytes. But more specifically, + 3) says: + "[After fflush(),] the file offset of the underlying open file + description shall be set to the file position of the stream, and + any characters pushed back onto the stream by ungetc() ... shall + be discarded." */ + + /* POSIX does not specify fflush behavior for non-seekable input + streams. Some implementations purge unread data, some return + EBADF, some do nothing. */ + off_t pos = ftello (stream); + if (pos == -1) + { + errno = EBADF; + return EOF; + } + + /* Clear the ungetc buffer. */ + clear_ungetc_buffer (stream); + + /* To get here, we must be flushing a seekable input stream, so the + semantics of fpurge are now appropriate to clear the buffer. To + avoid losing data, the lseek is also necessary. */ + { + int result = fpurge (stream); + if (result != 0) + return result; + } + +# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + + { + /* Disable seek optimization for the next fseeko call. This tells the + following fseeko call to seek to the desired position directly, rather + than to seek to a block-aligned boundary. */ + int saved_flags = disable_seek_optimization (stream); + int result = fseeko (stream, pos, SEEK_SET); + + restore_seek_optimization (stream, saved_flags); + return result; + } + +# else + + pos = lseek (fileno (stream), pos, SEEK_SET); + if (pos == -1) + return EOF; + /* After a successful lseek, update the file descriptor's position cache + in the stream. */ + update_fpos_cache (stream, pos); + + return 0; + +# endif + } +#endif +} diff -Nru wget-1.19.5/lib/filename.h wget-1.20.1/lib/filename.h --- wget-1.19.5/lib/filename.h 2018-01-19 21:19:16.000000000 +0000 +++ wget-1.20.1/lib/filename.h 2018-12-26 20:08:18.000000000 +0000 @@ -28,7 +28,7 @@ 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__ +#if defined _WIN32 || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ /* Native Windows, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') # define HAS_DEVICE(P) \ diff -Nru wget-1.19.5/lib/flock.c wget-1.20.1/lib/flock.c --- wget-1.19.5/lib/flock.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/flock.c 2018-12-26 20:08:18.000000000 +0000 @@ -24,7 +24,7 @@ #include #include -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* LockFileEx */ # define WIN32_LEAN_AND_MEAN diff -Nru wget-1.19.5/lib/fnmatch.in.h wget-1.20.1/lib/fnmatch.in.h --- wget-1.19.5/lib/fnmatch.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/fnmatch.in.h 2018-12-26 20:08:18.000000000 +0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2018 Free +/* Substitute for and wrapper around . + 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. @@ -16,15 +17,29 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ -#ifndef _FNMATCH_H -#define _FNMATCH_H 1 +#ifndef _@GUARD_PREFIX@_FNMATCH_H -/* The definition of _GL_ARG_NONNULL is copied here. */ +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif +@PRAGMA_COLUMNS@ -#ifdef __cplusplus -extern "C" { +/* The include_next requires a split double-inclusion guard. */ +#if @HAVE_FNMATCH_H@ && !@REPLACE_FNMATCH@ +# @INCLUDE_NEXT@ @NEXT_FNMATCH_H@ #endif +#ifndef _@GUARD_PREFIX@_FNMATCH_H +#define _@GUARD_PREFIX@_FNMATCH_H + +/* 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 !@HAVE_FNMATCH_H@ || @REPLACE_FNMATCH@ + /* We #undef these before defining them because some losing systems (HP-UX A.08.07 for example) define these in . */ #undef FNM_PATHNAME @@ -54,14 +69,42 @@ # define FNM_NOSYS (-1) #endif +#endif + + +#if @GNULIB_FNMATCH@ /* Match NAME against the file name pattern PATTERN, returning zero if it matches, FNM_NOMATCH if not. */ -extern int fnmatch (const char *__pattern, const char *__name, - int __flags) - _GL_ARG_NONNULL ((1, 2)); - -#ifdef __cplusplus -} +# if @REPLACE_FNMATCH@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define fnmatch rpl_fnmatch +# endif +_GL_FUNCDECL_RPL (fnmatch, int, + (const char *pattern, const char *name, int flags) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (fnmatch, int, + (const char *pattern, const char *name, int flags)); +# else +# if !@HAVE_FNMATCH@ +_GL_FUNCDECL_SYS (fnmatch, int, + (const char *pattern, const char *name, int flags) + _GL_ARG_NONNULL ((1, 2))); +# endif +_GL_CXXALIAS_SYS (fnmatch, int, + (const char *pattern, const char *name, int flags)); +# endif +# if !GNULIB_FNMATCH_GNU +_GL_CXXALIASWARN (fnmatch); +# endif +#elif defined GNULIB_POSIXCHECK +# undef fnmatch +# if HAVE_RAW_DECL_FNMATCH +_GL_WARN_ON_USE (fnmatch, + "fnmatch does not portably work - " + "use gnulib module fnmatch for portability or gnulib module fnmatch-gnu for a glibc compatible implementation"); +# endif #endif -#endif /* fnmatch.h */ + +#endif /* _@GUARD_PREFIX@_FNMATCH_H */ +#endif /* _@GUARD_PREFIX@_FNMATCH_H */ diff -Nru wget-1.19.5/lib/fopen.c wget-1.20.1/lib/fopen.c --- wget-1.19.5/lib/fopen.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/fopen.c 2018-12-26 20:08:18.000000000 +0000 @@ -47,7 +47,7 @@ FILE * rpl_fopen (const char *filename, const char *mode) { -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ if (strcmp (filename, "/dev/null") == 0) filename = "NUL"; #endif diff -Nru wget-1.19.5/lib/fpurge.c wget-1.20.1/lib/fpurge.c --- wget-1.19.5/lib/fpurge.c 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/lib/fpurge.c 2018-12-26 20:08:18.000000000 +0000 @@ -0,0 +1,148 @@ +/* Flushing buffers of a FILE stream. + 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 + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +/* Specification. */ +#include + +#if HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7, Android API >= 23 */ +# include +#endif +#include + +#include "stdio-impl.h" + +int +fpurge (FILE *fp) +{ +#if HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7, Android API >= 23, musl libc */ + + __fpurge (fp); + /* The __fpurge function does not have a return value. */ + return 0; + +#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ + + /* Call the system's fpurge function. */ +# undef fpurge +# if !HAVE_DECL_FPURGE + extern int fpurge (FILE *); +# endif + int result = fpurge (fp); +# if defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + if (result == 0) + /* Correct the invariants that fpurge broke. + on BSD systems says: + "The following always hold: if _flags & __SRD, _w is 0." + If this invariant is not fulfilled and the stream is read-write but + currently reading, subsequent putc or fputc calls will write directly + into the buffer, although they shouldn't be allowed to. */ + if ((fp_->_flags & __SRD) != 0) + fp_->_w = 0; +# endif + return result; + +#else + + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ + if (fp->_IO_save_base != NULL) + { + free (fp->_IO_save_base); + fp->_IO_save_base = NULL; + } + return 0; +# elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + fp_->_p = fp_->_bf._base; + fp_->_r = 0; + fp_->_w = ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */ + ? fp_->_bf._size + : 0); + /* Avoid memory leak when there is an active ungetc buffer. */ + if (fp_ub._base != NULL) + { + if (fp_ub._base != fp_->_ubuf) + free (fp_ub._base); + fp_ub._base = NULL; + } + return 0; +# elif defined __EMX__ /* emx+gcc */ + fp->_ptr = fp->_buffer; + fp->_rcount = 0; + fp->_wcount = 0; + fp->_ungetc_count = 0; + return 0; +# elif defined __minix /* Minix */ + fp->_ptr = fp->_buf; + if (fp->_ptr != NULL) + fp->_count = 0; + return 0; +# elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ + fp_->_ptr = fp_->_base; + if (fp_->_ptr != NULL) + fp_->_cnt = 0; + return 0; +# elif defined __UCLIBC__ /* uClibc */ +# ifdef __STDIO_BUFFERS + if (fp->__modeflags & __FLAG_WRITING) + fp->__bufpos = fp->__bufstart; + else if (fp->__modeflags & (__FLAG_READONLY | __FLAG_READING)) + fp->__bufpos = fp->__bufread; +# endif + return 0; +# elif defined __QNX__ /* QNX */ + fp->_Rback = fp->_Back + sizeof (fp->_Back); + fp->_Rsave = NULL; + if (fp->_Mode & 0x2000 /* _MWRITE */) + /* fp->_Buf <= fp->_Next <= fp->_Wend */ + fp->_Next = fp->_Buf; + else + /* fp->_Buf <= fp->_Next <= fp->_Rend */ + fp->_Rend = fp->_Next; + return 0; +# elif defined __MINT__ /* Atari FreeMiNT */ + if (fp->__pushed_back) + { + fp->__bufp = fp->__pushback_bufp; + fp->__pushed_back = 0; + } + /* Preserve the current file position. */ + if (fp->__target != -1) + fp->__target += fp->__bufp - fp->__buffer; + fp->__bufp = fp->__buffer; + /* Nothing in the buffer, next getc is nontrivial. */ + fp->__get_limit = fp->__bufp; + /* Nothing in the buffer, next putc is nontrivial. */ + fp->__put_limit = fp->__buffer; + return 0; +# elif defined EPLAN9 /* Plan9 */ + fp->rp = fp->wp = fp->lp = fp->buf; + return 0; +# else +# error "Please port gnulib fpurge.c to your platform! Look at the definitions of fflush, setvbuf and ungetc on your system, then report this to bug-gnulib." +# endif + +#endif +} diff -Nru wget-1.19.5/lib/freading.c wget-1.20.1/lib/freading.c --- wget-1.19.5/lib/freading.c 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/lib/freading.c 2018-12-26 20:08:18.000000000 +0000 @@ -0,0 +1,76 @@ +/* Retrieve information about a FILE stream. + 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 + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +/* Specification. */ +#include "freading.h" + +#include "stdio-impl.h" + +/* Don't use glibc's __freading function in glibc < 2.7, see + */ +#if !(HAVE___FREADING && (!defined __GLIBC__ || defined __UCLIBC__ || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))) + +bool +freading (FILE *fp) +{ + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +# elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + return (fp_->_flags & __SRD) != 0; +# elif defined __EMX__ /* emx+gcc */ + return (fp->_flags & _IOREAD) != 0; +# elif defined __minix /* Minix */ + return (fp->_flags & _IOREADING) != 0; +# elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ +# if defined __sun /* Solaris */ + return (fp_->_flag & _IOREAD) != 0 && (fp_->_flag & _IOWRT) == 0; +# else + return (fp_->_flag & _IOREAD) != 0; +# endif +# elif defined __UCLIBC__ /* uClibc */ + return (fp->__modeflags & (__FLAG_READONLY | __FLAG_READING)) != 0; +# elif defined __QNX__ /* QNX */ + return ((fp->_Mode & 0x2 /* _MOPENW */) == 0 + || (fp->_Mode & 0x1000 /* _MREAD */) != 0); +# elif defined __MINT__ /* Atari FreeMiNT */ + if (!fp->__mode.__write) + return 1; + if (!fp->__mode.__read) + return 0; +# ifdef _IO_CURRENTLY_GETTING /* Flag added on 2009-02-28 */ + return (fp->__flags & _IO_CURRENTLY_GETTING) != 0; +# else + return (fp->__buffer < fp->__get_limit /*|| fp->__bufp == fp->__put_limit ??*/); +# endif +# elif defined EPLAN9 /* Plan9 */ + if (fp->state == 0 /* CLOSED */ || fp->state == 4 /* WR */) + return 0; + return (fp->state == 3 /* RD */ && (fp->bufl == 0 || fp->rp < fp->wp)); +# else +# error "Please port gnulib freading.c to your platform!" +# endif +} + +#endif diff -Nru wget-1.19.5/lib/freading.h wget-1.20.1/lib/freading.h --- wget-1.19.5/lib/freading.h 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/lib/freading.h 2018-12-26 20:08:18.000000000 +0000 @@ -0,0 +1,53 @@ +/* Retrieve information about a FILE stream. + 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 + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include +#include + +/* Return true if the stream STREAM is opened read-only, or if the + last operation on the stream was a read operation. Return false if + the stream is opened write-only or append-only, or if it supports + writing and there is no current read operation (such as fgetc). + + freading and fwriting will never both be true. If STREAM supports + both reads and writes, then: + - both freading and fwriting might be false when the stream is first + opened, after read encounters EOF, or after fflush, + - freading might be false or true and fwriting might be false + after repositioning (such as fseek, fsetpos, or rewind), + depending on the underlying implementation. + + STREAM must not be wide-character oriented. */ + +#if HAVE___FREADING && (!defined __GLIBC__ || defined __UCLIBC__ || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) +/* Solaris >= 7, Android API >= 29, not glibc >= 2.2, but glibc >= 2.7, or musl libc */ + +# include +# define freading(stream) (__freading (stream) != 0) + +#else + +# ifdef __cplusplus +extern "C" { +# endif + +extern bool freading (FILE *stream) _GL_ATTRIBUTE_PURE; + +# ifdef __cplusplus +} +# endif + +#endif diff -Nru wget-1.19.5/lib/fseeko.c wget-1.20.1/lib/fseeko.c --- wget-1.19.5/lib/fseeko.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/fseeko.c 2018-12-26 20:08:18.000000000 +0000 @@ -33,9 +33,9 @@ #endif #if _GL_WINDOWS_64_BIT_OFF_T # undef fseeko -# if HAVE__FSEEKI64 /* msvc, mingw64 */ +# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */ # define fseeko _fseeki64 -# else /* mingw */ +# else /* mingw before msvcrt8.0 */ # define fseeko fseeko64 # endif #endif @@ -47,7 +47,8 @@ #endif /* These tests are based on fpurge.c. */ -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ if (fp->_IO_read_end == fp->_IO_read_ptr && fp->_IO_write_ptr == fp->_IO_write_base && fp->_IO_save_base == NULL) @@ -123,7 +124,8 @@ return -1; } -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_flags &= ~_IO_EOF_SEEN; fp->_offset = pos; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ diff -Nru wget-1.19.5/lib/fstat.c wget-1.20.1/lib/fstat.c --- wget-1.19.5/lib/fstat.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/fstat.c 2018-12-26 20:08:18.000000000 +0000 @@ -25,7 +25,7 @@ #include #undef __need_system_sys_stat_h -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # define WINDOWS_NATIVE #endif diff -Nru wget-1.19.5/lib/getaddrinfo.c wget-1.20.1/lib/getaddrinfo.c --- wget-1.19.5/lib/getaddrinfo.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/getaddrinfo.c 2018-12-26 20:08:18.000000000 +0000 @@ -54,7 +54,7 @@ # define PF_UNSPEC 0 #endif -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +#if defined _WIN32 && !defined __CYGWIN__ # define WINDOWS_NATIVE #endif @@ -62,6 +62,11 @@ #include "sockets.h" #ifdef WINDOWS_NATIVE + +/* Avoid warnings from gcc -Wcast-function-type. */ +# define GetProcAddress \ + (void *) GetProcAddress + typedef int (WSAAPI *getaddrinfo_func) (const char*, const char*, const struct addrinfo*, struct addrinfo**); diff -Nru wget-1.19.5/lib/getdelim.c wget-1.20.1/lib/getdelim.c --- wget-1.19.5/lib/getdelim.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/getdelim.c 2018-12-26 20:08:18.000000000 +0000 @@ -50,7 +50,7 @@ static void alloc_failed (void) { -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Avoid errno problem without using the realloc module; see: https://lists.gnu.org/r/bug-gnulib/2016-08/msg00025.html */ errno = ENOMEM; diff -Nru wget-1.19.5/lib/getdtablesize.c wget-1.20.1/lib/getdtablesize.c --- wget-1.19.5/lib/getdtablesize.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/getdtablesize.c 2018-12-26 20:08:18.000000000 +0000 @@ -20,7 +20,7 @@ /* Specification. */ #include -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # include diff -Nru wget-1.19.5/lib/getgroups.c wget-1.20.1/lib/getgroups.c --- wget-1.19.5/lib/getgroups.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/getgroups.c 2018-12-26 20:08:18.000000000 +0000 @@ -58,8 +58,8 @@ # define getgroups posix_getgroups # endif -/* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, NULL) always - fails. On other systems, it returns the number of supplemental +/* On at least NeXTstep 3.2, getgroups (0, NULL) always fails. + On other systems, it returns the number of supplemental groups for the process. This function handles that special case and lets the system-provided function handle all others. However, it can fail with ENOMEM if memory is tight. It is unspecified diff -Nru wget-1.19.5/lib/getopt.c wget-1.20.1/lib/getopt.c --- wget-1.19.5/lib/getopt.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/getopt.c 2018-12-26 20:08:18.000000000 +0000 @@ -46,7 +46,7 @@ /* When used standalone, flockfile and funlockfile might not be available. */ # if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \ - || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + || (defined _WIN32 && ! defined __CYGWIN__)) # define flockfile(fp) /* nop */ # define funlockfile(fp) /* nop */ # endif diff -Nru wget-1.19.5/lib/getpass.c wget-1.20.1/lib/getpass.c --- wget-1.19.5/lib/getpass.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/getpass.c 2018-12-26 20:08:18.000000000 +0000 @@ -23,7 +23,7 @@ #include -#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) +#if !(defined _WIN32 && !defined __CYGWIN__) # include diff -Nru wget-1.19.5/lib/getpass.h wget-1.20.1/lib/getpass.h --- wget-1.19.5/lib/getpass.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/getpass.h 2018-12-26 20:08:18.000000000 +0000 @@ -1,30 +1,4 @@ -/* getpass.h -- Read a password of arbitrary length from /dev/tty or stdin. - 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 - 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 GETPASS_H -# define GETPASS_H +/* Obsolete; consider using unistd.h instead. */ /* Get getpass declaration, if available. */ -# include - -# if !HAVE_DECL_GETPASS -/* Read a password of arbitrary length from /dev/tty or stdin. */ -char *getpass (const char *prompt); - -# endif - -#endif /* GETPASS_H */ +#include diff -Nru wget-1.19.5/lib/getprogname.c wget-1.20.1/lib/getprogname.c --- wget-1.19.5/lib/getprogname.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/getprogname.c 2018-12-26 20:08:18.000000000 +0000 @@ -110,9 +110,73 @@ first = 0; pid_t pid = getpid (); struct pst_status status; - p = (0 < pstat_getproc (&status, sizeof status, 0, pid) - ? strdup (status.pst_ucomm) - : NULL); + if (pstat_getproc (&status, sizeof status, 0, pid) > 0) + { + char *ucomm = status.pst_ucomm; + char *cmd = status.pst_cmd; + if (strlen (ucomm) < PST_UCOMMLEN - 1) + p = ucomm; + else + { + /* ucomm is truncated to length PST_UCOMMLEN - 1. + Look at cmd instead. */ + char *space = strchr (cmd, ' '); + if (space != NULL) + *space = '\0'; + p = strrchr (cmd, '/'); + if (p != NULL) + p++; + else + p = cmd; + if (strlen (p) > PST_UCOMMLEN - 1 + && memcmp (p, ucomm, PST_UCOMMLEN - 1) == 0) + /* p is less truncated than ucomm. */ + ; + else + p = ucomm; + } + p = strdup (p); + } + else + { +# if !defined __LP64__ + /* Support for 32-bit programs running in 64-bit HP-UX. + The documented way to do this is to use the same source code + as above, but in a compilation unit where '#define _PSTAT64 1' + is in effect. I prefer a single compilation unit; the struct + size and the offsets are not going to change. */ + char status64[1216]; + if (__pstat_getproc64 (status64, sizeof status64, 0, pid) > 0) + { + char *ucomm = status64 + 288; + char *cmd = status64 + 168; + if (strlen (ucomm) < PST_UCOMMLEN - 1) + p = ucomm; + else + { + /* ucomm is truncated to length PST_UCOMMLEN - 1. + Look at cmd instead. */ + char *space = strchr (cmd, ' '); + if (space != NULL) + *space = '\0'; + p = strrchr (cmd, '/'); + if (p != NULL) + p++; + else + p = cmd; + if (strlen (p) > PST_UCOMMLEN - 1 + && memcmp (p, ucomm, PST_UCOMMLEN - 1) == 0) + /* p is less truncated than ucomm. */ + ; + else + p = ucomm; + } + p = strdup (p); + } + else +# endif + p = NULL; + } if (!p) p = "?"; } diff -Nru wget-1.19.5/lib/gettime.c wget-1.20.1/lib/gettime.c --- wget-1.19.5/lib/gettime.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/gettime.c 2018-12-26 20:08:18.000000000 +0000 @@ -28,21 +28,22 @@ void gettime (struct timespec *ts) { -#if HAVE_NANOTIME - nanotime (ts); +#if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME + clock_gettime (CLOCK_REALTIME, ts); #else + struct timeval tv; + gettimeofday (&tv, NULL); + ts->tv_sec = tv.tv_sec; + ts->tv_nsec = tv.tv_usec * 1000; +#endif +} -# if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME - if (clock_gettime (CLOCK_REALTIME, ts) == 0) - return; -# endif - - { - struct timeval tv; - gettimeofday (&tv, NULL); - ts->tv_sec = tv.tv_sec; - ts->tv_nsec = tv.tv_usec * 1000; - } +/* Return the current system time as a struct timespec. */ -#endif +struct timespec +current_timespec (void) +{ + struct timespec ts; + gettime (&ts); + return ts; } diff -Nru wget-1.19.5/lib/gettimeofday.c wget-1.20.1/lib/gettimeofday.c --- wget-1.19.5/lib/gettimeofday.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/gettimeofday.c 2018-12-26 20:08:18.000000000 +0000 @@ -24,7 +24,7 @@ #include -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # define WINDOWS_NATIVE # include #endif @@ -33,6 +33,10 @@ #ifdef WINDOWS_NATIVE +/* Avoid warnings from gcc -Wcast-function-type. */ +# define GetProcAddress \ + (void *) GetProcAddress + /* GetSystemTimePreciseAsFileTime was introduced only in Windows 8. */ typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME *lpTime); static GetSystemTimePreciseAsFileTimeFuncType GetSystemTimePreciseAsFileTimeFunc = NULL; @@ -45,7 +49,7 @@ if (kernel32 != NULL) { GetSystemTimePreciseAsFileTimeFunc = - (GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime"); + (GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime"); } initialized = TRUE; } diff -Nru wget-1.19.5/lib/glthread/lock.h wget-1.20.1/lib/glthread/lock.h --- wget-1.19.5/lib/glthread/lock.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/glthread/lock.h 2018-12-26 20:08:18.000000000 +0000 @@ -149,8 +149,14 @@ # endif # if !PTHREAD_IN_USE_DETECTION_HARD -# pragma weak pthread_cancel -# define pthread_in_use() (pthread_cancel != NULL) + /* Considering all platforms with USE_POSIX_THREADS_WEAK, only few symbols + can be used to determine whether libpthread is in use. These are: + pthread_mutexattr_gettype + pthread_rwlockattr_destroy + pthread_rwlockattr_init + */ +# pragma weak pthread_mutexattr_gettype +# define pthread_in_use() (pthread_mutexattr_gettype != NULL) # endif # else diff -Nru wget-1.19.5/lib/iconv.in.h wget-1.20.1/lib/iconv.in.h --- wget-1.19.5/lib/iconv.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/iconv.in.h 2018-12-26 20:08:18.000000000 +0000 @@ -52,6 +52,12 @@ (const char *tocode, const char *fromcode)); # endif _GL_CXXALIASWARN (iconv_open); +#elif defined GNULIB_POSIXCHECK +# undef iconv_open +# if HAVE_RAW_DECL_ICONV_OPEN +_GL_WARN_ON_USE (iconv_open, "iconv_open is not working correctly everywhere - " + "use gnulib module iconv for portability"); +# endif #endif #if @REPLACE_ICONV_UTF@ @@ -90,6 +96,12 @@ # ifndef ICONV_CONST # define ICONV_CONST @ICONV_CONST@ # endif +#elif defined GNULIB_POSIXCHECK +# undef iconv +# if HAVE_RAW_DECL_ICONV +_GL_WARN_ON_USE (iconv, "iconv is not working correctly everywhere - " + "use gnulib module iconv for portability"); +# endif #endif #if @GNULIB_ICONV@ diff -Nru wget-1.19.5/lib/intprops.h wget-1.20.1/lib/intprops.h --- wget-1.19.5/lib/intprops.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/intprops.h 2018-12-26 20:08:18.000000000 +0000 @@ -22,12 +22,13 @@ #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)) +/* Return a value with the common real type of E and V and the value of V. + Do not evaluate E. */ +#define _GL_INT_CONVERT(e, v) ((1 ? 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)) +#define _GL_INT_NEGATE_CONVERT(e, v) ((1 ? 0 : (e)) - (v)) /* The extra casts in the following macros work around compiler bugs, e.g., in Cray C 5.0.3.0. */ @@ -40,13 +41,14 @@ #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) /* Return 1 if the real expression E, after promotion, has a - signed or floating type. */ + signed or floating type. Do not evaluate E. */ #define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) /* Minimum and maximum values for integer types and expressions. */ /* The width in bits of the integer type or expression T. + Do not evaluate T. Padding bits are not supported; this is checked at compile-time below. */ #define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) @@ -58,7 +60,7 @@ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) /* The maximum and minimum values for the type of the expression E, - after integer promotion. E should not have side effects. */ + after integer promotion. E is not evaluated. */ #define _GL_INT_MINIMUM(e) \ (EXPR_SIGNED (e) \ ? ~ _GL_SIGNED_INT_MAXIMUM (e) \ @@ -340,8 +342,8 @@ Arguments should be free of side effects. */ #define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \ op_result_overflow (a, b, \ - _GL_INT_MINIMUM (0 * (b) + (a)), \ - _GL_INT_MAXIMUM (0 * (b) + (a))) + _GL_INT_MINIMUM (_GL_INT_CONVERT (a, b)), \ + _GL_INT_MAXIMUM (_GL_INT_CONVERT (a, b))) /* Store the low-order bits of A + B, A - B, A * B, respectively, into *R. Return 1 if the result overflows. See above for restrictions. */ diff -Nru wget-1.19.5/lib/inttypes.in.h wget-1.20.1/lib/inttypes.in.h --- wget-1.19.5/lib/inttypes.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/inttypes.in.h 2018-12-26 20:08:18.000000000 +0000 @@ -52,7 +52,7 @@ /* Get CHAR_BIT. */ #include /* On mingw, __USE_MINGW_ANSI_STDIO only works if is also included */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # include #endif @@ -1067,11 +1067,13 @@ #endif #if @GNULIB_IMAXDIV@ -# if !@HAVE_DECL_IMAXDIV@ +# if !@HAVE_IMAXDIV_T@ # if !GNULIB_defined_imaxdiv_t typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t; # define GNULIB_defined_imaxdiv_t 1 # endif +# endif +# if !@HAVE_DECL_IMAXDIV@ extern imaxdiv_t imaxdiv (intmax_t, intmax_t); # endif #elif defined GNULIB_POSIXCHECK diff -Nru wget-1.19.5/lib/langinfo.in.h wget-1.20.1/lib/langinfo.in.h --- wget-1.19.5/lib/langinfo.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/langinfo.in.h 2018-12-26 20:08:18.000000000 +0000 @@ -86,6 +86,18 @@ # define MON_10 (MON_1 + 9) # define MON_11 (MON_1 + 10) # define MON_12 (MON_1 + 11) +# define ALTMON_1 10200 +# define ALTMON_2 (ALTMON_1 + 1) +# define ALTMON_3 (ALTMON_1 + 2) +# define ALTMON_4 (ALTMON_1 + 3) +# define ALTMON_5 (ALTMON_1 + 4) +# define ALTMON_6 (ALTMON_1 + 5) +# define ALTMON_7 (ALTMON_1 + 6) +# define ALTMON_8 (ALTMON_1 + 7) +# define ALTMON_9 (ALTMON_1 + 8) +# define ALTMON_10 (ALTMON_1 + 9) +# define ALTMON_11 (ALTMON_1 + 10) +# define ALTMON_12 (ALTMON_1 + 11) # define ABMON_1 10035 # define ABMON_2 (ABMON_1 + 1) # define ABMON_3 (ABMON_1 + 2) @@ -138,6 +150,22 @@ # define GNULIB_defined_T_FMT_AMPM 1 # endif +# if !@HAVE_LANGINFO_ALTMON@ +# define ALTMON_1 10200 +# define ALTMON_2 (ALTMON_1 + 1) +# define ALTMON_3 (ALTMON_1 + 2) +# define ALTMON_4 (ALTMON_1 + 3) +# define ALTMON_5 (ALTMON_1 + 4) +# define ALTMON_6 (ALTMON_1 + 5) +# define ALTMON_7 (ALTMON_1 + 6) +# define ALTMON_8 (ALTMON_1 + 7) +# define ALTMON_9 (ALTMON_1 + 8) +# define ALTMON_10 (ALTMON_1 + 9) +# define ALTMON_11 (ALTMON_1 + 10) +# define ALTMON_12 (ALTMON_1 + 11) +# define GNULIB_defined_ALTMON 1 +# endif + # if !@HAVE_LANGINFO_ERA@ # define ERA 10047 # define ERA_D_FMT 10048 diff -Nru wget-1.19.5/lib/libc-config.h wget-1.20.1/lib/libc-config.h --- wget-1.19.5/lib/libc-config.h 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/lib/libc-config.h 2018-12-26 20:08:18.000000000 +0000 @@ -0,0 +1,174 @@ +/* System definitions for code taken from the GNU C Library + + 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 + . */ + +/* Written by Paul Eggert. */ + +/* This is intended to be a good-enough substitute for glibc system + macros like those defined in , so that Gnulib code + shared with glibc can do this as the first #include: + + #ifndef _LIBC + # include + #endif + + When compiled as part of glibc this is a no-op; when compiled as + part of Gnulib this includes Gnulib's and defines macros + that glibc library code would normally assume. */ + +#include + +/* On glibc this includes and and #defines + _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it + includes which defines __nonnull. Elsewhere it + is harmless. */ +#include + +/* From glibc . */ +#ifndef __set_errno +# define __set_errno(val) (errno = (val)) +#endif + +/* From glibc . */ + +#ifndef __GNUC_PREREQ +# if defined __GNUC__ && defined __GNUC_MINOR__ +# define __GNUC_PREREQ(maj, min) ((maj) < __GNUC__ + ((min) <= __GNUC_MINOR__)) +# else +# define __GNUC_PREREQ(maj, min) 0 +# endif +#endif + +#ifndef __glibc_clang_prereq +# if defined __clang_major__ && defined __clang_minor__ +# define __glibc_clang_prereq(maj, min) \ + ((maj) < __clang_major__ + ((min) <= __clang_minor__)) +# else +# define __glibc_clang_prereq(maj, min) 0 +# endif +#endif + + +/* Prepare to include , which is our copy of glibc + . */ + +/* Define _FEATURES_H so that does not include . */ +#ifndef _FEATURES_H +# define _FEATURES_H 1 +#endif +/* Define __WORDSIZE so that does not attempt to include + nonexistent files. Make it a syntax error, since Gnulib does not + use __WORDSIZE now, and if Gnulib uses it later the syntax error + will let us know that __WORDSIZE needs configuring. */ +#ifndef __WORDSIZE +# define __WORDSIZE %%% +#endif +/* Undef the macros unconditionally defined by our copy of glibc + , so that they do not clash with any system-defined + versions. */ +#undef _SYS_CDEFS_H +#undef __ASMNAME +#undef __ASMNAME2 +#undef __BEGIN_DECLS +#undef __CONCAT +#undef __END_DECLS +#undef __HAVE_GENERIC_SELECTION +#undef __LDBL_COMPAT +#undef __LDBL_REDIR +#undef __LDBL_REDIR1 +#undef __LDBL_REDIR1_DECL +#undef __LDBL_REDIR1_NTH +#undef __LDBL_REDIR_DECL +#undef __LDBL_REDIR_NTH +#undef __LEAF +#undef __LEAF_ATTR +#undef __NTH +#undef __NTHNL +#undef __P +#undef __PMT +#undef __REDIRECT +#undef __REDIRECT_LDBL +#undef __REDIRECT_NTH +#undef __REDIRECT_NTHNL +#undef __REDIRECT_NTH_LDBL +#undef __STRING +#undef __THROW +#undef __THROWNL +#undef __always_inline +#undef __attribute__ +#undef __attribute_alloc_size__ +#undef __attribute_artificial__ +#undef __attribute_const__ +#undef __attribute_deprecated__ +#undef __attribute_deprecated_msg__ +#undef __attribute_format_arg__ +#undef __attribute_format_strfmon__ +#undef __attribute_malloc__ +#undef __attribute_noinline__ +#undef __attribute_nonstring__ +#undef __attribute_pure__ +#undef __attribute_used__ +#undef __attribute_warn_unused_result__ +#undef __bos +#undef __bos0 +#undef __errordecl +#undef __extension__ +#undef __extern_always_inline +#undef __extern_inline +#undef __flexarr +#undef __fortify_function +#undef __glibc_c99_flexarr_available +#undef __glibc_clang_has_extension +#undef __glibc_likely +#undef __glibc_macro_warning +#undef __glibc_macro_warning1 +#undef __glibc_unlikely +#undef __inline +#undef __ptr_t +#undef __restrict +#undef __restrict_arr +#undef __va_arg_pack +#undef __va_arg_pack_len +#undef __warnattr +#undef __warndecl + +/* Include our copy of glibc . */ +#include + +/* __inline is too pessimistic for non-GCC. */ +#undef __inline +#ifndef HAVE___INLINE +# if 199901 <= __STDC_VERSION__ || defined inline +# define __inline inline +# else +# define __inline +# endif +#endif + + +/* A substitute for glibc , good enough for Gnulib. */ +#define attribute_hidden +#define libc_hidden_proto(name, ...) +#define libc_hidden_def(name) +#define libc_hidden_weak(name) +#define libc_hidden_ver(local, name) +#define strong_alias(name, aliasname) +#define weak_alias(name, aliasname) + +/* A substitute for glibc , good enough for Gnulib. */ +#define SHLIB_COMPAT(lib, introduced, obsoleted) 0 +#define versioned_symbol(lib, local, symbol, version) diff -Nru wget-1.19.5/lib/limits.in.h wget-1.20.1/lib/limits.in.h --- wget-1.19.5/lib/limits.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/limits.in.h 2018-12-26 20:08:18.000000000 +0000 @@ -28,15 +28,32 @@ #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 +#ifndef LLONG_MIN +# if defined LONG_LONG_MIN /* HP-UX 11.31 */ +# define LLONG_MIN LONG_LONG_MIN +# elif defined LONGLONG_MIN /* IRIX 6.5 */ +# define LLONG_MIN LONGLONG_MIN +# elif defined __GNUC__ +# define LLONG_MIN (- __LONG_LONG_MAX__ - 1LL) +# endif #endif -#if defined LONG_LONG_MAX && !defined LLONG_MAX -# define LLONG_MAX LONG_LONG_MAX +#ifndef LLONG_MAX +# if defined LONG_LONG_MAX /* HP-UX 11.31 */ +# define LLONG_MAX LONG_LONG_MAX +# elif defined LONGLONG_MAX /* IRIX 6.5 */ +# define LLONG_MAX LONGLONG_MAX +# elif defined __GNUC__ +# define LLONG_MAX __LONG_LONG_MAX__ +# endif #endif -#if defined ULONG_LONG_MAX && !defined ULLONG_MAX -# define ULLONG_MAX ULONG_LONG_MAX +#ifndef ULLONG_MAX +# if defined ULONG_LONG_MAX /* HP-UX 11.31 */ +# define ULLONG_MAX ULONG_LONG_MAX +# elif defined ULONGLONG_MAX /* IRIX 6.5 */ +# define ULLONG_MAX ULONGLONG_MAX +# elif defined __GNUC__ +# define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1ULL) +# endif #endif /* The number of usable bits in an unsigned or signed integer type @@ -53,6 +70,19 @@ #define _GL_COB8(n) (_GL_COB4 ((n) >> 4) + _GL_COB4 (n)) #define _GL_COB4(n) (!!((n) & 8) + !!((n) & 4) + !!((n) & 2) + !!((n) & 1)) +#ifndef WORD_BIT +/* Assume 'int' is 32 bits wide. */ +# define WORD_BIT 32 +#endif +#ifndef LONG_BIT +/* Assume 'long' is 32 or 64 bits wide. */ +# if LONG_MAX == INT_MAX +# define LONG_BIT 32 +# else +# define LONG_BIT 64 +# endif +#endif + /* Macros specified by ISO/IEC TS 18661-1:2014. */ #if (! defined ULLONG_WIDTH \ diff -Nru wget-1.19.5/lib/link.c wget-1.20.1/lib/link.c --- wget-1.19.5/lib/link.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/link.c 2018-12-26 20:08:18.000000000 +0000 @@ -25,11 +25,15 @@ #include #if !HAVE_LINK -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN # include +/* Avoid warnings from gcc -Wcast-function-type. */ +# define GetProcAddress \ + (void *) GetProcAddress + /* CreateHardLink was introduced only in Windows 2000. */ typedef BOOL (WINAPI * CreateHardLinkFuncType) (LPCTSTR lpFileName, LPCTSTR lpExistingFileName, diff -Nru wget-1.19.5/lib/localcharset.c wget-1.20.1/lib/localcharset.c --- wget-1.19.5/lib/localcharset.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/localcharset.c 2018-12-26 20:08:18.000000000 +0000 @@ -22,7 +22,6 @@ /* Specification. */ #include "localcharset.h" -#include #include #include #include @@ -32,7 +31,7 @@ # define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */ #endif -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +#if defined _WIN32 && !defined __CYGWIN__ # define WINDOWS_NATIVE # include #endif @@ -45,11 +44,10 @@ #endif #if !defined WINDOWS_NATIVE -# include # if HAVE_LANGINFO_CODESET # include # else -# if 0 /* see comment below */ +# if 0 /* see comment regarding use of setlocale(), below */ # include # endif # endif @@ -71,321 +69,613 @@ # include #endif -#if ENABLE_RELOCATABLE -# include "relocatable.h" -#else -# define relocate(pathname) (pathname) -# define relocate2(pathname,allocatedp) (*(allocatedp) = NULL, (pathname)) -#endif - -/* Get LIBDIR. */ -#ifndef LIBDIR -# include "configmake.h" -#endif - -/* Define O_NOFOLLOW to 0 on platforms where it does not exist. */ -#ifndef O_NOFOLLOW -# define O_NOFOLLOW 0 -#endif - -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ - /* Native Windows, Cygwin, OS/2, DOS */ -# define ISSLASH(C) ((C) == '/' || (C) == '\\') -#endif -#ifndef DIRECTORY_SEPARATOR -# define DIRECTORY_SEPARATOR '/' -#endif +#if HAVE_LANGINFO_CODESET || defined WINDOWS_NATIVE || defined OS2 -#ifndef ISSLASH -# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) -#endif +/* On these platforms, we use a mapping from non-canonical encoding name + to GNU canonical encoding name. */ -#if HAVE_DECL_GETC_UNLOCKED -# undef getc -# define getc getc_unlocked -#endif +/* With glibc-2.1 or newer, we don't need any canonicalization, + because glibc has iconv and both glibc and libiconv support all + GNU canonical names directly. */ +# if !((defined __GNU_LIBRARY__ && __GLIBC__ >= 2) || defined __UCLIBC__) -/* The following static variable is declared 'volatile' to avoid a - possible multithread problem in the function get_charset_aliases. If we - are running in a threaded environment, and if two threads initialize - 'charset_aliases' simultaneously, both will produce the same value, - and everything will be ok if the two assignments to 'charset_aliases' - are atomic. But I don't know what will happen if the two assignments mix. */ -#if __STDC__ != 1 -# define volatile /* empty */ -#endif -/* Pointer to the contents of the charset.alias file, if it has already been - read, else NULL. Its format is: - ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ -static const char * volatile charset_aliases; - -/* Return a pointer to the contents of the charset.alias file. */ -static const char * -get_charset_aliases (void) +struct table_entry { - const char *cp; - - cp = charset_aliases; - 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; - - /* Make it possible to override the charset.alias location. This is - necessary for running the testsuite before "make install". */ - dir = getenv ("CHARSETALIASDIR"); - if (dir == NULL || dir[0] == '\0') - dir = relocate2 (LIBDIR, &malloc_dir); - - /* Concatenate dir and base into freshly allocated file_name. */ - { - size_t dir_len = strlen (dir); - size_t base_len = strlen (base); - int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1])); - file_name = (char *) malloc (dir_len + add_slash + base_len + 1); - if (file_name != NULL) - { - memcpy (file_name, dir, dir_len); - if (add_slash) - file_name[dir_len] = DIRECTORY_SEPARATOR; - memcpy (file_name + dir_len + add_slash, base, base_len + 1); - } - } - - free (malloc_dir); - - if (file_name == NULL) - /* Out of memory. Treat the file as empty. */ - cp = ""; - else - { - int fd; - - /* Open the file. Reject symbolic links on platforms that support - O_NOFOLLOW. This is a security feature. Without it, an attacker - could retrieve parts of the contents (namely, the tail of the - first line that starts with "* ") of an arbitrary file by placing - a symbolic link to that file under the name "charset.alias" in - some writable directory and defining the environment variable - CHARSETALIASDIR to point to that directory. */ - fd = open (file_name, - O_RDONLY | (HAVE_WORKING_O_NOFOLLOW ? O_NOFOLLOW : 0)); - if (fd < 0) - /* File not found. Treat it as empty. */ - cp = ""; - else - { - FILE *fp; - - fp = fdopen (fd, "r"); - if (fp == NULL) - { - /* Out of memory. Treat the file as empty. */ - close (fd); - cp = ""; - } - else - { - /* Parse the file's contents. */ - char *res_ptr = NULL; - size_t res_size = 0; - - for (;;) - { - int c; - char buf1[50+1]; - char buf2[50+1]; - size_t l1, l2; - char *old_res_ptr; - - c = getc (fp); - if (c == EOF) - break; - if (c == '\n' || c == ' ' || c == '\t') - continue; - if (c == '#') - { - /* Skip comment, to end of line. */ - do - c = getc (fp); - while (!(c == EOF || c == '\n')); - if (c == EOF) - break; - continue; - } - ungetc (c, fp); - if (fscanf (fp, "%50s %50s", buf1, buf2) < 2) - break; - l1 = strlen (buf1); - l2 = strlen (buf2); - old_res_ptr = res_ptr; - if (res_size == 0) - { - res_size = l1 + 1 + l2 + 1; - res_ptr = (char *) malloc (res_size + 1); - } - else - { - res_size += l1 + 1 + l2 + 1; - res_ptr = (char *) realloc (res_ptr, res_size + 1); - } - if (res_ptr == NULL) - { - /* Out of memory. */ - res_size = 0; - free (old_res_ptr); - break; - } - strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1); - strcpy (res_ptr + res_size - (l2 + 1), buf2); - } - fclose (fp); - if (res_size == 0) - cp = ""; - else - { - *(res_ptr + res_size) = '\0'; - cp = res_ptr; - } - } - } + const char alias[11+1]; + const char canonical[11+1]; +}; + +/* Table of platform-dependent mappings, sorted in ascending order. */ +static const struct table_entry alias_table[] = + { +# if defined __FreeBSD__ /* FreeBSD */ + /*{ "ARMSCII-8", "ARMSCII-8" },*/ + { "Big5", "BIG5" }, + { "C", "ASCII" }, + /*{ "CP1131", "CP1131" },*/ + /*{ "CP1251", "CP1251" },*/ + /*{ "CP866", "CP866" },*/ + /*{ "GB18030", "GB18030" },*/ + /*{ "GB2312", "GB2312" },*/ + /*{ "GBK", "GBK" },*/ + /*{ "ISCII-DEV", "?" },*/ + { "ISO8859-1", "ISO-8859-1" }, + { "ISO8859-13", "ISO-8859-13" }, + { "ISO8859-15", "ISO-8859-15" }, + { "ISO8859-2", "ISO-8859-2" }, + { "ISO8859-5", "ISO-8859-5" }, + { "ISO8859-7", "ISO-8859-7" }, + { "ISO8859-9", "ISO-8859-9" }, + /*{ "KOI8-R", "KOI8-R" },*/ + /*{ "KOI8-U", "KOI8-U" },*/ + { "SJIS", "SHIFT_JIS" }, + { "US-ASCII", "ASCII" }, + { "eucCN", "GB2312" }, + { "eucJP", "EUC-JP" }, + { "eucKR", "EUC-KR" } +# define alias_table_defined +# endif +# if defined __NetBSD__ /* NetBSD */ + { "646", "ASCII" }, + /*{ "ARMSCII-8", "ARMSCII-8" },*/ + /*{ "BIG5", "BIG5" },*/ + { "Big5-HKSCS", "BIG5-HKSCS" }, + /*{ "CP1251", "CP1251" },*/ + /*{ "CP866", "CP866" },*/ + /*{ "GB18030", "GB18030" },*/ + /*{ "GB2312", "GB2312" },*/ + { "ISO8859-1", "ISO-8859-1" }, + { "ISO8859-13", "ISO-8859-13" }, + { "ISO8859-15", "ISO-8859-15" }, + { "ISO8859-2", "ISO-8859-2" }, + { "ISO8859-4", "ISO-8859-4" }, + { "ISO8859-5", "ISO-8859-5" }, + { "ISO8859-7", "ISO-8859-7" }, + /*{ "KOI8-R", "KOI8-R" },*/ + /*{ "KOI8-U", "KOI8-U" },*/ + /*{ "PT154", "PT154" },*/ + { "SJIS", "SHIFT_JIS" }, + { "eucCN", "GB2312" }, + { "eucJP", "EUC-JP" }, + { "eucKR", "EUC-KR" }, + { "eucTW", "EUC-TW" } +# define alias_table_defined +# endif +# if defined __OpenBSD__ /* OpenBSD */ + { "646", "ASCII" }, + { "ISO8859-1", "ISO-8859-1" }, + { "ISO8859-13", "ISO-8859-13" }, + { "ISO8859-15", "ISO-8859-15" }, + { "ISO8859-2", "ISO-8859-2" }, + { "ISO8859-4", "ISO-8859-4" }, + { "ISO8859-5", "ISO-8859-5" }, + { "ISO8859-7", "ISO-8859-7" } +# define alias_table_defined +# endif +# if defined __APPLE__ && defined __MACH__ /* Mac OS X */ + /* Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is + useless: + - It returns the empty string when LANG is set to a locale of the + form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8 + LC_CTYPE file. + - The environment variables LANG, LC_CTYPE, LC_ALL are not set by + the system; nl_langinfo(CODESET) returns "US-ASCII" in this case. + - The documentation says: + "... all code that calls BSD system routines should ensure + that the const *char parameters of these routines are in UTF-8 + encoding. All BSD system functions expect their string + parameters to be in UTF-8 encoding and nothing else." + It also says + "An additional caveat is that string parameters for files, + paths, and other file-system entities must be in canonical + UTF-8. In a canonical UTF-8 Unicode string, all decomposable + characters are decomposed ..." + but this is not true: You can pass non-decomposed UTF-8 strings + to file system functions, and it is the OS which will convert + them to decomposed UTF-8 before accessing the file system. + - The Apple Terminal application displays UTF-8 by default. + - However, other applications are free to use different encodings: + - xterm uses ISO-8859-1 by default. + - TextEdit uses MacRoman by default. + We prefer UTF-8 over decomposed UTF-8-MAC because one should + minimize the use of decomposed Unicode. Unfortunately, through the + Darwin file system, decomposed UTF-8 strings are leaked into user + space nevertheless. + Then there are also the locales with encodings other than US-ASCII + and UTF-8. These locales can be occasionally useful to users (e.g. + when grepping through ISO-8859-1 encoded text files), when all their + file names are in US-ASCII. + */ + { "ARMSCII-8", "ARMSCII-8" }, + { "Big5", "BIG5" }, + { "Big5HKSCS", "BIG5-HKSCS" }, + { "CP1131", "CP1131" }, + { "CP1251", "CP1251" }, + { "CP866", "CP866" }, + { "CP949", "CP949" }, + { "GB18030", "GB18030" }, + { "GB2312", "GB2312" }, + { "GBK", "GBK" }, + /*{ "ISCII-DEV", "?" },*/ + { "ISO8859-1", "ISO-8859-1" }, + { "ISO8859-13", "ISO-8859-13" }, + { "ISO8859-15", "ISO-8859-15" }, + { "ISO8859-2", "ISO-8859-2" }, + { "ISO8859-4", "ISO-8859-4" }, + { "ISO8859-5", "ISO-8859-5" }, + { "ISO8859-7", "ISO-8859-7" }, + { "ISO8859-9", "ISO-8859-9" }, + { "KOI8-R", "KOI8-R" }, + { "KOI8-U", "KOI8-U" }, + { "PT154", "PT154" }, + { "SJIS", "SHIFT_JIS" }, + { "eucCN", "GB2312" }, + { "eucJP", "EUC-JP" }, + { "eucKR", "EUC-KR" } +# define alias_table_defined +# endif +# if defined _AIX /* AIX */ + /*{ "GBK", "GBK" },*/ + { "IBM-1046", "CP1046" }, + { "IBM-1124", "CP1124" }, + { "IBM-1129", "CP1129" }, + { "IBM-1252", "CP1252" }, + { "IBM-850", "CP850" }, + { "IBM-856", "CP856" }, + { "IBM-921", "ISO-8859-13" }, + { "IBM-922", "CP922" }, + { "IBM-932", "CP932" }, + { "IBM-943", "CP943" }, + { "IBM-eucCN", "GB2312" }, + { "IBM-eucJP", "EUC-JP" }, + { "IBM-eucKR", "EUC-KR" }, + { "IBM-eucTW", "EUC-TW" }, + { "ISO8859-1", "ISO-8859-1" }, + { "ISO8859-15", "ISO-8859-15" }, + { "ISO8859-2", "ISO-8859-2" }, + { "ISO8859-5", "ISO-8859-5" }, + { "ISO8859-6", "ISO-8859-6" }, + { "ISO8859-7", "ISO-8859-7" }, + { "ISO8859-8", "ISO-8859-8" }, + { "ISO8859-9", "ISO-8859-9" }, + { "TIS-620", "TIS-620" }, + /*{ "UTF-8", "UTF-8" },*/ + { "big5", "BIG5" } +# define alias_table_defined +# endif +# if defined __hpux /* HP-UX */ + { "SJIS", "SHIFT_JIS" }, + { "arabic8", "HP-ARABIC8" }, + { "big5", "BIG5" }, + { "cp1251", "CP1251" }, + { "eucJP", "EUC-JP" }, + { "eucKR", "EUC-KR" }, + { "eucTW", "EUC-TW" }, + { "gb18030", "GB18030" }, + { "greek8", "HP-GREEK8" }, + { "hebrew8", "HP-HEBREW8" }, + { "hkbig5", "BIG5-HKSCS" }, + { "hp15CN", "GB2312" }, + { "iso88591", "ISO-8859-1" }, + { "iso885913", "ISO-8859-13" }, + { "iso885915", "ISO-8859-15" }, + { "iso88592", "ISO-8859-2" }, + { "iso88594", "ISO-8859-4" }, + { "iso88595", "ISO-8859-5" }, + { "iso88596", "ISO-8859-6" }, + { "iso88597", "ISO-8859-7" }, + { "iso88598", "ISO-8859-8" }, + { "iso88599", "ISO-8859-9" }, + { "kana8", "HP-KANA8" }, + { "koi8r", "KOI8-R" }, + { "roman8", "HP-ROMAN8" }, + { "tis620", "TIS-620" }, + { "turkish8", "HP-TURKISH8" }, + { "utf8", "UTF-8" } +# define alias_table_defined +# endif +# if defined __sgi /* IRIX */ + { "ISO8859-1", "ISO-8859-1" }, + { "ISO8859-15", "ISO-8859-15" }, + { "ISO8859-2", "ISO-8859-2" }, + { "ISO8859-5", "ISO-8859-5" }, + { "ISO8859-7", "ISO-8859-7" }, + { "ISO8859-9", "ISO-8859-9" }, + { "eucCN", "GB2312" }, + { "eucJP", "EUC-JP" }, + { "eucKR", "EUC-KR" }, + { "eucTW", "EUC-TW" } +# define alias_table_defined +# endif +# if defined __osf__ /* OSF/1 */ + /*{ "GBK", "GBK" },*/ + { "ISO8859-1", "ISO-8859-1" }, + { "ISO8859-15", "ISO-8859-15" }, + { "ISO8859-2", "ISO-8859-2" }, + { "ISO8859-4", "ISO-8859-4" }, + { "ISO8859-5", "ISO-8859-5" }, + { "ISO8859-7", "ISO-8859-7" }, + { "ISO8859-8", "ISO-8859-8" }, + { "ISO8859-9", "ISO-8859-9" }, + { "KSC5601", "CP949" }, + { "SJIS", "SHIFT_JIS" }, + { "TACTIS", "TIS-620" }, + /*{ "UTF-8", "UTF-8" },*/ + { "big5", "BIG5" }, + { "cp850", "CP850" }, + { "dechanyu", "DEC-HANYU" }, + { "dechanzi", "GB2312" }, + { "deckanji", "DEC-KANJI" }, + { "deckorean", "EUC-KR" }, + { "eucJP", "EUC-JP" }, + { "eucKR", "EUC-KR" }, + { "eucTW", "EUC-TW" }, + { "sdeckanji", "EUC-JP" } +# define alias_table_defined +# endif +# if defined __sun /* Solaris */ + { "5601", "EUC-KR" }, + { "646", "ASCII" }, + /*{ "BIG5", "BIG5" },*/ + { "Big5-HKSCS", "BIG5-HKSCS" }, + { "GB18030", "GB18030" }, + /*{ "GBK", "GBK" },*/ + { "ISO8859-1", "ISO-8859-1" }, + { "ISO8859-11", "TIS-620" }, + { "ISO8859-13", "ISO-8859-13" }, + { "ISO8859-15", "ISO-8859-15" }, + { "ISO8859-2", "ISO-8859-2" }, + { "ISO8859-3", "ISO-8859-3" }, + { "ISO8859-4", "ISO-8859-4" }, + { "ISO8859-5", "ISO-8859-5" }, + { "ISO8859-6", "ISO-8859-6" }, + { "ISO8859-7", "ISO-8859-7" }, + { "ISO8859-8", "ISO-8859-8" }, + { "ISO8859-9", "ISO-8859-9" }, + { "PCK", "SHIFT_JIS" }, + { "TIS620.2533", "TIS-620" }, + /*{ "UTF-8", "UTF-8" },*/ + { "ansi-1251", "CP1251" }, + { "cns11643", "EUC-TW" }, + { "eucJP", "EUC-JP" }, + { "gb2312", "GB2312" }, + { "koi8-r", "KOI8-R" } +# define alias_table_defined +# endif +# if defined __minix /* Minix */ + { "646", "ASCII" } +# define alias_table_defined +# endif +# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Windows */ + { "CP1361", "JOHAB" }, + { "CP20127", "ASCII" }, + { "CP20866", "KOI8-R" }, + { "CP20936", "GB2312" }, + { "CP21866", "KOI8-RU" }, + { "CP28591", "ISO-8859-1" }, + { "CP28592", "ISO-8859-2" }, + { "CP28593", "ISO-8859-3" }, + { "CP28594", "ISO-8859-4" }, + { "CP28595", "ISO-8859-5" }, + { "CP28596", "ISO-8859-6" }, + { "CP28597", "ISO-8859-7" }, + { "CP28598", "ISO-8859-8" }, + { "CP28599", "ISO-8859-9" }, + { "CP28605", "ISO-8859-15" }, + { "CP38598", "ISO-8859-8" }, + { "CP51932", "EUC-JP" }, + { "CP51936", "GB2312" }, + { "CP51949", "EUC-KR" }, + { "CP51950", "EUC-TW" }, + { "CP54936", "GB18030" }, + { "CP65001", "UTF-8" }, + { "CP936", "GBK" } +# define alias_table_defined +# endif +# if defined OS2 /* OS/2 */ + /* The list of encodings is taken from "List of OS/2 Codepages" + by Alex Taylor: + . + See also "IBM Globalization - Code page identifiers": + . */ + { "CP1089", "ISO-8859-6" }, + { "CP1208", "UTF-8" }, + { "CP1381", "GB2312" }, + { "CP1386", "GBK" }, + { "CP3372", "EUC-JP" }, + { "CP813", "ISO-8859-7" }, + { "CP819", "ISO-8859-1" }, + { "CP878", "KOI8-R" }, + { "CP912", "ISO-8859-2" }, + { "CP913", "ISO-8859-3" }, + { "CP914", "ISO-8859-4" }, + { "CP915", "ISO-8859-5" }, + { "CP916", "ISO-8859-8" }, + { "CP920", "ISO-8859-9" }, + { "CP921", "ISO-8859-13" }, + { "CP923", "ISO-8859-15" }, + { "CP954", "EUC-JP" }, + { "CP964", "EUC-TW" }, + { "CP970", "EUC-KR" } +# define alias_table_defined +# endif +# if defined VMS /* OpenVMS */ + /* The list of encodings is taken from the OpenVMS 7.3-1 documentation + "Compaq C Run-Time Library Reference Manual for OpenVMS systems" + section 10.7 "Handling Different Character Sets". */ + { "DECHANYU", "DEC-HANYU" }, + { "DECHANZI", "GB2312" }, + { "DECKANJI", "DEC-KANJI" }, + { "DECKOREAN", "EUC-KR" }, + { "ISO8859-1", "ISO-8859-1" }, + { "ISO8859-2", "ISO-8859-2" }, + { "ISO8859-5", "ISO-8859-5" }, + { "ISO8859-7", "ISO-8859-7" }, + { "ISO8859-8", "ISO-8859-8" }, + { "ISO8859-9", "ISO-8859-9" }, + { "SDECKANJI", "EUC-JP" }, + { "SJIS", "SHIFT_JIS" }, + { "eucJP", "EUC-JP" }, + { "eucTW", "EUC-TW" } +# define alias_table_defined +# endif +# ifndef alias_table_defined + /* Just a dummy entry, to avoid a C syntax error. */ + { "", "" } +# endif + }; - free (file_name); - } +# endif #else -# if defined DARWIN7 - /* To avoid the trouble of installing a file that is shared by many - GNU packages -- many packaging systems have problems with this --, - simply inline the aliases here. */ - cp = "ISO8859-1" "\0" "ISO-8859-1" "\0" - "ISO8859-2" "\0" "ISO-8859-2" "\0" - "ISO8859-4" "\0" "ISO-8859-4" "\0" - "ISO8859-5" "\0" "ISO-8859-5" "\0" - "ISO8859-7" "\0" "ISO-8859-7" "\0" - "ISO8859-9" "\0" "ISO-8859-9" "\0" - "ISO8859-13" "\0" "ISO-8859-13" "\0" - "ISO8859-15" "\0" "ISO-8859-15" "\0" - "KOI8-R" "\0" "KOI8-R" "\0" - "KOI8-U" "\0" "KOI8-U" "\0" - "CP866" "\0" "CP866" "\0" - "CP949" "\0" "CP949" "\0" - "CP1131" "\0" "CP1131" "\0" - "CP1251" "\0" "CP1251" "\0" - "eucCN" "\0" "GB2312" "\0" - "GB2312" "\0" "GB2312" "\0" - "eucJP" "\0" "EUC-JP" "\0" - "eucKR" "\0" "EUC-KR" "\0" - "Big5" "\0" "BIG5" "\0" - "Big5HKSCS" "\0" "BIG5-HKSCS" "\0" - "GBK" "\0" "GBK" "\0" - "GB18030" "\0" "GB18030" "\0" - "SJIS" "\0" "SHIFT_JIS" "\0" - "ARMSCII-8" "\0" "ARMSCII-8" "\0" - "PT154" "\0" "PT154" "\0" - /*"ISCII-DEV" "\0" "?" "\0"*/ - "*" "\0" "UTF-8" "\0"; -# endif - -# if defined VMS - /* To avoid the troubles of an extra file charset.alias_vms in the - sources of many GNU packages, simply inline the aliases here. */ - /* The list of encodings is taken from the OpenVMS 7.3-1 documentation - "Compaq C Run-Time Library Reference Manual for OpenVMS systems" - section 10.7 "Handling Different Character Sets". */ - cp = "ISO8859-1" "\0" "ISO-8859-1" "\0" - "ISO8859-2" "\0" "ISO-8859-2" "\0" - "ISO8859-5" "\0" "ISO-8859-5" "\0" - "ISO8859-7" "\0" "ISO-8859-7" "\0" - "ISO8859-8" "\0" "ISO-8859-8" "\0" - "ISO8859-9" "\0" "ISO-8859-9" "\0" - /* Japanese */ - "eucJP" "\0" "EUC-JP" "\0" - "SJIS" "\0" "SHIFT_JIS" "\0" - "DECKANJI" "\0" "DEC-KANJI" "\0" - "SDECKANJI" "\0" "EUC-JP" "\0" - /* Chinese */ - "eucTW" "\0" "EUC-TW" "\0" - "DECHANYU" "\0" "DEC-HANYU" "\0" - "DECHANZI" "\0" "GB2312" "\0" - /* Korean */ - "DECKOREAN" "\0" "EUC-KR" "\0"; -# endif - -# if defined WINDOWS_NATIVE || defined __CYGWIN__ - /* To avoid the troubles of installing a separate file in the same - directory as the DLL and of retrieving the DLL's directory at - runtime, simply inline the aliases here. */ - - cp = "CP936" "\0" "GBK" "\0" - "CP1361" "\0" "JOHAB" "\0" - "CP20127" "\0" "ASCII" "\0" - "CP20866" "\0" "KOI8-R" "\0" - "CP20936" "\0" "GB2312" "\0" - "CP21866" "\0" "KOI8-RU" "\0" - "CP28591" "\0" "ISO-8859-1" "\0" - "CP28592" "\0" "ISO-8859-2" "\0" - "CP28593" "\0" "ISO-8859-3" "\0" - "CP28594" "\0" "ISO-8859-4" "\0" - "CP28595" "\0" "ISO-8859-5" "\0" - "CP28596" "\0" "ISO-8859-6" "\0" - "CP28597" "\0" "ISO-8859-7" "\0" - "CP28598" "\0" "ISO-8859-8" "\0" - "CP28599" "\0" "ISO-8859-9" "\0" - "CP28605" "\0" "ISO-8859-15" "\0" - "CP38598" "\0" "ISO-8859-8" "\0" - "CP51932" "\0" "EUC-JP" "\0" - "CP51936" "\0" "GB2312" "\0" - "CP51949" "\0" "EUC-KR" "\0" - "CP51950" "\0" "EUC-TW" "\0" - "CP54936" "\0" "GB18030" "\0" - "CP65001" "\0" "UTF-8" "\0"; -# endif -# if defined OS2 - /* To avoid the troubles of installing a separate file in the same - directory as the DLL and of retrieving the DLL's directory at - runtime, simply inline the aliases here. */ - - /* The list of encodings is taken from "List of OS/2 Codepages" - by Alex Taylor: - . - See also "IBM Globalization - Code page identifiers": - . */ - cp = "CP813" "\0" "ISO-8859-7" "\0" - "CP878" "\0" "KOI8-R" "\0" - "CP819" "\0" "ISO-8859-1" "\0" - "CP912" "\0" "ISO-8859-2" "\0" - "CP913" "\0" "ISO-8859-3" "\0" - "CP914" "\0" "ISO-8859-4" "\0" - "CP915" "\0" "ISO-8859-5" "\0" - "CP916" "\0" "ISO-8859-8" "\0" - "CP920" "\0" "ISO-8859-9" "\0" - "CP921" "\0" "ISO-8859-13" "\0" - "CP923" "\0" "ISO-8859-15" "\0" - "CP954" "\0" "EUC-JP" "\0" - "CP964" "\0" "EUC-TW" "\0" - "CP970" "\0" "EUC-KR" "\0" - "CP1089" "\0" "ISO-8859-6" "\0" - "CP1208" "\0" "UTF-8" "\0" - "CP1381" "\0" "GB2312" "\0" - "CP1386" "\0" "GBK" "\0" - "CP3372" "\0" "EUC-JP" "\0"; +/* On these platforms, we use a mapping from locale name to GNU canonical + encoding name. */ + +struct table_entry +{ + const char locale[17+1]; + const char canonical[11+1]; +}; + +/* Table of platform-dependent mappings, sorted in ascending order. */ +static const struct table_entry locale_table[] = + { +# if defined __FreeBSD__ /* FreeBSD 4.2 */ + { "cs_CZ.ISO_8859-2", "ISO-8859-2" }, + { "da_DK.DIS_8859-15", "ISO-8859-15" }, + { "da_DK.ISO_8859-1", "ISO-8859-1" }, + { "de_AT.DIS_8859-15", "ISO-8859-15" }, + { "de_AT.ISO_8859-1", "ISO-8859-1" }, + { "de_CH.DIS_8859-15", "ISO-8859-15" }, + { "de_CH.ISO_8859-1", "ISO-8859-1" }, + { "de_DE.DIS_8859-15", "ISO-8859-15" }, + { "de_DE.ISO_8859-1", "ISO-8859-1" }, + { "en_AU.DIS_8859-15", "ISO-8859-15" }, + { "en_AU.ISO_8859-1", "ISO-8859-1" }, + { "en_CA.DIS_8859-15", "ISO-8859-15" }, + { "en_CA.ISO_8859-1", "ISO-8859-1" }, + { "en_GB.DIS_8859-15", "ISO-8859-15" }, + { "en_GB.ISO_8859-1", "ISO-8859-1" }, + { "en_US.DIS_8859-15", "ISO-8859-15" }, + { "en_US.ISO_8859-1", "ISO-8859-1" }, + { "es_ES.DIS_8859-15", "ISO-8859-15" }, + { "es_ES.ISO_8859-1", "ISO-8859-1" }, + { "fi_FI.DIS_8859-15", "ISO-8859-15" }, + { "fi_FI.ISO_8859-1", "ISO-8859-1" }, + { "fr_BE.DIS_8859-15", "ISO-8859-15" }, + { "fr_BE.ISO_8859-1", "ISO-8859-1" }, + { "fr_CA.DIS_8859-15", "ISO-8859-15" }, + { "fr_CA.ISO_8859-1", "ISO-8859-1" }, + { "fr_CH.DIS_8859-15", "ISO-8859-15" }, + { "fr_CH.ISO_8859-1", "ISO-8859-1" }, + { "fr_FR.DIS_8859-15", "ISO-8859-15" }, + { "fr_FR.ISO_8859-1", "ISO-8859-1" }, + { "hr_HR.ISO_8859-2", "ISO-8859-2" }, + { "hu_HU.ISO_8859-2", "ISO-8859-2" }, + { "is_IS.DIS_8859-15", "ISO-8859-15" }, + { "is_IS.ISO_8859-1", "ISO-8859-1" }, + { "it_CH.DIS_8859-15", "ISO-8859-15" }, + { "it_CH.ISO_8859-1", "ISO-8859-1" }, + { "it_IT.DIS_8859-15", "ISO-8859-15" }, + { "it_IT.ISO_8859-1", "ISO-8859-1" }, + { "ja_JP.EUC", "EUC-JP" }, + { "ja_JP.SJIS", "SHIFT_JIS" }, + { "ja_JP.Shift_JIS", "SHIFT_JIS" }, + { "ko_KR.EUC", "EUC-KR" }, + { "la_LN.ASCII", "ASCII" }, + { "la_LN.DIS_8859-15", "ISO-8859-15" }, + { "la_LN.ISO_8859-1", "ISO-8859-1" }, + { "la_LN.ISO_8859-2", "ISO-8859-2" }, + { "la_LN.ISO_8859-4", "ISO-8859-4" }, + { "lt_LN.ASCII", "ASCII" }, + { "lt_LN.DIS_8859-15", "ISO-8859-15" }, + { "lt_LN.ISO_8859-1", "ISO-8859-1" }, + { "lt_LN.ISO_8859-2", "ISO-8859-2" }, + { "lt_LT.ISO_8859-4", "ISO-8859-4" }, + { "nl_BE.DIS_8859-15", "ISO-8859-15" }, + { "nl_BE.ISO_8859-1", "ISO-8859-1" }, + { "nl_NL.DIS_8859-15", "ISO-8859-15" }, + { "nl_NL.ISO_8859-1", "ISO-8859-1" }, + { "no_NO.DIS_8859-15", "ISO-8859-15" }, + { "no_NO.ISO_8859-1", "ISO-8859-1" }, + { "pl_PL.ISO_8859-2", "ISO-8859-2" }, + { "pt_PT.DIS_8859-15", "ISO-8859-15" }, + { "pt_PT.ISO_8859-1", "ISO-8859-1" }, + { "ru_RU.CP866", "CP866" }, + { "ru_RU.ISO_8859-5", "ISO-8859-5" }, + { "ru_RU.KOI8-R", "KOI8-R" }, + { "ru_SU.CP866", "CP866" }, + { "ru_SU.ISO_8859-5", "ISO-8859-5" }, + { "ru_SU.KOI8-R", "KOI8-R" }, + { "sl_SI.ISO_8859-2", "ISO-8859-2" }, + { "sv_SE.DIS_8859-15", "ISO-8859-15" }, + { "sv_SE.ISO_8859-1", "ISO-8859-1" }, + { "uk_UA.KOI8-U", "KOI8-U" }, + { "zh_CN.EUC", "GB2312" }, + { "zh_TW.BIG5", "BIG5" }, + { "zh_TW.Big5", "BIG5" } +# define locale_table_defined # endif -#endif +# if defined __DJGPP__ /* DOS / DJGPP 2.03 */ + /* The encodings given here may not all be correct. + If you find that the encoding given for your language and + country is not the one your DOS machine actually uses, just + correct it in this file, and send a mail to + Juan Manuel Guerrero + and . */ + { "C", "ASCII" }, + { "ar", "CP864" }, + { "ar_AE", "CP864" }, + { "ar_DZ", "CP864" }, + { "ar_EG", "CP864" }, + { "ar_IQ", "CP864" }, + { "ar_IR", "CP864" }, + { "ar_JO", "CP864" }, + { "ar_KW", "CP864" }, + { "ar_MA", "CP864" }, + { "ar_OM", "CP864" }, + { "ar_QA", "CP864" }, + { "ar_SA", "CP864" }, + { "ar_SY", "CP864" }, + { "be", "CP866" }, + { "be_BE", "CP866" }, + { "bg", "CP866" }, /* not CP855 ?? */ + { "bg_BG", "CP866" }, /* not CP855 ?? */ + { "ca", "CP850" }, + { "ca_ES", "CP850" }, + { "cs", "CP852" }, + { "cs_CZ", "CP852" }, + { "da", "CP865" }, /* not CP850 ?? */ + { "da_DK", "CP865" }, /* not CP850 ?? */ + { "de", "CP850" }, + { "de_AT", "CP850" }, + { "de_CH", "CP850" }, + { "de_DE", "CP850" }, + { "el", "CP869" }, + { "el_GR", "CP869" }, + { "en", "CP850" }, + { "en_AU", "CP850" }, /* not CP437 ?? */ + { "en_CA", "CP850" }, + { "en_GB", "CP850" }, + { "en_NZ", "CP437" }, + { "en_US", "CP437" }, + { "en_ZA", "CP850" }, /* not CP437 ?? */ + { "eo", "CP850" }, + { "eo_EO", "CP850" }, + { "es", "CP850" }, + { "es_AR", "CP850" }, + { "es_BO", "CP850" }, + { "es_CL", "CP850" }, + { "es_CO", "CP850" }, + { "es_CR", "CP850" }, + { "es_CU", "CP850" }, + { "es_DO", "CP850" }, + { "es_EC", "CP850" }, + { "es_ES", "CP850" }, + { "es_GT", "CP850" }, + { "es_HN", "CP850" }, + { "es_MX", "CP850" }, + { "es_NI", "CP850" }, + { "es_PA", "CP850" }, + { "es_PE", "CP850" }, + { "es_PY", "CP850" }, + { "es_SV", "CP850" }, + { "es_UY", "CP850" }, + { "es_VE", "CP850" }, + { "et", "CP850" }, + { "et_EE", "CP850" }, + { "eu", "CP850" }, + { "eu_ES", "CP850" }, + { "fi", "CP850" }, + { "fi_FI", "CP850" }, + { "fr", "CP850" }, + { "fr_BE", "CP850" }, + { "fr_CA", "CP850" }, + { "fr_CH", "CP850" }, + { "fr_FR", "CP850" }, + { "ga", "CP850" }, + { "ga_IE", "CP850" }, + { "gd", "CP850" }, + { "gd_GB", "CP850" }, + { "gl", "CP850" }, + { "gl_ES", "CP850" }, + { "he", "CP862" }, + { "he_IL", "CP862" }, + { "hr", "CP852" }, + { "hr_HR", "CP852" }, + { "hu", "CP852" }, + { "hu_HU", "CP852" }, + { "id", "CP850" }, /* not CP437 ?? */ + { "id_ID", "CP850" }, /* not CP437 ?? */ + { "is", "CP861" }, /* not CP850 ?? */ + { "is_IS", "CP861" }, /* not CP850 ?? */ + { "it", "CP850" }, + { "it_CH", "CP850" }, + { "it_IT", "CP850" }, + { "ja", "CP932" }, + { "ja_JP", "CP932" }, + { "kr", "CP949" }, /* not CP934 ?? */ + { "kr_KR", "CP949" }, /* not CP934 ?? */ + { "lt", "CP775" }, + { "lt_LT", "CP775" }, + { "lv", "CP775" }, + { "lv_LV", "CP775" }, + { "mk", "CP866" }, /* not CP855 ?? */ + { "mk_MK", "CP866" }, /* not CP855 ?? */ + { "mt", "CP850" }, + { "mt_MT", "CP850" }, + { "nb", "CP865" }, /* not CP850 ?? */ + { "nb_NO", "CP865" }, /* not CP850 ?? */ + { "nl", "CP850" }, + { "nl_BE", "CP850" }, + { "nl_NL", "CP850" }, + { "nn", "CP865" }, /* not CP850 ?? */ + { "nn_NO", "CP865" }, /* not CP850 ?? */ + { "no", "CP865" }, /* not CP850 ?? */ + { "no_NO", "CP865" }, /* not CP850 ?? */ + { "pl", "CP852" }, + { "pl_PL", "CP852" }, + { "pt", "CP850" }, + { "pt_BR", "CP850" }, + { "pt_PT", "CP850" }, + { "ro", "CP852" }, + { "ro_RO", "CP852" }, + { "ru", "CP866" }, + { "ru_RU", "CP866" }, + { "sk", "CP852" }, + { "sk_SK", "CP852" }, + { "sl", "CP852" }, + { "sl_SI", "CP852" }, + { "sq", "CP852" }, + { "sq_AL", "CP852" }, + { "sr", "CP852" }, /* CP852 or CP866 or CP855 ?? */ + { "sr_CS", "CP852" }, /* CP852 or CP866 or CP855 ?? */ + { "sr_YU", "CP852" }, /* CP852 or CP866 or CP855 ?? */ + { "sv", "CP850" }, + { "sv_SE", "CP850" }, + { "th", "CP874" }, + { "th_TH", "CP874" }, + { "tr", "CP857" }, + { "tr_TR", "CP857" }, + { "uk", "CP1125" }, + { "uk_UA", "CP1125" }, + { "zh_CN", "GBK" }, + { "zh_TW", "CP950" } /* not CP938 ?? */ +# define locale_table_defined +# endif +# ifndef locale_table_defined + /* Just a dummy entry, to avoid a C syntax error. */ + { "", "" } +# endif + }; - charset_aliases = cp; - } +#endif - return cp; -} /* Determine the current locale's character encoding, and canonicalize it - into one of the canonical names listed in config.charset. + into one of the canonical names listed in localcharset.h. The result must not be freed; it is statically allocated. If the canonical name cannot be determined, the result is a non-canonical name. */ @@ -397,9 +687,8 @@ locale_charset (void) { const char *codeset; - const char *aliases; -#if !(defined WINDOWS_NATIVE || defined OS2) +#if HAVE_LANGINFO_CODESET || defined WINDOWS_NATIVE || defined OS2 # if HAVE_LANGINFO_CODESET @@ -462,37 +751,11 @@ } # endif -# else - - /* On old systems which lack it, use setlocale or getenv. */ - const char *locale = NULL; - - /* But most old systems don't have a complete set of locales. Some - (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't - use setlocale here; it would return "C" when it doesn't support the - locale name the user has set. */ -# if 0 - locale = setlocale (LC_CTYPE, NULL); -# endif - if (locale == NULL || locale[0] == '\0') - { - locale = getenv ("LC_ALL"); - if (locale == NULL || locale[0] == '\0') - { - locale = getenv ("LC_CTYPE"); - if (locale == NULL || locale[0] == '\0') - locale = getenv ("LANG"); - } - } - - /* On some old systems, one used to set locale = "iso8859_1". On others, - you set it to "language_COUNTRY.charset". In any case, we resolve it - through the charset.alias file. */ - codeset = locale; + if (codeset == NULL) + /* The canonical name cannot be determined. */ + codeset = ""; -# endif - -#elif defined WINDOWS_NATIVE +# elif defined WINDOWS_NATIVE static char buf[2 + 10 + 1]; @@ -526,7 +789,7 @@ } codeset = buf; -#elif defined OS2 +# elif defined OS2 const char *locale; static char buf[2 + 10 + 1]; @@ -583,28 +846,144 @@ } } -#endif +# else - if (codeset == NULL) - /* The canonical name cannot be determined. */ - codeset = ""; +# error "Add code for other platforms here." + +# endif + + /* Resolve alias. */ + { +# ifdef alias_table_defined + /* On some platforms, UTF-8 locales are the most frequently used ones. + Speed up the common case and slow down the less common cases by + testing for this case first. */ +# if defined __OpenBSD__ || (defined __APPLE__ && defined __MACH__) || defined __sun || defined __CYGWIN__ + if (strcmp (codeset, "UTF-8") == 0) + goto done_table_lookup; + else +# endif + { + const struct table_entry * const table = alias_table; + size_t const table_size = + sizeof (alias_table) / sizeof (struct table_entry); + /* The table is sorted. Perform a binary search. */ + size_t hi = table_size; + size_t lo = 0; + while (lo < hi) + { + /* Invariant: + for i < lo, strcmp (table[i].alias, codeset) < 0, + for i >= hi, strcmp (table[i].alias, codeset) > 0. */ + size_t mid = (hi + lo) >> 1; /* >= lo, < hi */ + int cmp = strcmp (table[mid].alias, codeset); + if (cmp < 0) + lo = mid + 1; + else if (cmp > 0) + hi = mid; + else + { + /* Found an i with + strcmp (table[i].alias, codeset) == 0. */ + codeset = table[mid].canonical; + goto done_table_lookup; + } + } + } + if (0) + done_table_lookup: ; + else +# endif + { + /* Did not find it in the table. */ + /* On Mac OS X, all modern locales use the UTF-8 encoding. + BeOS and Haiku have a single locale, and it has UTF-8 encoding. */ +# if (defined __APPLE__ && defined __MACH__) || defined __BEOS__ || defined __HAIKU__ + codeset = "UTF-8"; +# else + /* Don't return an empty string. GNU libc and GNU libiconv interpret + the empty string as denoting "the locale's character encoding", + thus GNU libiconv would call this function a second time. */ + if (codeset[0] == '\0') + codeset = "ASCII"; +# endif + } + } + +#else + + /* On old systems which lack it, use setlocale or getenv. */ + const char *locale = NULL; - /* Resolve alias. */ - for (aliases = get_charset_aliases (); - *aliases != '\0'; - aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1) - if (strcmp (codeset, aliases) == 0 - || (aliases[0] == '*' && aliases[1] == '\0')) + /* But most old systems don't have a complete set of locales. Some + (like DJGPP) have only the C locale. Therefore we don't use setlocale + here; it would return "C" when it doesn't support the locale name the + user has set. */ +# if 0 + locale = setlocale (LC_CTYPE, NULL); +# endif + if (locale == NULL || locale[0] == '\0') + { + locale = getenv ("LC_ALL"); + if (locale == NULL || locale[0] == '\0') + { + locale = getenv ("LC_CTYPE"); + if (locale == NULL || locale[0] == '\0') + locale = getenv ("LANG"); + if (locale == NULL) + locale = ""; + } + } + + /* Map locale name to canonical encoding name. */ + { +# ifdef locale_table_defined + const struct table_entry * const table = locale_table; + size_t const table_size = + sizeof (locale_table) / sizeof (struct table_entry); + /* The table is sorted. Perform a binary search. */ + size_t hi = table_size; + size_t lo = 0; + while (lo < hi) { - codeset = aliases + strlen (aliases) + 1; - break; + /* Invariant: + for i < lo, strcmp (table[i].locale, locale) < 0, + for i >= hi, strcmp (table[i].locale, locale) > 0. */ + size_t mid = (hi + lo) >> 1; /* >= lo, < hi */ + int cmp = strcmp (table[mid].locale, locale); + if (cmp < 0) + lo = mid + 1; + else if (cmp > 0) + hi = mid; + else + { + /* Found an i with + strcmp (table[i].locale, locale) == 0. */ + codeset = table[mid].canonical; + goto done_table_lookup; + } } + if (0) + done_table_lookup: ; + else +# endif + { + /* Did not find it in the table. */ + /* On Mac OS X, all modern locales use the UTF-8 encoding. + BeOS and Haiku have a single locale, and it has UTF-8 encoding. */ +# if (defined __APPLE__ && defined __MACH__) || defined __BEOS__ || defined __HAIKU__ + codeset = "UTF-8"; +# else + /* The canonical name cannot be determined. */ + /* Don't return an empty string. GNU libc and GNU libiconv interpret + the empty string as denoting "the locale's character encoding", + thus GNU libiconv would call this function a second time. */ + codeset = "ASCII"; +# endif + } + } - /* Don't return an empty string. GNU libc and GNU libiconv interpret - the empty string as denoting "the locale's character encoding", - thus GNU libiconv would call this function a second time. */ - if (codeset[0] == '\0') - codeset = "ASCII"; +#endif #ifdef DARWIN7 /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8" diff -Nru wget-1.19.5/lib/localcharset.h wget-1.20.1/lib/localcharset.h --- wget-1.19.5/lib/localcharset.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/localcharset.h 2018-12-26 20:08:18.000000000 +0000 @@ -25,12 +25,106 @@ /* Determine the current locale's character encoding, and canonicalize it - into one of the canonical names listed in config.charset. + into one of the canonical names listed below. The result must not be freed; it is statically allocated. If the canonical name cannot be determined, the result is a non-canonical name. */ extern const char * locale_charset (void); +/* About GNU canonical names for character encodings: + + Every canonical name must be supported by GNU libiconv. Support by GNU libc + is also desirable. + + The name is case insensitive. Usually an upper case MIME charset name is + preferred. + + The current list of these GNU canonical names is: + + name MIME? used by which systems + (darwin = Mac OS X, windows = native Windows) + + ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin minix cygwin + ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin + ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin + ISO-8859-3 Y glibc solaris cygwin + ISO-8859-4 Y hpux osf solaris freebsd netbsd openbsd darwin + ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin + ISO-8859-6 Y glibc aix hpux solaris cygwin + ISO-8859-7 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin + ISO-8859-8 Y glibc aix hpux osf solaris cygwin + ISO-8859-9 Y glibc aix hpux irix osf solaris freebsd darwin cygwin + ISO-8859-13 glibc hpux solaris freebsd netbsd openbsd darwin cygwin + ISO-8859-14 glibc cygwin + ISO-8859-15 glibc aix irix osf solaris freebsd netbsd openbsd darwin cygwin + KOI8-R Y glibc hpux solaris freebsd netbsd openbsd darwin + KOI8-U Y glibc freebsd netbsd openbsd darwin cygwin + KOI8-T glibc + CP437 dos + CP775 dos + CP850 aix osf dos + CP852 dos + CP855 dos + CP856 aix + CP857 dos + CP861 dos + CP862 dos + CP864 dos + CP865 dos + CP866 freebsd netbsd openbsd darwin dos + CP869 dos + CP874 windows dos + CP922 aix + CP932 aix cygwin windows dos + CP943 aix + CP949 osf darwin windows dos + CP950 windows dos + CP1046 aix + CP1124 aix + CP1125 dos + CP1129 aix + CP1131 freebsd darwin + CP1250 windows + CP1251 glibc hpux solaris freebsd netbsd openbsd darwin cygwin windows + CP1252 aix windows + CP1253 windows + CP1254 windows + CP1255 glibc windows + CP1256 windows + CP1257 windows + GB2312 Y glibc aix hpux irix solaris freebsd netbsd darwin cygwin + EUC-JP Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin + EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin + EUC-TW glibc aix hpux irix osf solaris netbsd + BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin cygwin + BIG5-HKSCS glibc hpux solaris netbsd darwin + GBK glibc aix osf solaris freebsd darwin cygwin windows dos + GB18030 glibc hpux solaris freebsd netbsd darwin + SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin + JOHAB glibc solaris windows + TIS-620 glibc aix hpux osf solaris cygwin + VISCII Y glibc + TCVN5712-1 glibc + ARMSCII-8 glibc freebsd netbsd darwin + GEORGIAN-PS glibc cygwin + PT154 glibc netbsd cygwin + HP-ROMAN8 hpux + HP-ARABIC8 hpux + HP-GREEK8 hpux + HP-HEBREW8 hpux + HP-TURKISH8 hpux + HP-KANA8 hpux + DEC-KANJI osf + DEC-HANYU osf + UTF-8 Y glibc aix hpux osf solaris netbsd darwin cygwin + + Note: Names which are not marked as being a MIME name should not be used in + Internet protocols for information interchange (mail, news, etc.). + + Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications + must understand both names and treat them as equivalent. + */ + #ifdef __cplusplus } diff -Nru wget-1.19.5/lib/locale.in.h wget-1.20.1/lib/locale.in.h --- wget-1.19.5/lib/locale.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/locale.in.h 2018-12-26 20:08:18.000000000 +0000 @@ -19,10 +19,13 @@ #endif @PRAGMA_COLUMNS@ -#ifdef _GL_ALREADY_INCLUDING_LOCALE_H +#if (defined _WIN32 && !defined __CYGWIN__ && defined __need_locale_t) \ + || defined _GL_ALREADY_INCLUDING_LOCALE_H -/* Special invocation conventions to handle Solaris header files - (through Solaris 10) when combined with gettext's libintl.h. */ +/* Special invocation convention: + - Inside mingw header files, + - To handle Solaris header files (through Solaris 10) when combined + with gettext's libintl.h. */ #@INCLUDE_NEXT@ @NEXT_LOCALE_H@ @@ -187,11 +190,40 @@ # endif #endif -#if @GNULIB_DUPLOCALE@ +#if /*@GNULIB_NEWLOCALE@ ||*/ (@GNULIB_LOCALENAME@ && @HAVE_NEWLOCALE@) +# if @REPLACE_NEWLOCALE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef newlocale +# define newlocale rpl_newlocale +# define GNULIB_defined_newlocale 1 +# endif +_GL_FUNCDECL_RPL (newlocale, locale_t, + (int category_mask, const char *name, locale_t base) + _GL_ARG_NONNULL ((2))); +_GL_CXXALIAS_RPL (newlocale, locale_t, + (int category_mask, const char *name, locale_t base)); +# else +# if @HAVE_NEWLOCALE@ +_GL_CXXALIAS_SYS (newlocale, locale_t, + (int category_mask, const char *name, locale_t base)); +# endif +# endif +# if @HAVE_NEWLOCALE@ +_GL_CXXALIASWARN (newlocale); +# endif +#elif defined GNULIB_POSIXCHECK +# undef newlocale +# if HAVE_RAW_DECL_NEWLOCALE +_GL_WARN_ON_USE (newlocale, "newlocale is not portable"); +# endif +#endif + +#if @GNULIB_DUPLOCALE@ || (@GNULIB_LOCALENAME@ && @HAVE_DUPLOCALE@) # if @REPLACE_DUPLOCALE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef duplocale # define duplocale rpl_duplocale +# define GNULIB_defined_duplocale 1 # endif _GL_FUNCDECL_RPL (duplocale, locale_t, (locale_t locale) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (duplocale, locale_t, (locale_t locale)); @@ -211,6 +243,30 @@ # endif #endif +#if /*@GNULIB_FREELOCALE@ ||*/ (@GNULIB_LOCALENAME@ && @HAVE_FREELOCALE@) +# if @REPLACE_FREELOCALE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef freelocale +# define freelocale rpl_freelocale +# define GNULIB_defined_freelocale 1 +# endif +_GL_FUNCDECL_RPL (freelocale, void, (locale_t locale) _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (freelocale, void, (locale_t locale)); +# else +# if @HAVE_FREELOCALE@ +_GL_CXXALIAS_SYS (freelocale, void, (locale_t locale)); +# endif +# endif +# if @HAVE_FREELOCALE@ +_GL_CXXALIASWARN (freelocale); +# endif +#elif defined GNULIB_POSIXCHECK +# undef freelocale +# if HAVE_RAW_DECL_FREELOCALE +_GL_WARN_ON_USE (freelocale, "freelocale is not portable"); +# endif +#endif + #endif /* _@GUARD_PREFIX@_LOCALE_H */ -#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */ #endif /* _@GUARD_PREFIX@_LOCALE_H */ +#endif /* !(__need_locale_t || _GL_ALREADY_INCLUDING_LOCALE_H) */ diff -Nru wget-1.19.5/lib/lseek.c wget-1.20.1/lib/lseek.c --- wget-1.19.5/lib/lseek.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/lseek.c 2018-12-26 20:08:18.000000000 +0000 @@ -19,7 +19,7 @@ /* Specification. */ #include -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Windows platforms. */ /* Get GetFileType. */ # include @@ -39,7 +39,7 @@ off_t rpl_lseek (int fd, off_t offset, int whence) { -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* mingw lseek mistakenly succeeds on pipes, sockets, and terminals. */ HANDLE h = (HANDLE) _get_osfhandle (fd); if (h == INVALID_HANDLE_VALUE) diff -Nru wget-1.19.5/lib/Makefile.am wget-1.20.1/lib/Makefile.am --- wget-1.19.5/lib/Makefile.am 2018-05-06 10:31:59.000000000 +0000 +++ wget-1.20.1/lib/Makefile.am 2018-12-26 20:08:36.000000000 +0000 @@ -1,6 +1,6 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,9 +21,118 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=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-h 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 strtol strtoll symlink sys_types timegm tmpdir unlink unlocked-io update-copyright libunistring-optional unistr/u8-strlen unicase/u8-tolower utime utime-h utimens vasprintf vsnprintf wcwidth write xmemdup0 xstrndup +# 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-h \ +# 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 \ +# strtol \ +# strtoll \ +# symlink \ +# sys_types \ +# timegm \ +# tmpdir \ +# unicase/u8-tolower \ +# unistr/u8-strlen \ +# unlink \ +# unlocked-io \ +# update-copyright \ +# utime \ +# utime-h \ +# utimens \ +# vasprintf \ +# vsnprintf \ +# wcwidth \ +# write \ +# xmemdup0 \ +# xstrndup -AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects +AUTOMAKE_OPTIONS = 1.11 gnits subdir-objects SUBDIRS = noinst_HEADERS = @@ -37,7 +146,7 @@ CLEANFILES = DISTCLEANFILES = MAINTAINERCLEANFILES = -SUBDIRS += +# No GNU Make output. AM_CPPFLAGS = AM_CFLAGS = @@ -181,6 +290,29 @@ ## end gnulib module btowc +## begin gnulib module byteswap + +BUILT_SOURCES += $(BYTESWAP_H) + +# We need the following in order to create when the system +# doesn't have one. +if GL_GENERATE_BYTESWAP_H +byteswap.h: byteswap.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + cat $(srcdir)/byteswap.in.h; \ + } > $@-t && \ + mv -f $@-t $@ +else +byteswap.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += byteswap.h byteswap.h-t + +EXTRA_DIST += byteswap.in.h + +## end gnulib module byteswap + ## begin gnulib module c-ctype libgnu_a_SOURCES += c-ctype.h c-ctype.c @@ -225,51 +357,6 @@ ## end gnulib module close -## begin gnulib module configmake - -# Listed in the same order as the GNU makefile conventions, and -# provided by autoconf 2.59c+ or 2.70. -# The Automake-defined pkg* macros are appended, in the order -# listed in the Automake 1.10a+ documentation. -configmake.h: Makefile - $(AM_V_GEN)rm -f $@-t && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - echo '#define PREFIX "$(prefix)"'; \ - echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ - echo '#define BINDIR "$(bindir)"'; \ - echo '#define SBINDIR "$(sbindir)"'; \ - echo '#define LIBEXECDIR "$(libexecdir)"'; \ - echo '#define DATAROOTDIR "$(datarootdir)"'; \ - echo '#define DATADIR "$(datadir)"'; \ - echo '#define SYSCONFDIR "$(sysconfdir)"'; \ - echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ - echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ - echo '#define RUNSTATEDIR "$(runstatedir)"'; \ - echo '#define INCLUDEDIR "$(includedir)"'; \ - echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ - echo '#define DOCDIR "$(docdir)"'; \ - echo '#define INFODIR "$(infodir)"'; \ - echo '#define HTMLDIR "$(htmldir)"'; \ - echo '#define DVIDIR "$(dvidir)"'; \ - echo '#define PDFDIR "$(pdfdir)"'; \ - echo '#define PSDIR "$(psdir)"'; \ - echo '#define LIBDIR "$(libdir)"'; \ - echo '#define LISPDIR "$(lispdir)"'; \ - echo '#define LOCALEDIR "$(localedir)"'; \ - echo '#define MANDIR "$(mandir)"'; \ - echo '#define MANEXT "$(manext)"'; \ - echo '#define PKGDATADIR "$(pkgdatadir)"'; \ - echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \ - echo '#define PKGLIBDIR "$(pkglibdir)"'; \ - echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \ - } | sed '/""/d' > $@-t && \ - mv -f $@-t $@ - -BUILT_SOURCES += configmake.h -CLEANFILES += configmake.h configmake.h-t - -## end gnulib module configmake - ## begin gnulib module connect @@ -279,6 +366,14 @@ ## end gnulib module connect +## begin gnulib module crypto/af_alg + +libgnu_a_SOURCES += af_alg.c + +EXTRA_DIST += af_alg.h sys-limits.h + +## end gnulib module crypto/af_alg + ## begin gnulib module crypto/md2 libgnu_a_SOURCES += md2.c @@ -295,37 +390,37 @@ ## end gnulib module crypto/md4 -## begin gnulib module crypto/md5 +## begin gnulib module crypto/md5-buffer libgnu_a_SOURCES += md5.c EXTRA_DIST += gl_openssl.h md5.h -## end gnulib module crypto/md5 +## end gnulib module crypto/md5-buffer -## begin gnulib module crypto/sha1 +## begin gnulib module crypto/sha1-buffer libgnu_a_SOURCES += sha1.c EXTRA_DIST += gl_openssl.h sha1.h -## end gnulib module crypto/sha1 +## end gnulib module crypto/sha1-buffer -## begin gnulib module crypto/sha256 +## begin gnulib module crypto/sha256-buffer libgnu_a_SOURCES += sha256.c EXTRA_DIST += gl_openssl.h sha256.h -## end gnulib module crypto/sha256 +## end gnulib module crypto/sha256-buffer -## begin gnulib module crypto/sha512 +## begin gnulib module crypto/sha512-buffer libgnu_a_SOURCES += sha512.c EXTRA_DIST += gl_openssl.h sha512.h -## end gnulib module crypto/sha512 +## end gnulib module crypto/sha512-buffer ## begin gnulib module dirname @@ -476,6 +571,15 @@ ## end gnulib module fd-safer-flag +## begin gnulib module fflush + + +EXTRA_DIST += fflush.c stdio-impl.h + +EXTRA_libgnu_a_SOURCES += fflush.c + +## end gnulib module fflush + ## begin gnulib module filename @@ -532,29 +636,46 @@ ## begin gnulib module fnmatch + +EXTRA_DIST += fnmatch.c fnmatch_loop.c + +EXTRA_libgnu_a_SOURCES += fnmatch.c fnmatch_loop.c + +## end gnulib module fnmatch + +## begin gnulib module fnmatch-h + BUILT_SOURCES += $(FNMATCH_H) -# We need the following in order to create when the system -# doesn't have one that supports the required API. +# We need the following in order to create . if GL_GENERATE_FNMATCH_H -fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''HAVE_FNMATCH_H''@|$(HAVE_FNMATCH_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_FNMATCH_H''@|$(NEXT_FNMATCH_H)|g' \ + -e 's/@''GNULIB_FNMATCH''@/$(GNULIB_FNMATCH)/g' \ + -e 's|@''HAVE_FNMATCH''@|$(HAVE_FNMATCH)|g' \ + -e 's|@''REPLACE_FNMATCH''@|$(REPLACE_FNMATCH)|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)/fnmatch.in.h; \ } > $@-t && \ - mv -f $@-t $@ + mv $@-t $@ else fnmatch.h: $(top_builddir)/config.status rm -f $@ endif MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t -EXTRA_DIST += fnmatch.c fnmatch.in.h fnmatch_loop.c +EXTRA_DIST += fnmatch.in.h -EXTRA_libgnu_a_SOURCES += fnmatch.c fnmatch_loop.c - -## end gnulib module fnmatch +## end gnulib module fnmatch-h ## begin gnulib module fopen @@ -565,6 +686,23 @@ ## end gnulib module fopen +## begin gnulib module fpurge + + +EXTRA_DIST += fpurge.c stdio-impl.h + +EXTRA_libgnu_a_SOURCES += fpurge.c + +## end gnulib module fpurge + +## begin gnulib module freading + +libgnu_a_SOURCES += freading.c + +EXTRA_DIST += freading.h stdio-impl.h + +## end gnulib module freading + ## begin gnulib module fseek @@ -670,7 +808,7 @@ # 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 +getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -700,6 +838,15 @@ ## end gnulib module getopt-posix +## begin gnulib module getpass + + +EXTRA_DIST += getpass.c getpass.h + +EXTRA_libgnu_a_SOURCES += getpass.c + +## end gnulib module getpass + ## begin gnulib module getpass-gnu @@ -775,8 +922,6 @@ clean-GNUmakefile: test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile -EXTRA_DIST += $(top_srcdir)/GNUmakefile - ## end gnulib module gnumakefile ## begin gnulib module gnupload @@ -898,6 +1043,7 @@ -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ + -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ @@ -952,6 +1098,7 @@ -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \ -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \ -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \ + -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \ -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \ -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \ -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \ @@ -967,6 +1114,13 @@ ## end gnulib module langinfo +## begin gnulib module libc-config + + +EXTRA_DIST += cdefs.h libc-config.h + +## end gnulib module libc-config + ## begin gnulib module libunistring-optional @@ -1022,75 +1176,9 @@ ## begin gnulib module localcharset -libgnu_a_SOURCES += localcharset.h localcharset.c +libgnu_a_SOURCES += localcharset.c -# We need the following in order to install a simple file in $(libdir) -# which is shared with other installed packages. We use a list of referencing -# packages so that "make uninstall" will remove the file if and only if it -# is not used by another installed package. -# On systems with glibc-2.1 or newer, the file is redundant, therefore we -# avoid installing it. - -all-local: charset.alias ref-add.sed ref-del.sed - -charset_alias = $(DESTDIR)$(libdir)/charset.alias -charset_tmp = $(DESTDIR)$(libdir)/charset.tmp -install-exec-local: install-exec-localcharset -install-exec-localcharset: all-local - if test $(GLIBC21) = no; then \ - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ - darwin* | cygwin* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ - esac ; \ - else \ - need_charset_alias=false ; \ - fi ; \ - if $$need_charset_alias; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ - fi ; \ - if test -f $(charset_alias); then \ - sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ - $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ - rm -f $(charset_tmp) ; \ - else \ - if $$need_charset_alias; then \ - sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ - $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ - rm -f $(charset_tmp) ; \ - fi ; \ - fi - -uninstall-local: uninstall-localcharset -uninstall-localcharset: all-local - if test -f $(charset_alias); then \ - sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \ - if grep '^# Packages using this file: $$' $(charset_tmp) \ - > /dev/null; then \ - rm -f $(charset_alias); \ - else \ - $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \ - fi; \ - rm -f $(charset_tmp); \ - fi - -charset.alias: config.charset - $(AM_V_GEN)rm -f t-$@ $@ && \ - $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \ - mv t-$@ $@ - -SUFFIXES += .sed .sin -.sin.sed: - $(AM_V_GEN)rm -f t-$@ $@ && \ - sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \ - mv t-$@ $@ - -CLEANFILES += charset.alias ref-add.sed ref-del.sed - -EXTRA_DIST += config.charset ref-add.sin ref-del.sin +EXTRA_DIST += localcharset.h ## end gnulib module localcharset @@ -1111,11 +1199,16 @@ -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ + -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \ + -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ + -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \ -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \ -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \ -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \ + -e 's|@''REPLACE_NEWLOCALE''@|$(REPLACE_NEWLOCALE)|g' \ -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \ + -e 's|@''REPLACE_FREELOCALE''@|$(REPLACE_FREELOCALE)|g' \ -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ @@ -1175,8 +1268,6 @@ EXTRA_DIST += $(top_srcdir)/maint.mk -EXTRA_DIST += $(top_srcdir)/maint.mk - ## end gnulib module maintainer-makefile ## begin gnulib module malloc-posix @@ -1192,7 +1283,7 @@ libgnu_a_SOURCES += malloca.c -EXTRA_DIST += malloca.h malloca.valgrind +EXTRA_DIST += malloca.h ## end gnulib module malloca @@ -1703,8 +1794,8 @@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ - -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ - -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \ + -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \ + -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \ -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ @@ -1859,6 +1950,7 @@ -e 's/@''GNULIB_POSIX_SPAWN''@/$(GNULIB_POSIX_SPAWN)/g' \ -e 's/@''GNULIB_POSIX_SPAWNP''@/$(GNULIB_POSIX_SPAWNP)/g' \ -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)/g' \ + -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)/g' \ -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)/g' \ -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)/g' \ -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)/g' \ @@ -1880,7 +1972,9 @@ -e 's|@''HAVE_POSIX_SPAWN''@|$(HAVE_POSIX_SPAWN)|g' \ -e 's|@''HAVE_POSIX_SPAWNATTR_T''@|$(HAVE_POSIX_SPAWNATTR_T)|g' \ -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_T''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_T)|g' \ + -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \ -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \ + -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \ -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \ -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \ -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \ @@ -2464,7 +2558,7 @@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \ - -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \ + -e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \ -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \ -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \ -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \ @@ -3205,6 +3299,7 @@ -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ + -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ @@ -3248,6 +3343,7 @@ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ + -e 's|@''HAVE_GETPASS''@|$(HAVE_GETPASS)|g' \ -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ @@ -3262,7 +3358,6 @@ -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' \ @@ -3274,6 +3369,7 @@ -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \ + -e 's|@''HAVE_DECL_TRUNCATE''@|$(HAVE_DECL_TRUNCATE)|g' \ -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ @@ -3291,6 +3387,7 @@ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ + -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \ -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ @@ -3470,7 +3567,7 @@ # 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 +utime.h: utime.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ diff -Nru wget-1.19.5/lib/Makefile.in wget-1.20.1/lib/Makefile.in --- wget-1.19.5/lib/Makefile.in 2018-05-06 16:47:51.000000000 +0000 +++ wget-1.20.1/lib/Makefile.in 2018-12-26 20:09:02.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,7 +35,116 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=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-h 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 strtol strtoll symlink sys_types timegm tmpdir unlink unlocked-io update-copyright libunistring-optional unistr/u8-strlen unicase/u8-tolower utime utime-h utimens vasprintf vsnprintf wcwidth write xmemdup0 xstrndup +# 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-h \ +# 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 \ +# strtol \ +# strtoll \ +# symlink \ +# sys_types \ +# timegm \ +# tmpdir \ +# unicase/u8-tolower \ +# unistr/u8-strlen \ +# unlink \ +# unlocked-io \ +# update-copyright \ +# utime \ +# utime-h \ +# utimens \ +# vasprintf \ +# vsnprintf \ +# wcwidth \ +# write \ +# xmemdup0 \ +# xstrndup @@ -98,6 +207,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -127,12 +237,13 @@ subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/arpa_inet_h.m4 \ + $(top_srcdir)/m4/__inline.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/af_alg.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 $(top_srcdir)/m4/base32.m4 \ $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ - $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \ + $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/clock_time.m4 \ + $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ @@ -141,9 +252,11 @@ $(top_srcdir)/m4/extern-inline.m4 \ $(top_srcdir)/m4/fatal-signal.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ - $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \ - $(top_srcdir)/m4/flock.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fseek.m4 \ + $(top_srcdir)/m4/fflush.m4 $(top_srcdir)/m4/flexmember.m4 \ + $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/flock.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fnmatch_h.m4 \ + $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fpurge.m4 \ + $(top_srcdir)/m4/freading.m4 $(top_srcdir)/m4/fseek.m4 \ $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/fstat.m4 \ $(top_srcdir)/m4/ftell.m4 $(top_srcdir)/m4/ftello.m4 \ $(top_srcdir)/m4/futimens.m4 $(top_srcdir)/m4/getaddrinfo.m4 \ @@ -156,7 +269,6 @@ $(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/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 \ @@ -201,29 +313,29 @@ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/sched_h.m4 \ $(top_srcdir)/m4/secure_getenv.m4 $(top_srcdir)/m4/select.m4 \ - $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sha1.m4 \ - $(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \ - $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sh-filename.m4 \ + $(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sha256.m4 \ + $(top_srcdir)/m4/sha512.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sigpipe.m4 \ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/snprintf.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/spawn-pipe.m4 $(top_srcdir)/m4/spawn_h.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \ - $(top_srcdir)/m4/strptime.m4 $(top_srcdir)/m4/strtok_r.m4 \ - $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_file_h.m4 \ - $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/std-gnu11.m4 \ + $(top_srcdir)/m4/stdalign.m4 $(top_srcdir)/m4/stdbool.m4 \ + $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strptime.m4 \ + $(top_srcdir)/m4/strtok_r.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_file_h.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ @@ -255,6 +367,7 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) am__v_AR_0 = @echo " AR " $@; @@ -263,20 +376,20 @@ am__DEPENDENCIES_1 = am__libgnu_a_SOURCES_DIST = base32.h base32.c binary-io.h binary-io.c \ c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \ - c-strcasestr.h c-strcasestr.c cloexec.c md2.c md4.c md5.c \ - sha1.c sha256.c sha512.c dirname.c basename.c dirname-lgpl.c \ - basename-lgpl.c stripslash.c exitfail.c fatal-signal.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 \ - 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 \ + c-strcasestr.h c-strcasestr.c cloexec.c af_alg.c md2.c md4.c \ + md5.c sha1.c sha256.c sha512.c dirname.c basename.c \ + dirname-lgpl.c basename-lgpl.c stripslash.c exitfail.c \ + fatal-signal.h fatal-signal.c fd-hook.c fd-safer-flag.c \ + dup-safer-flag.c freading.c getprogname.h getprogname.c \ + gettext.h gettime.c hard-locale.c localcharset.c \ + glthread/lock.h glthread/lock.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 \ @@ -304,33 +417,32 @@ am_libgnu_a_OBJECTS = base32.$(OBJEXT) binary-io.$(OBJEXT) \ c-ctype.$(OBJEXT) c-strcasecmp.$(OBJEXT) \ c-strncasecmp.$(OBJEXT) c-strcasestr.$(OBJEXT) \ - cloexec.$(OBJEXT) md2.$(OBJEXT) md4.$(OBJEXT) md5.$(OBJEXT) \ - sha1.$(OBJEXT) sha256.$(OBJEXT) sha512.$(OBJEXT) \ + cloexec.$(OBJEXT) af_alg.$(OBJEXT) md2.$(OBJEXT) md4.$(OBJEXT) \ + md5.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) sha512.$(OBJEXT) \ dirname.$(OBJEXT) basename.$(OBJEXT) dirname-lgpl.$(OBJEXT) \ basename-lgpl.$(OBJEXT) stripslash.$(OBJEXT) \ exitfail.$(OBJEXT) fatal-signal.$(OBJEXT) fd-hook.$(OBJEXT) \ fd-safer-flag.$(OBJEXT) dup-safer-flag.$(OBJEXT) \ - getprogname.$(OBJEXT) gettime.$(OBJEXT) hard-locale.$(OBJEXT) \ - localcharset.$(OBJEXT) glthread/lock.$(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) + freading.$(OBJEXT) getprogname.$(OBJEXT) gettime.$(OBJEXT) \ + hard-locale.$(OBJEXT) localcharset.$(OBJEXT) \ + glthread/lock.$(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@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -345,7 +457,116 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/accept.Po ./$(DEPDIR)/af_alg.Po \ + ./$(DEPDIR)/alloca.Po ./$(DEPDIR)/asnprintf.Po \ + ./$(DEPDIR)/asprintf.Po ./$(DEPDIR)/base32.Po \ + ./$(DEPDIR)/basename-lgpl.Po ./$(DEPDIR)/basename.Po \ + ./$(DEPDIR)/binary-io.Po ./$(DEPDIR)/bind.Po \ + ./$(DEPDIR)/btowc.Po ./$(DEPDIR)/c-ctype.Po \ + ./$(DEPDIR)/c-strcasecmp.Po ./$(DEPDIR)/c-strcasestr.Po \ + ./$(DEPDIR)/c-strncasecmp.Po ./$(DEPDIR)/cloexec.Po \ + ./$(DEPDIR)/close.Po ./$(DEPDIR)/connect.Po \ + ./$(DEPDIR)/dirname-lgpl.Po ./$(DEPDIR)/dirname.Po \ + ./$(DEPDIR)/dup-safer-flag.Po ./$(DEPDIR)/dup-safer.Po \ + ./$(DEPDIR)/dup2.Po ./$(DEPDIR)/error.Po \ + ./$(DEPDIR)/exitfail.Po ./$(DEPDIR)/fatal-signal.Po \ + ./$(DEPDIR)/fcntl.Po ./$(DEPDIR)/fd-hook.Po \ + ./$(DEPDIR)/fd-safer-flag.Po ./$(DEPDIR)/fd-safer.Po \ + ./$(DEPDIR)/fflush.Po ./$(DEPDIR)/float.Po \ + ./$(DEPDIR)/flock.Po ./$(DEPDIR)/fnmatch.Po \ + ./$(DEPDIR)/fnmatch_loop.Po ./$(DEPDIR)/fopen.Po \ + ./$(DEPDIR)/fpurge.Po ./$(DEPDIR)/freading.Po \ + ./$(DEPDIR)/fseek.Po ./$(DEPDIR)/fseeko.Po \ + ./$(DEPDIR)/fstat.Po ./$(DEPDIR)/ftell.Po \ + ./$(DEPDIR)/ftello.Po ./$(DEPDIR)/futimens.Po \ + ./$(DEPDIR)/gai_strerror.Po ./$(DEPDIR)/getaddrinfo.Po \ + ./$(DEPDIR)/getdelim.Po ./$(DEPDIR)/getdtablesize.Po \ + ./$(DEPDIR)/getgroups.Po ./$(DEPDIR)/getline.Po \ + ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \ + ./$(DEPDIR)/getpass.Po ./$(DEPDIR)/getpeername.Po \ + ./$(DEPDIR)/getprogname.Po ./$(DEPDIR)/getsockname.Po \ + ./$(DEPDIR)/gettime.Po ./$(DEPDIR)/gettimeofday.Po \ + ./$(DEPDIR)/group-member.Po ./$(DEPDIR)/hard-locale.Po \ + ./$(DEPDIR)/inet_ntop.Po ./$(DEPDIR)/ioctl.Po \ + ./$(DEPDIR)/iswblank.Po ./$(DEPDIR)/itold.Po \ + ./$(DEPDIR)/link.Po ./$(DEPDIR)/listen.Po \ + ./$(DEPDIR)/localcharset.Po ./$(DEPDIR)/localeconv.Po \ + ./$(DEPDIR)/localtime-buffer.Po ./$(DEPDIR)/lseek.Po \ + ./$(DEPDIR)/lstat.Po ./$(DEPDIR)/malloc.Po \ + ./$(DEPDIR)/malloca.Po ./$(DEPDIR)/mbchar.Po \ + ./$(DEPDIR)/mbiter.Po ./$(DEPDIR)/mbrtowc.Po \ + ./$(DEPDIR)/mbsinit.Po ./$(DEPDIR)/mbsrtowcs-state.Po \ + ./$(DEPDIR)/mbsrtowcs.Po ./$(DEPDIR)/mbtowc.Po \ + ./$(DEPDIR)/md2.Po ./$(DEPDIR)/md4.Po ./$(DEPDIR)/md5.Po \ + ./$(DEPDIR)/memchr.Po ./$(DEPDIR)/memrchr.Po \ + ./$(DEPDIR)/mkdir.Po ./$(DEPDIR)/mkostemp.Po \ + ./$(DEPDIR)/mkstemp.Po ./$(DEPDIR)/mktime.Po \ + ./$(DEPDIR)/msvc-inval.Po ./$(DEPDIR)/msvc-nothrow.Po \ + ./$(DEPDIR)/nanosleep.Po ./$(DEPDIR)/nl_langinfo.Po \ + ./$(DEPDIR)/open.Po ./$(DEPDIR)/pipe-safer.Po \ + ./$(DEPDIR)/pipe.Po ./$(DEPDIR)/pipe2-safer.Po \ + ./$(DEPDIR)/pipe2.Po ./$(DEPDIR)/printf-args.Po \ + ./$(DEPDIR)/printf-parse.Po ./$(DEPDIR)/quotearg.Po \ + ./$(DEPDIR)/raise.Po ./$(DEPDIR)/rawmemchr.Po \ + ./$(DEPDIR)/recv.Po ./$(DEPDIR)/regcomp.Po \ + ./$(DEPDIR)/regex.Po ./$(DEPDIR)/regex_internal.Po \ + ./$(DEPDIR)/regexec.Po ./$(DEPDIR)/secure_getenv.Po \ + ./$(DEPDIR)/select.Po ./$(DEPDIR)/send.Po \ + ./$(DEPDIR)/setsockopt.Po ./$(DEPDIR)/sha1.Po \ + ./$(DEPDIR)/sha256.Po ./$(DEPDIR)/sha512.Po \ + ./$(DEPDIR)/sig-handler.Po ./$(DEPDIR)/sigaction.Po \ + ./$(DEPDIR)/sigprocmask.Po ./$(DEPDIR)/snprintf.Po \ + ./$(DEPDIR)/socket.Po ./$(DEPDIR)/sockets.Po \ + ./$(DEPDIR)/spawn-pipe.Po ./$(DEPDIR)/spawn.Po \ + ./$(DEPDIR)/spawn_faction_addclose.Po \ + ./$(DEPDIR)/spawn_faction_adddup2.Po \ + ./$(DEPDIR)/spawn_faction_addopen.Po \ + ./$(DEPDIR)/spawn_faction_destroy.Po \ + ./$(DEPDIR)/spawn_faction_init.Po \ + ./$(DEPDIR)/spawnattr_destroy.Po ./$(DEPDIR)/spawnattr_init.Po \ + ./$(DEPDIR)/spawnattr_setflags.Po \ + ./$(DEPDIR)/spawnattr_setsigmask.Po ./$(DEPDIR)/spawni.Po \ + ./$(DEPDIR)/spawnp.Po ./$(DEPDIR)/stat-time.Po \ + ./$(DEPDIR)/stat-w32.Po ./$(DEPDIR)/stat.Po \ + ./$(DEPDIR)/stdio-write.Po ./$(DEPDIR)/strcasecmp.Po \ + ./$(DEPDIR)/strchrnul.Po ./$(DEPDIR)/strdup.Po \ + ./$(DEPDIR)/strerror-override.Po ./$(DEPDIR)/strerror.Po \ + ./$(DEPDIR)/strerror_r.Po ./$(DEPDIR)/stripslash.Po \ + ./$(DEPDIR)/strncasecmp.Po ./$(DEPDIR)/strndup.Po \ + ./$(DEPDIR)/strnlen.Po ./$(DEPDIR)/strnlen1.Po \ + ./$(DEPDIR)/strpbrk.Po ./$(DEPDIR)/strptime.Po \ + ./$(DEPDIR)/strtok_r.Po ./$(DEPDIR)/strtol.Po \ + ./$(DEPDIR)/strtoll.Po ./$(DEPDIR)/symlink.Po \ + ./$(DEPDIR)/sys_socket.Po ./$(DEPDIR)/tempname.Po \ + ./$(DEPDIR)/time_r.Po ./$(DEPDIR)/timegm.Po \ + ./$(DEPDIR)/timespec.Po ./$(DEPDIR)/tmpdir.Po \ + ./$(DEPDIR)/u64.Po ./$(DEPDIR)/unistd.Po ./$(DEPDIR)/unlink.Po \ + ./$(DEPDIR)/utime.Po ./$(DEPDIR)/utimens.Po \ + ./$(DEPDIR)/vasnprintf.Po ./$(DEPDIR)/vasprintf.Po \ + ./$(DEPDIR)/vsnprintf.Po ./$(DEPDIR)/wait-process.Po \ + ./$(DEPDIR)/waitpid.Po ./$(DEPDIR)/wcrtomb.Po \ + ./$(DEPDIR)/wctype-h.Po ./$(DEPDIR)/wcwidth.Po \ + ./$(DEPDIR)/write.Po ./$(DEPDIR)/xalloc-die.Po \ + ./$(DEPDIR)/xmalloc.Po ./$(DEPDIR)/xmemdup0.Po \ + ./$(DEPDIR)/xsize.Po ./$(DEPDIR)/xstrndup.Po \ + glthread/$(DEPDIR)/lock.Po glthread/$(DEPDIR)/threadlib.Po \ + unicase/$(DEPDIR)/cased.Po \ + unicase/$(DEPDIR)/empty-prefix-context.Po \ + unicase/$(DEPDIR)/empty-suffix-context.Po \ + unicase/$(DEPDIR)/ignorable.Po \ + unicase/$(DEPDIR)/special-casing.Po \ + unicase/$(DEPDIR)/tolower.Po unicase/$(DEPDIR)/u8-casemap.Po \ + unicase/$(DEPDIR)/u8-tolower.Po \ + unictype/$(DEPDIR)/combiningclass.Po \ + unictype/$(DEPDIR)/pr_soft_dotted.Po \ + uninorm/$(DEPDIR)/decompose-internal.Po \ + uninorm/$(DEPDIR)/u8-normalize.Po unistr/$(DEPDIR)/u8-cpy.Po \ + unistr/$(DEPDIR)/u8-mbtouc-unsafe-aux.Po \ + unistr/$(DEPDIR)/u8-mbtouc-unsafe.Po \ + unistr/$(DEPDIR)/u8-strlen.Po \ + unistr/$(DEPDIR)/u8-uctomb-aux.Po \ + unistr/$(DEPDIR)/u8-uctomb.Po uniwidth/$(DEPDIR)/width.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -382,7 +603,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -431,7 +652,6 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ @@ -450,6 +670,7 @@ BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +BYTESWAP_H = @BYTESWAP_H@ CARES_CFLAGS = @CARES_CFLAGS@ CARES_LIBS = @CARES_LIBS@ CC = @CC@ @@ -518,6 +739,7 @@ GNULIB_FGETC = @GNULIB_FGETC@ GNULIB_FGETS = @GNULIB_FGETS@ GNULIB_FLOCK = @GNULIB_FLOCK@ +GNULIB_FNMATCH = @GNULIB_FNMATCH@ GNULIB_FOPEN = @GNULIB_FOPEN@ GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ @@ -551,6 +773,7 @@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ +GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ @@ -575,6 +798,7 @@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALENAME = @GNULIB_LOCALENAME@ GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ @@ -645,6 +869,7 @@ GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT@ GNULIB_POSIX_SPAWNATTR_SETSIGMASK = @GNULIB_POSIX_SPAWNATTR_SETSIGMASK@ GNULIB_POSIX_SPAWNP = @GNULIB_POSIX_SPAWNP@ +GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -847,6 +1072,7 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ @@ -869,6 +1095,9 @@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FLOCK = @HAVE_FLOCK@ +HAVE_FNMATCH = @HAVE_FNMATCH@ +HAVE_FNMATCH_H = @HAVE_FNMATCH_H@ +HAVE_FREELOCALE = @HAVE_FREELOCALE@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ @@ -881,13 +1110,16 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ +HAVE_GETPASS = @HAVE_GETPASS@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@ HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ @@ -925,6 +1157,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NETDB_H = @HAVE_NETDB_H@ HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ +HAVE_NEWLOCALE = @HAVE_NEWLOCALE@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ @@ -936,6 +1169,7 @@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@ HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@ +HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PSELECT = @HAVE_PSELECT@ @@ -1006,7 +1240,6 @@ 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@ @@ -1064,8 +1297,6 @@ 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@ @@ -1100,7 +1331,6 @@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1145,6 +1375,7 @@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ +NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1179,6 +1410,7 @@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ +NEXT_FNMATCH_H = @NEXT_FNMATCH_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1221,6 +1453,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCRE2_CFLAGS = @PCRE2_CFLAGS@ +PCRE2_LIBS = @PCRE2_LIBS@ PCRE_CFLAGS = @PCRE_CFLAGS@ PCRE_LIBS = @PCRE_LIBS@ PERL = @PERL@ @@ -1257,9 +1491,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ +REPLACE_FNMATCH = @REPLACE_FNMATCH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ REPLACE_FPURGE = @REPLACE_FPURGE@ +REPLACE_FREELOCALE = @REPLACE_FREELOCALE@ REPLACE_FREOPEN = @REPLACE_FREOPEN@ REPLACE_FSEEK = @REPLACE_FSEEK@ REPLACE_FSEEKO = @REPLACE_FSEEKO@ @@ -1278,6 +1514,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ +REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ @@ -1314,6 +1551,7 @@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@ REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ @@ -1322,6 +1560,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@ +REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -1478,7 +1717,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -1501,59 +1739,61 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects -SUBDIRS = +AUTOMAKE_OPTIONS = 1.11 gnits subdir-objects +SUBDIRS = noinst_HEADERS = noinst_LIBRARIES = libgnu.a noinst_LTLIBRARIES = EXTRA_DIST = accept.c w32sock.h alloca.c alloca.in.h \ $(top_srcdir)/build-aux/announce-gen arpa_inet.in.h \ - array-mergesort.h bind.c w32sock.h btowc.c c-strcaseeq.h \ - str-two-way.h cloexec.h close.c connect.c w32sock.h md2.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 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 \ + array-mergesort.h bind.c w32sock.h btowc.c byteswap.in.h \ + c-strcaseeq.h str-two-way.h cloexec.h close.c connect.c \ + w32sock.h af_alg.h sys-limits.h md2.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 \ + fflush.c stdio-impl.h filename.h flexmember.h float.c \ + float.in.h itold.c flock.c fnmatch.c fnmatch_loop.c \ + fnmatch.in.h fopen.c fpurge.c stdio-impl.h freading.h \ + stdio-impl.h 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 gettimeofday.c \ + getpass.c getpass.h getpeername.c w32sock.h getsockname.c \ + w32sock.h gettimeofday.c \ $(top_srcdir)/build-aux/git-version-gen \ $(top_srcdir)/build-aux/gitlog-to-changelog \ - $(top_srcdir)/GNUmakefile $(top_srcdir)/GNUmakefile \ - $(top_srcdir)/build-aux/gnupload group-member.c hard-locale.h \ + $(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 \ + langinfo.in.h cdefs.h libc-config.h libunistring.valgrind \ + limits.in.h link.c listen.c w32sock.h localcharset.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 \ - spawnattr_setflags.c spawnattr_setsigmask.c spawnp.c quote.h \ - quote.h quotearg.h raise.c rawmemchr.c rawmemchr.valgrind \ - recv.c w32sock.h regcomp.c regex.c regex.h regex_internal.c \ - 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 \ - _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 \ + lseek.c lstat.c $(top_srcdir)/maint.mk malloc.c malloca.h \ + 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 spawnattr_setflags.c \ + spawnattr_setsigmask.c spawnp.c quote.h quote.h quotearg.h \ + raise.c rawmemchr.c rawmemchr.valgrind recv.c w32sock.h \ + regcomp.c regex.c regex.h regex_internal.c 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 _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 \ strerror-override.c strerror-override.h strerror_r.c \ string.in.h strings.in.h strndup.c strnlen.c strpbrk.c \ @@ -1582,7 +1822,7 @@ $(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) \ +BUILT_SOURCES = $(ALLOCA_H) arpa/inet.h $(BYTESWAP_H) $(ERRNO_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) \ @@ -1594,84 +1834,84 @@ $(LIBUNISTRING_UNINORM_H) unistd.h $(LIBUNISTRING_UNISTR_H) \ $(LIBUNISTRING_UNITYPES_H) $(LIBUNISTRING_UNIWIDTH_H) \ $(UTIME_H) wchar.h wctype.h -SUFFIXES = .sed .sin +SUFFIXES = 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 \ - 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 + arpa/inet.h-t byteswap.h byteswap.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 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 +CLEANFILES = DISTCLEANFILES = MAINTAINERCLEANFILES = unicase/special-casing-table.h +# No GNU Make output. AM_CPPFLAGS = AM_CFLAGS = libgnu_a_SOURCES = base32.h base32.c binary-io.h binary-io.c c-ctype.h \ c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \ - c-strcasestr.h c-strcasestr.c cloexec.c md2.c md4.c md5.c \ - sha1.c sha256.c sha512.c dirname.c basename.c dirname-lgpl.c \ - basename-lgpl.c stripslash.c exitfail.c fatal-signal.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 \ - 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 \ - xstrndup.c + c-strcasestr.h c-strcasestr.c cloexec.c af_alg.c md2.c md4.c \ + md5.c sha1.c sha256.c sha512.c dirname.c basename.c \ + dirname-lgpl.c basename-lgpl.c stripslash.c exitfail.c \ + fatal-signal.h fatal-signal.c fd-hook.c fd-safer-flag.c \ + dup-safer-flag.c freading.c getprogname.h getprogname.c \ + gettext.h gettime.c hard-locale.c localcharset.c \ + glthread/lock.h glthread/lock.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 $(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 xstrndup.c libgnu_a_LIBADD = $(gl_LIBOBJS) @ALLOCA@ 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 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 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 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 + connect.c stripslash.c dup2.c error.c fcntl.c fflush.c float.c \ + itold.c flock.c fnmatch.c fnmatch_loop.c fopen.c fpurge.c \ + fseek.c fseeko.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 getpass.c getpeername.c getsockname.c gettimeofday.c \ + group-member.c inet_ntop.c ioctl.c iswblank.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 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 @@ -1681,8 +1921,6 @@ V_GPERF = $(V_GPERF_@AM_V@) V_GPERF_ = $(V_GPERF_@AM_DEFAULT_V@) V_GPERF_0 = @echo " GPERF " $@; -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 makefiles that @@ -1712,7 +1950,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .sed .sin .c .o .obj +.SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1730,8 +1968,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1745,6 +1983,17 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } glthread/$(am__dirstamp): @$(MKDIR_P) glthread @: > glthread/$(am__dirstamp) @@ -1829,17 +2078,6 @@ $(AM_V_AR)$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) $(AM_V_at)$(RANLIB) libgnu.a -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - mostlyclean-compile: -rm -f *.$(OBJEXT) -rm -f glthread/*.$(OBJEXT) @@ -1852,203 +2090,213 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accept.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloca.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asnprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base32.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename-lgpl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binary-io.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bind.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btowc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-ctype.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strcasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strcasestr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strncasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cloexec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connect.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname-lgpl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup-safer-flag.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fatal-signal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcntl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-hook.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-safer-flag.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnmatch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnmatch_loop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fopen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseek.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseeko.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftell.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftello.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/futimens.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gai_strerror.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getaddrinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdelim.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdtablesize.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getgroups.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpass.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpeername.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getprogname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getsockname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group-member.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hard-locale.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_ntop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioctl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iswblank.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@ -@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@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsinit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsrtowcs-state.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsrtowcs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md4.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkostemp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkstemp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-inval.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-nothrow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nanosleep.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nl_langinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe2-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-args.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-parse.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotearg.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raise.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawmemchr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regcomp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_internal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_getenv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setsockopt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha256.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig-handler.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigaction.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigprocmask.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockets.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn-pipe.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_addclose.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_adddup2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_addopen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_destroy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_destroy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_setflags.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_setsigmask.Po@am__quote@ -@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@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strchrnul.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror_r.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strncasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strndup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strpbrk.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strptime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtok_r.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtol.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoll.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symlink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sys_socket.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timegm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tmpdir.Po@am__quote@ -@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@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wait-process.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/waitpid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctype-h.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmemdup0.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsize.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrndup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/lock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/threadlib.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/cased.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/empty-prefix-context.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/empty-suffix-context.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/ignorable.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/special-casing.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/tolower.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/u8-casemap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/u8-tolower.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/combiningclass.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/pr_soft_dotted.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@uninorm/$(DEPDIR)/decompose-internal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@uninorm/$(DEPDIR)/u8-normalize.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-cpy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-mbtouc-unsafe-aux.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-mbtouc-unsafe.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-strlen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-uctomb-aux.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-uctomb.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@uniwidth/$(DEPDIR)/width.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accept.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/af_alg.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloca.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asnprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base32.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename-lgpl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binary-io.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bind.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btowc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-ctype.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strcasecmp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strcasestr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strncasecmp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cloexec.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connect.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname-lgpl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup-safer-flag.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup-safer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fatal-signal.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcntl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-hook.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-safer-flag.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-safer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fflush.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnmatch.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnmatch_loop.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fopen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fpurge.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freading.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseek.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseeko.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstat.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftell.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftello.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/futimens.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gai_strerror.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getaddrinfo.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdelim.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdtablesize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getgroups.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpass.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpeername.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getprogname.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getsockname.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettime.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group-member.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hard-locale.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_ntop.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioctl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iswblank.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localeconv.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime-buffer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lseek.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbchar.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbiter.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbrtowc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsinit.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsrtowcs-state.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsrtowcs.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md4.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdir.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkostemp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkstemp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-inval.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-nothrow.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nanosleep.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nl_langinfo.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe-safer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe2-safer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-args.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-parse.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotearg.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raise.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawmemchr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recv.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regcomp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_internal.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_getenv.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setsockopt.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha256.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig-handler.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigaction.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigprocmask.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockets.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn-pipe.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_addclose.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_adddup2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_addopen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_destroy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_init.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_destroy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_init.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_setflags.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_setsigmask.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawni.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-time.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-w32.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio-write.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strchrnul.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror_r.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strncasecmp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strndup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strpbrk.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strptime.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtok_r.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtol.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoll.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symlink.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sys_socket.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempname.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timegm.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tmpdir.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u64.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utime.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utimens.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasnprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wait-process.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/waitpid.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctype-h.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmemdup0.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrndup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/lock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/threadlib.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/cased.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/empty-prefix-context.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/empty-suffix-context.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/ignorable.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/special-casing.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/tolower.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/u8-casemap.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/u8-tolower.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/combiningclass.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/pr_soft_dotted.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@uninorm/$(DEPDIR)/decompose-internal.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@uninorm/$(DEPDIR)/u8-normalize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-cpy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-mbtouc-unsafe-aux.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-mbtouc-unsafe.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-strlen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-uctomb-aux.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-uctomb.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@uniwidth/$(DEPDIR)/width.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -2165,7 +2413,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -2223,7 +2474,7 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local +all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: install: $(BUILT_SOURCES) @@ -2280,7 +2531,207 @@ mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) glthread/$(DEPDIR) unicase/$(DEPDIR) unictype/$(DEPDIR) uninorm/$(DEPDIR) unistr/$(DEPDIR) uniwidth/$(DEPDIR) + -rm -f ./$(DEPDIR)/accept.Po + -rm -f ./$(DEPDIR)/af_alg.Po + -rm -f ./$(DEPDIR)/alloca.Po + -rm -f ./$(DEPDIR)/asnprintf.Po + -rm -f ./$(DEPDIR)/asprintf.Po + -rm -f ./$(DEPDIR)/base32.Po + -rm -f ./$(DEPDIR)/basename-lgpl.Po + -rm -f ./$(DEPDIR)/basename.Po + -rm -f ./$(DEPDIR)/binary-io.Po + -rm -f ./$(DEPDIR)/bind.Po + -rm -f ./$(DEPDIR)/btowc.Po + -rm -f ./$(DEPDIR)/c-ctype.Po + -rm -f ./$(DEPDIR)/c-strcasecmp.Po + -rm -f ./$(DEPDIR)/c-strcasestr.Po + -rm -f ./$(DEPDIR)/c-strncasecmp.Po + -rm -f ./$(DEPDIR)/cloexec.Po + -rm -f ./$(DEPDIR)/close.Po + -rm -f ./$(DEPDIR)/connect.Po + -rm -f ./$(DEPDIR)/dirname-lgpl.Po + -rm -f ./$(DEPDIR)/dirname.Po + -rm -f ./$(DEPDIR)/dup-safer-flag.Po + -rm -f ./$(DEPDIR)/dup-safer.Po + -rm -f ./$(DEPDIR)/dup2.Po + -rm -f ./$(DEPDIR)/error.Po + -rm -f ./$(DEPDIR)/exitfail.Po + -rm -f ./$(DEPDIR)/fatal-signal.Po + -rm -f ./$(DEPDIR)/fcntl.Po + -rm -f ./$(DEPDIR)/fd-hook.Po + -rm -f ./$(DEPDIR)/fd-safer-flag.Po + -rm -f ./$(DEPDIR)/fd-safer.Po + -rm -f ./$(DEPDIR)/fflush.Po + -rm -f ./$(DEPDIR)/float.Po + -rm -f ./$(DEPDIR)/flock.Po + -rm -f ./$(DEPDIR)/fnmatch.Po + -rm -f ./$(DEPDIR)/fnmatch_loop.Po + -rm -f ./$(DEPDIR)/fopen.Po + -rm -f ./$(DEPDIR)/fpurge.Po + -rm -f ./$(DEPDIR)/freading.Po + -rm -f ./$(DEPDIR)/fseek.Po + -rm -f ./$(DEPDIR)/fseeko.Po + -rm -f ./$(DEPDIR)/fstat.Po + -rm -f ./$(DEPDIR)/ftell.Po + -rm -f ./$(DEPDIR)/ftello.Po + -rm -f ./$(DEPDIR)/futimens.Po + -rm -f ./$(DEPDIR)/gai_strerror.Po + -rm -f ./$(DEPDIR)/getaddrinfo.Po + -rm -f ./$(DEPDIR)/getdelim.Po + -rm -f ./$(DEPDIR)/getdtablesize.Po + -rm -f ./$(DEPDIR)/getgroups.Po + -rm -f ./$(DEPDIR)/getline.Po + -rm -f ./$(DEPDIR)/getopt.Po + -rm -f ./$(DEPDIR)/getopt1.Po + -rm -f ./$(DEPDIR)/getpass.Po + -rm -f ./$(DEPDIR)/getpeername.Po + -rm -f ./$(DEPDIR)/getprogname.Po + -rm -f ./$(DEPDIR)/getsockname.Po + -rm -f ./$(DEPDIR)/gettime.Po + -rm -f ./$(DEPDIR)/gettimeofday.Po + -rm -f ./$(DEPDIR)/group-member.Po + -rm -f ./$(DEPDIR)/hard-locale.Po + -rm -f ./$(DEPDIR)/inet_ntop.Po + -rm -f ./$(DEPDIR)/ioctl.Po + -rm -f ./$(DEPDIR)/iswblank.Po + -rm -f ./$(DEPDIR)/itold.Po + -rm -f ./$(DEPDIR)/link.Po + -rm -f ./$(DEPDIR)/listen.Po + -rm -f ./$(DEPDIR)/localcharset.Po + -rm -f ./$(DEPDIR)/localeconv.Po + -rm -f ./$(DEPDIR)/localtime-buffer.Po + -rm -f ./$(DEPDIR)/lseek.Po + -rm -f ./$(DEPDIR)/lstat.Po + -rm -f ./$(DEPDIR)/malloc.Po + -rm -f ./$(DEPDIR)/malloca.Po + -rm -f ./$(DEPDIR)/mbchar.Po + -rm -f ./$(DEPDIR)/mbiter.Po + -rm -f ./$(DEPDIR)/mbrtowc.Po + -rm -f ./$(DEPDIR)/mbsinit.Po + -rm -f ./$(DEPDIR)/mbsrtowcs-state.Po + -rm -f ./$(DEPDIR)/mbsrtowcs.Po + -rm -f ./$(DEPDIR)/mbtowc.Po + -rm -f ./$(DEPDIR)/md2.Po + -rm -f ./$(DEPDIR)/md4.Po + -rm -f ./$(DEPDIR)/md5.Po + -rm -f ./$(DEPDIR)/memchr.Po + -rm -f ./$(DEPDIR)/memrchr.Po + -rm -f ./$(DEPDIR)/mkdir.Po + -rm -f ./$(DEPDIR)/mkostemp.Po + -rm -f ./$(DEPDIR)/mkstemp.Po + -rm -f ./$(DEPDIR)/mktime.Po + -rm -f ./$(DEPDIR)/msvc-inval.Po + -rm -f ./$(DEPDIR)/msvc-nothrow.Po + -rm -f ./$(DEPDIR)/nanosleep.Po + -rm -f ./$(DEPDIR)/nl_langinfo.Po + -rm -f ./$(DEPDIR)/open.Po + -rm -f ./$(DEPDIR)/pipe-safer.Po + -rm -f ./$(DEPDIR)/pipe.Po + -rm -f ./$(DEPDIR)/pipe2-safer.Po + -rm -f ./$(DEPDIR)/pipe2.Po + -rm -f ./$(DEPDIR)/printf-args.Po + -rm -f ./$(DEPDIR)/printf-parse.Po + -rm -f ./$(DEPDIR)/quotearg.Po + -rm -f ./$(DEPDIR)/raise.Po + -rm -f ./$(DEPDIR)/rawmemchr.Po + -rm -f ./$(DEPDIR)/recv.Po + -rm -f ./$(DEPDIR)/regcomp.Po + -rm -f ./$(DEPDIR)/regex.Po + -rm -f ./$(DEPDIR)/regex_internal.Po + -rm -f ./$(DEPDIR)/regexec.Po + -rm -f ./$(DEPDIR)/secure_getenv.Po + -rm -f ./$(DEPDIR)/select.Po + -rm -f ./$(DEPDIR)/send.Po + -rm -f ./$(DEPDIR)/setsockopt.Po + -rm -f ./$(DEPDIR)/sha1.Po + -rm -f ./$(DEPDIR)/sha256.Po + -rm -f ./$(DEPDIR)/sha512.Po + -rm -f ./$(DEPDIR)/sig-handler.Po + -rm -f ./$(DEPDIR)/sigaction.Po + -rm -f ./$(DEPDIR)/sigprocmask.Po + -rm -f ./$(DEPDIR)/snprintf.Po + -rm -f ./$(DEPDIR)/socket.Po + -rm -f ./$(DEPDIR)/sockets.Po + -rm -f ./$(DEPDIR)/spawn-pipe.Po + -rm -f ./$(DEPDIR)/spawn.Po + -rm -f ./$(DEPDIR)/spawn_faction_addclose.Po + -rm -f ./$(DEPDIR)/spawn_faction_adddup2.Po + -rm -f ./$(DEPDIR)/spawn_faction_addopen.Po + -rm -f ./$(DEPDIR)/spawn_faction_destroy.Po + -rm -f ./$(DEPDIR)/spawn_faction_init.Po + -rm -f ./$(DEPDIR)/spawnattr_destroy.Po + -rm -f ./$(DEPDIR)/spawnattr_init.Po + -rm -f ./$(DEPDIR)/spawnattr_setflags.Po + -rm -f ./$(DEPDIR)/spawnattr_setsigmask.Po + -rm -f ./$(DEPDIR)/spawni.Po + -rm -f ./$(DEPDIR)/spawnp.Po + -rm -f ./$(DEPDIR)/stat-time.Po + -rm -f ./$(DEPDIR)/stat-w32.Po + -rm -f ./$(DEPDIR)/stat.Po + -rm -f ./$(DEPDIR)/stdio-write.Po + -rm -f ./$(DEPDIR)/strcasecmp.Po + -rm -f ./$(DEPDIR)/strchrnul.Po + -rm -f ./$(DEPDIR)/strdup.Po + -rm -f ./$(DEPDIR)/strerror-override.Po + -rm -f ./$(DEPDIR)/strerror.Po + -rm -f ./$(DEPDIR)/strerror_r.Po + -rm -f ./$(DEPDIR)/stripslash.Po + -rm -f ./$(DEPDIR)/strncasecmp.Po + -rm -f ./$(DEPDIR)/strndup.Po + -rm -f ./$(DEPDIR)/strnlen.Po + -rm -f ./$(DEPDIR)/strnlen1.Po + -rm -f ./$(DEPDIR)/strpbrk.Po + -rm -f ./$(DEPDIR)/strptime.Po + -rm -f ./$(DEPDIR)/strtok_r.Po + -rm -f ./$(DEPDIR)/strtol.Po + -rm -f ./$(DEPDIR)/strtoll.Po + -rm -f ./$(DEPDIR)/symlink.Po + -rm -f ./$(DEPDIR)/sys_socket.Po + -rm -f ./$(DEPDIR)/tempname.Po + -rm -f ./$(DEPDIR)/time_r.Po + -rm -f ./$(DEPDIR)/timegm.Po + -rm -f ./$(DEPDIR)/timespec.Po + -rm -f ./$(DEPDIR)/tmpdir.Po + -rm -f ./$(DEPDIR)/u64.Po + -rm -f ./$(DEPDIR)/unistd.Po + -rm -f ./$(DEPDIR)/unlink.Po + -rm -f ./$(DEPDIR)/utime.Po + -rm -f ./$(DEPDIR)/utimens.Po + -rm -f ./$(DEPDIR)/vasnprintf.Po + -rm -f ./$(DEPDIR)/vasprintf.Po + -rm -f ./$(DEPDIR)/vsnprintf.Po + -rm -f ./$(DEPDIR)/wait-process.Po + -rm -f ./$(DEPDIR)/waitpid.Po + -rm -f ./$(DEPDIR)/wcrtomb.Po + -rm -f ./$(DEPDIR)/wctype-h.Po + -rm -f ./$(DEPDIR)/wcwidth.Po + -rm -f ./$(DEPDIR)/write.Po + -rm -f ./$(DEPDIR)/xalloc-die.Po + -rm -f ./$(DEPDIR)/xmalloc.Po + -rm -f ./$(DEPDIR)/xmemdup0.Po + -rm -f ./$(DEPDIR)/xsize.Po + -rm -f ./$(DEPDIR)/xstrndup.Po + -rm -f glthread/$(DEPDIR)/lock.Po + -rm -f glthread/$(DEPDIR)/threadlib.Po + -rm -f unicase/$(DEPDIR)/cased.Po + -rm -f unicase/$(DEPDIR)/empty-prefix-context.Po + -rm -f unicase/$(DEPDIR)/empty-suffix-context.Po + -rm -f unicase/$(DEPDIR)/ignorable.Po + -rm -f unicase/$(DEPDIR)/special-casing.Po + -rm -f unicase/$(DEPDIR)/tolower.Po + -rm -f unicase/$(DEPDIR)/u8-casemap.Po + -rm -f unicase/$(DEPDIR)/u8-tolower.Po + -rm -f unictype/$(DEPDIR)/combiningclass.Po + -rm -f unictype/$(DEPDIR)/pr_soft_dotted.Po + -rm -f uninorm/$(DEPDIR)/decompose-internal.Po + -rm -f uninorm/$(DEPDIR)/u8-normalize.Po + -rm -f unistr/$(DEPDIR)/u8-cpy.Po + -rm -f unistr/$(DEPDIR)/u8-mbtouc-unsafe-aux.Po + -rm -f unistr/$(DEPDIR)/u8-mbtouc-unsafe.Po + -rm -f unistr/$(DEPDIR)/u8-strlen.Po + -rm -f unistr/$(DEPDIR)/u8-uctomb-aux.Po + -rm -f unistr/$(DEPDIR)/u8-uctomb.Po + -rm -f uniwidth/$(DEPDIR)/width.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-local distclean-tags @@ -2303,7 +2754,7 @@ install-dvi-am: -install-exec-am: install-exec-local +install-exec-am: install-html: install-html-recursive @@ -2326,7 +2777,207 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) glthread/$(DEPDIR) unicase/$(DEPDIR) unictype/$(DEPDIR) uninorm/$(DEPDIR) unistr/$(DEPDIR) uniwidth/$(DEPDIR) + -rm -f ./$(DEPDIR)/accept.Po + -rm -f ./$(DEPDIR)/af_alg.Po + -rm -f ./$(DEPDIR)/alloca.Po + -rm -f ./$(DEPDIR)/asnprintf.Po + -rm -f ./$(DEPDIR)/asprintf.Po + -rm -f ./$(DEPDIR)/base32.Po + -rm -f ./$(DEPDIR)/basename-lgpl.Po + -rm -f ./$(DEPDIR)/basename.Po + -rm -f ./$(DEPDIR)/binary-io.Po + -rm -f ./$(DEPDIR)/bind.Po + -rm -f ./$(DEPDIR)/btowc.Po + -rm -f ./$(DEPDIR)/c-ctype.Po + -rm -f ./$(DEPDIR)/c-strcasecmp.Po + -rm -f ./$(DEPDIR)/c-strcasestr.Po + -rm -f ./$(DEPDIR)/c-strncasecmp.Po + -rm -f ./$(DEPDIR)/cloexec.Po + -rm -f ./$(DEPDIR)/close.Po + -rm -f ./$(DEPDIR)/connect.Po + -rm -f ./$(DEPDIR)/dirname-lgpl.Po + -rm -f ./$(DEPDIR)/dirname.Po + -rm -f ./$(DEPDIR)/dup-safer-flag.Po + -rm -f ./$(DEPDIR)/dup-safer.Po + -rm -f ./$(DEPDIR)/dup2.Po + -rm -f ./$(DEPDIR)/error.Po + -rm -f ./$(DEPDIR)/exitfail.Po + -rm -f ./$(DEPDIR)/fatal-signal.Po + -rm -f ./$(DEPDIR)/fcntl.Po + -rm -f ./$(DEPDIR)/fd-hook.Po + -rm -f ./$(DEPDIR)/fd-safer-flag.Po + -rm -f ./$(DEPDIR)/fd-safer.Po + -rm -f ./$(DEPDIR)/fflush.Po + -rm -f ./$(DEPDIR)/float.Po + -rm -f ./$(DEPDIR)/flock.Po + -rm -f ./$(DEPDIR)/fnmatch.Po + -rm -f ./$(DEPDIR)/fnmatch_loop.Po + -rm -f ./$(DEPDIR)/fopen.Po + -rm -f ./$(DEPDIR)/fpurge.Po + -rm -f ./$(DEPDIR)/freading.Po + -rm -f ./$(DEPDIR)/fseek.Po + -rm -f ./$(DEPDIR)/fseeko.Po + -rm -f ./$(DEPDIR)/fstat.Po + -rm -f ./$(DEPDIR)/ftell.Po + -rm -f ./$(DEPDIR)/ftello.Po + -rm -f ./$(DEPDIR)/futimens.Po + -rm -f ./$(DEPDIR)/gai_strerror.Po + -rm -f ./$(DEPDIR)/getaddrinfo.Po + -rm -f ./$(DEPDIR)/getdelim.Po + -rm -f ./$(DEPDIR)/getdtablesize.Po + -rm -f ./$(DEPDIR)/getgroups.Po + -rm -f ./$(DEPDIR)/getline.Po + -rm -f ./$(DEPDIR)/getopt.Po + -rm -f ./$(DEPDIR)/getopt1.Po + -rm -f ./$(DEPDIR)/getpass.Po + -rm -f ./$(DEPDIR)/getpeername.Po + -rm -f ./$(DEPDIR)/getprogname.Po + -rm -f ./$(DEPDIR)/getsockname.Po + -rm -f ./$(DEPDIR)/gettime.Po + -rm -f ./$(DEPDIR)/gettimeofday.Po + -rm -f ./$(DEPDIR)/group-member.Po + -rm -f ./$(DEPDIR)/hard-locale.Po + -rm -f ./$(DEPDIR)/inet_ntop.Po + -rm -f ./$(DEPDIR)/ioctl.Po + -rm -f ./$(DEPDIR)/iswblank.Po + -rm -f ./$(DEPDIR)/itold.Po + -rm -f ./$(DEPDIR)/link.Po + -rm -f ./$(DEPDIR)/listen.Po + -rm -f ./$(DEPDIR)/localcharset.Po + -rm -f ./$(DEPDIR)/localeconv.Po + -rm -f ./$(DEPDIR)/localtime-buffer.Po + -rm -f ./$(DEPDIR)/lseek.Po + -rm -f ./$(DEPDIR)/lstat.Po + -rm -f ./$(DEPDIR)/malloc.Po + -rm -f ./$(DEPDIR)/malloca.Po + -rm -f ./$(DEPDIR)/mbchar.Po + -rm -f ./$(DEPDIR)/mbiter.Po + -rm -f ./$(DEPDIR)/mbrtowc.Po + -rm -f ./$(DEPDIR)/mbsinit.Po + -rm -f ./$(DEPDIR)/mbsrtowcs-state.Po + -rm -f ./$(DEPDIR)/mbsrtowcs.Po + -rm -f ./$(DEPDIR)/mbtowc.Po + -rm -f ./$(DEPDIR)/md2.Po + -rm -f ./$(DEPDIR)/md4.Po + -rm -f ./$(DEPDIR)/md5.Po + -rm -f ./$(DEPDIR)/memchr.Po + -rm -f ./$(DEPDIR)/memrchr.Po + -rm -f ./$(DEPDIR)/mkdir.Po + -rm -f ./$(DEPDIR)/mkostemp.Po + -rm -f ./$(DEPDIR)/mkstemp.Po + -rm -f ./$(DEPDIR)/mktime.Po + -rm -f ./$(DEPDIR)/msvc-inval.Po + -rm -f ./$(DEPDIR)/msvc-nothrow.Po + -rm -f ./$(DEPDIR)/nanosleep.Po + -rm -f ./$(DEPDIR)/nl_langinfo.Po + -rm -f ./$(DEPDIR)/open.Po + -rm -f ./$(DEPDIR)/pipe-safer.Po + -rm -f ./$(DEPDIR)/pipe.Po + -rm -f ./$(DEPDIR)/pipe2-safer.Po + -rm -f ./$(DEPDIR)/pipe2.Po + -rm -f ./$(DEPDIR)/printf-args.Po + -rm -f ./$(DEPDIR)/printf-parse.Po + -rm -f ./$(DEPDIR)/quotearg.Po + -rm -f ./$(DEPDIR)/raise.Po + -rm -f ./$(DEPDIR)/rawmemchr.Po + -rm -f ./$(DEPDIR)/recv.Po + -rm -f ./$(DEPDIR)/regcomp.Po + -rm -f ./$(DEPDIR)/regex.Po + -rm -f ./$(DEPDIR)/regex_internal.Po + -rm -f ./$(DEPDIR)/regexec.Po + -rm -f ./$(DEPDIR)/secure_getenv.Po + -rm -f ./$(DEPDIR)/select.Po + -rm -f ./$(DEPDIR)/send.Po + -rm -f ./$(DEPDIR)/setsockopt.Po + -rm -f ./$(DEPDIR)/sha1.Po + -rm -f ./$(DEPDIR)/sha256.Po + -rm -f ./$(DEPDIR)/sha512.Po + -rm -f ./$(DEPDIR)/sig-handler.Po + -rm -f ./$(DEPDIR)/sigaction.Po + -rm -f ./$(DEPDIR)/sigprocmask.Po + -rm -f ./$(DEPDIR)/snprintf.Po + -rm -f ./$(DEPDIR)/socket.Po + -rm -f ./$(DEPDIR)/sockets.Po + -rm -f ./$(DEPDIR)/spawn-pipe.Po + -rm -f ./$(DEPDIR)/spawn.Po + -rm -f ./$(DEPDIR)/spawn_faction_addclose.Po + -rm -f ./$(DEPDIR)/spawn_faction_adddup2.Po + -rm -f ./$(DEPDIR)/spawn_faction_addopen.Po + -rm -f ./$(DEPDIR)/spawn_faction_destroy.Po + -rm -f ./$(DEPDIR)/spawn_faction_init.Po + -rm -f ./$(DEPDIR)/spawnattr_destroy.Po + -rm -f ./$(DEPDIR)/spawnattr_init.Po + -rm -f ./$(DEPDIR)/spawnattr_setflags.Po + -rm -f ./$(DEPDIR)/spawnattr_setsigmask.Po + -rm -f ./$(DEPDIR)/spawni.Po + -rm -f ./$(DEPDIR)/spawnp.Po + -rm -f ./$(DEPDIR)/stat-time.Po + -rm -f ./$(DEPDIR)/stat-w32.Po + -rm -f ./$(DEPDIR)/stat.Po + -rm -f ./$(DEPDIR)/stdio-write.Po + -rm -f ./$(DEPDIR)/strcasecmp.Po + -rm -f ./$(DEPDIR)/strchrnul.Po + -rm -f ./$(DEPDIR)/strdup.Po + -rm -f ./$(DEPDIR)/strerror-override.Po + -rm -f ./$(DEPDIR)/strerror.Po + -rm -f ./$(DEPDIR)/strerror_r.Po + -rm -f ./$(DEPDIR)/stripslash.Po + -rm -f ./$(DEPDIR)/strncasecmp.Po + -rm -f ./$(DEPDIR)/strndup.Po + -rm -f ./$(DEPDIR)/strnlen.Po + -rm -f ./$(DEPDIR)/strnlen1.Po + -rm -f ./$(DEPDIR)/strpbrk.Po + -rm -f ./$(DEPDIR)/strptime.Po + -rm -f ./$(DEPDIR)/strtok_r.Po + -rm -f ./$(DEPDIR)/strtol.Po + -rm -f ./$(DEPDIR)/strtoll.Po + -rm -f ./$(DEPDIR)/symlink.Po + -rm -f ./$(DEPDIR)/sys_socket.Po + -rm -f ./$(DEPDIR)/tempname.Po + -rm -f ./$(DEPDIR)/time_r.Po + -rm -f ./$(DEPDIR)/timegm.Po + -rm -f ./$(DEPDIR)/timespec.Po + -rm -f ./$(DEPDIR)/tmpdir.Po + -rm -f ./$(DEPDIR)/u64.Po + -rm -f ./$(DEPDIR)/unistd.Po + -rm -f ./$(DEPDIR)/unlink.Po + -rm -f ./$(DEPDIR)/utime.Po + -rm -f ./$(DEPDIR)/utimens.Po + -rm -f ./$(DEPDIR)/vasnprintf.Po + -rm -f ./$(DEPDIR)/vasprintf.Po + -rm -f ./$(DEPDIR)/vsnprintf.Po + -rm -f ./$(DEPDIR)/wait-process.Po + -rm -f ./$(DEPDIR)/waitpid.Po + -rm -f ./$(DEPDIR)/wcrtomb.Po + -rm -f ./$(DEPDIR)/wctype-h.Po + -rm -f ./$(DEPDIR)/wcwidth.Po + -rm -f ./$(DEPDIR)/write.Po + -rm -f ./$(DEPDIR)/xalloc-die.Po + -rm -f ./$(DEPDIR)/xmalloc.Po + -rm -f ./$(DEPDIR)/xmemdup0.Po + -rm -f ./$(DEPDIR)/xsize.Po + -rm -f ./$(DEPDIR)/xstrndup.Po + -rm -f glthread/$(DEPDIR)/lock.Po + -rm -f glthread/$(DEPDIR)/threadlib.Po + -rm -f unicase/$(DEPDIR)/cased.Po + -rm -f unicase/$(DEPDIR)/empty-prefix-context.Po + -rm -f unicase/$(DEPDIR)/empty-suffix-context.Po + -rm -f unicase/$(DEPDIR)/ignorable.Po + -rm -f unicase/$(DEPDIR)/special-casing.Po + -rm -f unicase/$(DEPDIR)/tolower.Po + -rm -f unicase/$(DEPDIR)/u8-casemap.Po + -rm -f unicase/$(DEPDIR)/u8-tolower.Po + -rm -f unictype/$(DEPDIR)/combiningclass.Po + -rm -f unictype/$(DEPDIR)/pr_soft_dotted.Po + -rm -f uninorm/$(DEPDIR)/decompose-internal.Po + -rm -f uninorm/$(DEPDIR)/u8-normalize.Po + -rm -f unistr/$(DEPDIR)/u8-cpy.Po + -rm -f unistr/$(DEPDIR)/u8-mbtouc-unsafe-aux.Po + -rm -f unistr/$(DEPDIR)/u8-mbtouc-unsafe.Po + -rm -f unistr/$(DEPDIR)/u8-strlen.Po + -rm -f unistr/$(DEPDIR)/u8-uctomb-aux.Po + -rm -f unistr/$(DEPDIR)/u8-uctomb.Po + -rm -f uniwidth/$(DEPDIR)/width.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2343,25 +2994,25 @@ ps-am: -uninstall-am: uninstall-local +uninstall-am: .MAKE: $(am__recursive_targets) all check install install-am \ install-strip -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ - check check-am clean clean-generic clean-noinstLIBRARIES \ - clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-local \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-local \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--depfiles check check-am clean clean-generic \ + clean-noinstLIBRARIES clean-noinstLTLIBRARIES cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-local distclean-tags distdir dvi dvi-am html html-am \ + info info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \ - tags-am uninstall uninstall-am uninstall-local + tags-am uninstall uninstall-am .PRECIOUS: Makefile @@ -2403,43 +3054,16 @@ } > $@-t && \ mv $@-t $@ -# Listed in the same order as the GNU makefile conventions, and -# provided by autoconf 2.59c+ or 2.70. -# The Automake-defined pkg* macros are appended, in the order -# listed in the Automake 1.10a+ documentation. -configmake.h: Makefile - $(AM_V_GEN)rm -f $@-t && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - echo '#define PREFIX "$(prefix)"'; \ - echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ - echo '#define BINDIR "$(bindir)"'; \ - echo '#define SBINDIR "$(sbindir)"'; \ - echo '#define LIBEXECDIR "$(libexecdir)"'; \ - echo '#define DATAROOTDIR "$(datarootdir)"'; \ - echo '#define DATADIR "$(datadir)"'; \ - echo '#define SYSCONFDIR "$(sysconfdir)"'; \ - echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ - echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ - echo '#define RUNSTATEDIR "$(runstatedir)"'; \ - echo '#define INCLUDEDIR "$(includedir)"'; \ - echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ - echo '#define DOCDIR "$(docdir)"'; \ - echo '#define INFODIR "$(infodir)"'; \ - echo '#define HTMLDIR "$(htmldir)"'; \ - echo '#define DVIDIR "$(dvidir)"'; \ - echo '#define PDFDIR "$(pdfdir)"'; \ - echo '#define PSDIR "$(psdir)"'; \ - echo '#define LIBDIR "$(libdir)"'; \ - echo '#define LISPDIR "$(lispdir)"'; \ - echo '#define LOCALEDIR "$(localedir)"'; \ - echo '#define MANDIR "$(mandir)"'; \ - echo '#define MANEXT "$(manext)"'; \ - echo '#define PKGDATADIR "$(pkgdatadir)"'; \ - echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \ - echo '#define PKGLIBDIR "$(pkglibdir)"'; \ - echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \ - } | sed '/""/d' > $@-t && \ - mv -f $@-t $@ +# We need the following in order to create when the system +# doesn't have one. +@GL_GENERATE_BYTESWAP_H_TRUE@byteswap.h: byteswap.in.h $(top_builddir)/config.status +@GL_GENERATE_BYTESWAP_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_BYTESWAP_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_BYTESWAP_H_TRUE@ cat $(srcdir)/byteswap.in.h; \ +@GL_GENERATE_BYTESWAP_H_TRUE@ } > $@-t && \ +@GL_GENERATE_BYTESWAP_H_TRUE@ mv -f $@-t $@ +@GL_GENERATE_BYTESWAP_H_FALSE@byteswap.h: $(top_builddir)/config.status +@GL_GENERATE_BYTESWAP_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that is POSIX compliant. @@ -2506,21 +3130,31 @@ @GL_GENERATE_FLOAT_H_FALSE@float.h: $(top_builddir)/config.status @GL_GENERATE_FLOAT_H_FALSE@ rm -f $@ -# We need the following in order to create when the system -# doesn't have one that supports the required API. -@GL_GENERATE_FNMATCH_H_TRUE@fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +# We need the following in order to create . +@GL_GENERATE_FNMATCH_H_TRUE@fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) @GL_GENERATE_FNMATCH_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_FNMATCH_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_FNMATCH_H_TRUE@ sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@GL_GENERATE_FNMATCH_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_FNMATCH_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''HAVE_FNMATCH_H''@|$(HAVE_FNMATCH_H)|g' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''NEXT_FNMATCH_H''@|$(NEXT_FNMATCH_H)|g' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e 's/@''GNULIB_FNMATCH''@/$(GNULIB_FNMATCH)/g' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''HAVE_FNMATCH''@|$(HAVE_FNMATCH)|g' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''REPLACE_FNMATCH''@|$(REPLACE_FNMATCH)|g' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@GL_GENERATE_FNMATCH_H_TRUE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ @GL_GENERATE_FNMATCH_H_TRUE@ < $(srcdir)/fnmatch.in.h; \ @GL_GENERATE_FNMATCH_H_TRUE@ } > $@-t && \ -@GL_GENERATE_FNMATCH_H_TRUE@ mv -f $@-t $@ +@GL_GENERATE_FNMATCH_H_TRUE@ mv $@-t $@ @GL_GENERATE_FNMATCH_H_FALSE@fnmatch.h: $(top_builddir)/config.status @GL_GENERATE_FNMATCH_H_FALSE@ rm -f $@ # 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 +getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -2592,6 +3226,7 @@ -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ + -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ @@ -2619,6 +3254,7 @@ -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \ -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \ -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \ + -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \ -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \ -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \ -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \ @@ -2645,65 +3281,6 @@ @GL_GENERATE_LIMITS_H_FALSE@limits.h: $(top_builddir)/config.status @GL_GENERATE_LIMITS_H_FALSE@ rm -f $@ -# We need the following in order to install a simple file in $(libdir) -# which is shared with other installed packages. We use a list of referencing -# packages so that "make uninstall" will remove the file if and only if it -# is not used by another installed package. -# On systems with glibc-2.1 or newer, the file is redundant, therefore we -# avoid installing it. - -all-local: charset.alias ref-add.sed ref-del.sed -install-exec-local: install-exec-localcharset -install-exec-localcharset: all-local - if test $(GLIBC21) = no; then \ - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ - darwin* | cygwin* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ - esac ; \ - else \ - need_charset_alias=false ; \ - fi ; \ - if $$need_charset_alias; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ - fi ; \ - if test -f $(charset_alias); then \ - sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ - $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ - rm -f $(charset_tmp) ; \ - else \ - if $$need_charset_alias; then \ - sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ - $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ - rm -f $(charset_tmp) ; \ - fi ; \ - fi - -uninstall-local: uninstall-localcharset -uninstall-localcharset: all-local - if test -f $(charset_alias); then \ - sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \ - if grep '^# Packages using this file: $$' $(charset_tmp) \ - > /dev/null; then \ - rm -f $(charset_alias); \ - else \ - $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \ - fi; \ - rm -f $(charset_tmp); \ - fi - -charset.alias: config.charset - $(AM_V_GEN)rm -f t-$@ $@ && \ - $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \ - mv t-$@ $@ -.sin.sed: - $(AM_V_GEN)rm -f t-$@ $@ && \ - sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \ - mv t-$@ $@ - # We need the following in order to create when the system # doesn't have one that provides all definitions. locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) @@ -2717,11 +3294,16 @@ -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ + -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \ + -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ + -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \ -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \ -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \ -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \ + -e 's|@''REPLACE_NEWLOCALE''@|$(REPLACE_NEWLOCALE)|g' \ -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \ + -e 's|@''REPLACE_FREELOCALE''@|$(REPLACE_FREELOCALE)|g' \ -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ @@ -2802,8 +3384,8 @@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ - -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ - -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \ + -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \ + -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \ -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ @@ -2839,6 +3421,7 @@ -e 's/@''GNULIB_POSIX_SPAWN''@/$(GNULIB_POSIX_SPAWN)/g' \ -e 's/@''GNULIB_POSIX_SPAWNP''@/$(GNULIB_POSIX_SPAWNP)/g' \ -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)/g' \ + -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)/g' \ -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)/g' \ -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)/g' \ -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)/g' \ @@ -2860,7 +3443,9 @@ -e 's|@''HAVE_POSIX_SPAWN''@|$(HAVE_POSIX_SPAWN)|g' \ -e 's|@''HAVE_POSIX_SPAWNATTR_T''@|$(HAVE_POSIX_SPAWNATTR_T)|g' \ -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_T''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_T)|g' \ + -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \ -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \ + -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \ -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \ -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \ -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \ @@ -3276,7 +3861,7 @@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \ - -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \ + -e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \ -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \ -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \ -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \ @@ -3638,6 +4223,7 @@ -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ + -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ @@ -3681,6 +4267,7 @@ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ + -e 's|@''HAVE_GETPASS''@|$(HAVE_GETPASS)|g' \ -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ @@ -3695,7 +4282,6 @@ -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' \ @@ -3707,6 +4293,7 @@ -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \ + -e 's|@''HAVE_DECL_TRUNCATE''@|$(HAVE_DECL_TRUNCATE)|g' \ -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ @@ -3724,6 +4311,7 @@ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ + -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \ -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ @@ -3775,7 +4363,7 @@ # 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@utime.h: utime.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) @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' \ diff -Nru wget-1.19.5/lib/malloca.c wget-1.20.1/lib/malloca.c --- wget-1.19.5/lib/malloca.c 2018-01-19 21:19:16.000000000 +0000 +++ wget-1.20.1/lib/malloca.c 2018-12-26 20:08:18.000000000 +0000 @@ -1,6 +1,6 @@ /* Safe automatic memory allocation. Copyright (C) 2003, 2006-2007, 2009-2018 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. + Written by Bruno Haible , 2003, 2018. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,92 +21,49 @@ /* 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 + are only invoked for big memory sizes. + Here we use a bit in the address as an indicator, an idea by OndÅ™ej Bílka. + malloca() can return three types of pointers: + - Pointers ≡ 0 mod 2*sa_alignment_max come from stack allocation. + - Pointers ≡ sa_alignment_max mod 2*sa_alignment_max come from heap + allocation. + - NULL comes from a failed heap allocation. */ + +/* Type for holding very small pointer differences. */ +typedef unsigned char small_t; +/* Verify that it is wide enough. */ +verify (2 * sa_alignment_max - 1 <= (small_t) -1); 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; + /* Allocate one more word, used to determine the address to pass to freea(), + and room for the alignment ≡ sa_alignment_max mod 2*sa_alignment_max. */ + size_t nplus = n + sizeof (small_t) + 2 * sa_alignment_max - 1; if (nplus >= n) { - void *p = malloc (nplus); + char *mem = (char *) malloc (nplus); - if (p != NULL) + if (mem != 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; - + char *p = + (char *)((((uintptr_t)mem + sizeof (small_t) + sa_alignment_max - 1) + & ~(uintptr_t)(2 * sa_alignment_max - 1)) + + sa_alignment_max); + /* Here p >= mem + sizeof (small_t), + and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1 + hence p + n <= mem + nplus. + So, the memory range [p, p+n) lies in the allocated memory range + [mem, mem + nplus). */ + ((small_t *) p)[-1] = p - mem; + /* p ≡ sa_alignment_max mod 2*sa_alignment_max. */ return p; } } @@ -122,38 +79,27 @@ } #if HAVE_ALLOCA -void NO_SANITIZE_MEMORY +void freea (void *p) { - /* mmalloca() may have returned NULL. */ - if (p != NULL) + /* Check argument. */ + if ((uintptr_t) p & (sa_alignment_max - 1)) { - /* 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. */ + /* p was not the result of a malloca() call. Invalid argument. */ + abort (); + } + /* Determine whether p was a non-NULL pointer returned by mmalloca(). */ + if ((uintptr_t) p & sa_alignment_max) + { + void *mem = (char *) p - ((small_t *) p)[-1]; + free (mem); } } #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff -Nru wget-1.19.5/lib/malloca.h wget-1.20.1/lib/malloca.h --- wget-1.19.5/lib/malloca.h 2018-01-19 21:19:16.000000000 +0000 +++ wget-1.20.1/lib/malloca.h 2018-12-26 20:08:18.000000000 +0000 @@ -56,8 +56,10 @@ 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) \ + ((N) < 4032 - (2 * sa_alignment_max - 1) \ + ? (void *) (((uintptr_t) (char *) alloca ((N) + 2 * sa_alignment_max - 1) \ + + (2 * sa_alignment_max - 1)) \ + & ~(uintptr_t)(2 * sa_alignment_max - 1)) \ : mmalloca (N)) #else # define malloca(N) \ @@ -119,10 +121,7 @@ | (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 + ) + 1 }; #endif /* _MALLOCA_H */ diff -Nru wget-1.19.5/lib/malloca.valgrind wget-1.20.1/lib/malloca.valgrind --- wget-1.19.5/lib/malloca.valgrind 2018-01-19 21:19:16.000000000 +0000 +++ wget-1.20.1/lib/malloca.valgrind 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -# 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 -Nru wget-1.19.5/lib/mbrtowc.c wget-1.20.1/lib/mbrtowc.c --- wget-1.19.5/lib/mbrtowc.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/mbrtowc.c 2018-12-26 20:08:18.000000000 +0000 @@ -35,12 +35,60 @@ # include "streq.h" # include "verify.h" -#ifndef FALLTHROUGH -# if __GNUC__ < 7 -# define FALLTHROUGH ((void) 0) -# else -# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif # endif + +/* Returns a classification of special values of the encoding of the current + locale. */ +typedef enum { + enc_other, /* other */ + enc_utf8, /* UTF-8 */ + enc_eucjp, /* EUC-JP */ + enc_94, /* EUC-KR, GB2312, BIG5 */ + enc_euctw, /* EUC-TW */ + enc_gb18030, /* GB18030 */ + enc_sjis /* SJIS */ +} enc_t; +static inline enc_t +locale_enc (void) +{ + const char *encoding = locale_charset (); + if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0)) + return enc_utf8; + if (STREQ_OPT (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)) + return enc_eucjp; + if (STREQ_OPT (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0) + || STREQ_OPT (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0) + || STREQ_OPT (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)) + return enc_94; + if (STREQ_OPT (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)) + return enc_euctw; + if (STREQ_OPT (encoding, "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0)) + return enc_gb18030; + if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0)) + return enc_sjis; + return enc_other; +} + +#if GNULIB_WCHAR_SINGLE +/* When we know that the locale does not change, provide a speedup by + caching the value of locale_enc. */ +static int cached_locale_enc = -1; +static inline enc_t +locale_enc_cached (void) +{ + if (cached_locale_enc < 0) + cached_locale_enc = locale_enc (); + return cached_locale_enc; +} +#else +/* By default, don't make assumptions, hence no caching. */ +# define locale_enc_cached locale_enc #endif verify (sizeof (mbstate_t) >= 4); @@ -137,10 +185,9 @@ if (m >= 4 || m >= MB_CUR_MAX) goto invalid; /* Here MB_CUR_MAX > 1 and 0 < m < 4. */ - { - const char *encoding = locale_charset (); - - if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0)) + switch (locale_enc_cached ()) + { + case enc_utf8: /* UTF-8 */ { /* Cf. unistr/u8-mblen.c. */ unsigned char c = (unsigned char) p[0]; @@ -197,8 +244,7 @@ /* As a reference for this code, you can use the GNU libiconv implementation. Look for uses of the RET_TOOFEW macro. */ - if (STREQ_OPT (encoding, - "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)) + case enc_eucjp: /* EUC-JP */ { if (m == 1) { @@ -221,12 +267,8 @@ } goto invalid; } - if (STREQ_OPT (encoding, - "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0) - || STREQ_OPT (encoding, - "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0) - || STREQ_OPT (encoding, - "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)) + + case enc_94: /* EUC-KR, GB2312, BIG5 */ { if (m == 1) { @@ -237,8 +279,8 @@ } goto invalid; } - if (STREQ_OPT (encoding, - "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)) + + case enc_euctw: /* EUC-TW */ { if (m == 1) { @@ -256,8 +298,8 @@ } goto invalid; } - if (STREQ_OPT (encoding, - "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0)) + + case enc_gb18030: /* GB18030 */ { if (m == 1) { @@ -290,7 +332,8 @@ } goto invalid; } - if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0)) + + case enc_sjis: /* SJIS */ { if (m == 1) { @@ -303,9 +346,10 @@ goto invalid; } - /* An unknown multibyte encoding. */ - goto incomplete; - } + default: + /* An unknown multibyte encoding. */ + goto incomplete; + } incomplete: { diff -Nru wget-1.19.5/lib/mbsinit.c wget-1.20.1/lib/mbsinit.c --- wget-1.19.5/lib/mbsinit.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/mbsinit.c 2018-12-26 20:08:18.000000000 +0000 @@ -54,7 +54,7 @@ int mbsinit (const mbstate_t *ps) { -# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if defined _WIN32 && !defined __CYGWIN__ /* Native Windows. */ # ifdef __MINGW32__ /* On mingw, 'mbstate_t' is defined as 'int'. */ diff -Nru wget-1.19.5/lib/md4.c wget-1.20.1/lib/md4.c --- wget-1.19.5/lib/md4.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/md4.c 2018-12-26 20:08:19.000000000 +0000 @@ -33,9 +33,9 @@ # include "unlocked-io.h" #endif +#include #ifdef WORDS_BIGENDIAN -# define SWAP(n) \ - (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) +# define SWAP(n) bswap_32 (n) #else # define SWAP(n) (n) #endif diff -Nru wget-1.19.5/lib/md5.c wget-1.20.1/lib/md5.c --- wget-1.19.5/lib/md5.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/md5.c 2018-12-26 20:08:19.000000000 +0000 @@ -52,9 +52,9 @@ # define md5_buffer __md5_buffer #endif +#include #ifdef WORDS_BIGENDIAN -# define SWAP(n) \ - (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) +# define SWAP(n) bswap_32 (n) #else # define SWAP(n) (n) #endif @@ -134,21 +134,29 @@ } #endif +#if defined _LIBC || defined GL_COMPILE_CRYPTO_STREAM + +#include "af_alg.h" + /* Compute MD5 message digest for bytes read from STREAM. The resulting message digest number will be written into the 16 bytes beginning at RESBLOCK. */ int md5_stream (FILE *stream, void *resblock) { - struct md5_ctx ctx; - size_t sum; + switch (afalg_stream (stream, "md5", resblock, MD5_DIGEST_SIZE)) + { + case 0: return 0; + case -EIO: return 1; + } char *buffer = malloc (BLOCKSIZE + 72); if (!buffer) return 1; - /* Initialize the computation context. */ + struct md5_ctx ctx; md5_init_ctx (&ctx); + size_t sum; /* Iterate over full file contents. */ while (1) @@ -162,6 +170,14 @@ /* Read block. Take care for partial reads. */ while (1) { + /* Either process a partial fread() from this loop, + or the fread() in afalg_stream may have gotten EOF. + We need to avoid a subsequent fread() as EOF may + not be sticky. For details of such systems, see: + https://sourceware.org/bugzilla/show_bug.cgi?id=1190 */ + if (feof (stream)) + goto process_partial_block; + n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); sum += n; @@ -181,12 +197,6 @@ } goto process_partial_block; } - - /* We've read at least one byte, so ignore errors. But always - check for EOF, since feof may be true even though N > 0. - Otherwise, we could end up calling fread after EOF. */ - if (feof (stream)) - goto process_partial_block; } /* Process buffer with BLOCKSIZE bytes. Note that @@ -206,6 +216,7 @@ free (buffer); return 0; } +#endif #if ! HAVE_OPENSSL_MD5 /* Compute MD5 message digest for LEN bytes beginning at BUFFER. The diff -Nru wget-1.19.5/lib/md5.h wget-1.20.1/lib/md5.h --- wget-1.19.5/lib/md5.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/md5.h 2018-12-26 20:08:19.000000000 +0000 @@ -122,8 +122,11 @@ void *resblock) __THROW; # endif -/* Compute MD5 message digest for bytes read from STREAM. The - resulting message digest number will be written into the 16 bytes +/* Compute MD5 message digest for bytes read from STREAM. + STREAM is an open file stream. Regular files are handled more efficiently. + The contents of STREAM from its current position to its end will be read. + The case that the last operation on STREAM was an 'ungetc' is not supported. + The resulting message digest number will be written into the 16 bytes beginning at RESBLOCK. */ extern int __md5_stream (FILE *stream, void *resblock) __THROW; diff -Nru wget-1.19.5/lib/mkdir.c wget-1.20.1/lib/mkdir.c --- wget-1.19.5/lib/mkdir.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/mkdir.c 2018-12-26 20:08:19.000000000 +0000 @@ -38,7 +38,7 @@ Additionally, it declares _mkdir (and depending on compile flags, an alias mkdir), only in the nonstandard includes and , which are included in the override. */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # define mkdir(name,mode) _mkdir (name) # define maybe_unused _GL_UNUSED #else diff -Nru wget-1.19.5/lib/mktime.c wget-1.20.1/lib/mktime.c --- wget-1.19.5/lib/mktime.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/mktime.c 2018-12-26 20:08:19.000000000 +0000 @@ -28,6 +28,8 @@ Macro/expression Which gnulib module This compilation unit should define + _LIBC (glibc proper) mktime + NEED_MKTIME_WORKING mktime rpl_mktime || NEED_MKTIME_WINDOWS @@ -51,25 +53,70 @@ #include #include +#include +#include #include #include #if DEBUG_MKTIME # include -# include -# include /* Make it work even if the system's libc has its own mktime routine. */ # undef mktime # define mktime my_mktime +#endif /* DEBUG_MKTIME */ + +#ifndef NEED_MKTIME_INTERNAL +# define NEED_MKTIME_INTERNAL 0 +#endif +#ifndef NEED_MKTIME_WINDOWS +# define NEED_MKTIME_WINDOWS 0 #endif +#ifndef NEED_MKTIME_WORKING +# define NEED_MKTIME_WORKING DEBUG_MKTIME +#endif + +#include "mktime-internal.h" -#if NEED_MKTIME_WINDOWS /* on native Windows */ -# include -# include +#if !defined _LIBC && (NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS) +static void +my_tzset (void) +{ +# 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="); +# elif HAVE_TZSET + tzset (); +# endif +} +# undef __tzset +# define __tzset() my_tzset () #endif -#if NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL || DEBUG_MKTIME +#if defined _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL /* A signed type that can represent an integer number of years multiplied by three times the number of seconds in a year. It is @@ -150,19 +197,6 @@ }; -#ifdef _LIBC -typedef time_t mktime_offset_t; -#else -/* Portable standalone applications should supply a that - declares a POSIX-compliant localtime_r, for the benefit of older - implementations that lack localtime_r or have a nonstandard one. - See the gnulib time_r module for one way to implement this. */ -# undef __localtime_r -# define __localtime_r localtime_r -# define __mktime_internal mktime_internal -# include "mktime-internal.h" -#endif - /* Do the values A and B differ according to the rules for tm_isdst? A and B differ if one is zero and the other positive. */ static bool @@ -304,6 +338,7 @@ return r; } + /* Convert *TP to a time_t value, inverting the monotonic and mostly-unit-linear conversion function CONVERT. Use *OFFSET to keep track of a guess at the offset of the result, @@ -355,6 +390,7 @@ long_int lmday = mday; long_int yday = mon_yday + lmday; + mktime_offset_t off = *offset; int negative_offset_guess; int sec_requested = sec; @@ -372,7 +408,7 @@ /* Invert CONVERT by probing. First assume the same offset as last time. */ - INT_SUBTRACT_WRAPV (0, *offset, &negative_offset_guess); + INT_SUBTRACT_WRAPV (0, off, &negative_offset_guess); t0 = ydhms_diff (year, yday, hour, min, sec, EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0, negative_offset_guess); @@ -478,64 +514,28 @@ return t; } -#endif /* NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL || DEBUG_MKTIME */ +#endif /* _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL */ -#if NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS || DEBUG_MKTIME - -# if NEED_MKTIME_WORKING || DEBUG_MKTIME -static mktime_offset_t localtime_offset; -# endif +#if defined _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS /* Convert *TP to a time_t value. */ time_t mktime (struct tm *tp) { -# 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 - tzset (); -# endif +# if defined _LIBC || NEED_MKTIME_WORKING + static mktime_offset_t localtime_offset; return __mktime_internal (tp, __localtime_r, &localtime_offset); # else # undef mktime return mktime (tp); # endif } - -#endif /* NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS || DEBUG_MKTIME */ +#endif /* _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS */ #ifdef weak_alias weak_alias (mktime, timelocal) diff -Nru wget-1.19.5/lib/mktime-internal.h wget-1.20.1/lib/mktime-internal.h --- wget-1.19.5/lib/mktime-internal.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/mktime-internal.h 2018-12-26 20:08:19.000000000 +0000 @@ -35,3 +35,19 @@ time_t mktime_internal (struct tm *, struct tm * (*) (time_t const *, struct tm *), mktime_offset_t *); + +/* Although glibc source code uses leading underscores, Gnulib wants + ordinary names. + + Portable standalone applications should supply a that + declares a POSIX-compliant localtime_r, for the benefit of older + implementations that lack localtime_r or have a nonstandard one. + Similarly for gmtime_r. See the gnulib time_r module for one way + to implement this. */ + +#undef __gmtime_r +#undef __localtime_r +#define __gmtime_r gmtime_r +#define __localtime_r localtime_r + +#define __mktime_internal mktime_internal diff -Nru wget-1.19.5/lib/msvc-nothrow.h wget-1.20.1/lib/msvc-nothrow.h --- wget-1.19.5/lib/msvc-nothrow.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/msvc-nothrow.h 2018-12-26 20:08:19.000000000 +0000 @@ -25,7 +25,7 @@ This file defines wrappers that turn such an invalid parameter notification into an error code. */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Get original declaration of _get_osfhandle. */ # include diff -Nru wget-1.19.5/lib/nanosleep.c wget-1.20.1/lib/nanosleep.c --- wget-1.19.5/lib/nanosleep.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/nanosleep.c 2018-12-26 20:08:19.000000000 +0000 @@ -86,7 +86,7 @@ } } -#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#elif defined _WIN32 && ! defined __CYGWIN__ /* Native Windows platforms. */ # define WIN32_LEAN_AND_MEAN diff -Nru wget-1.19.5/lib/nl_langinfo.c wget-1.20.1/lib/nl_langinfo.c --- wget-1.19.5/lib/nl_langinfo.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/nl_langinfo.c 2018-12-26 20:08:19.000000000 +0000 @@ -22,12 +22,13 @@ #include #include -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include # include #endif +#if !REPLACE_NL_LANGINFO || GNULIB_defined_CODESET /* Return the codeset of the current locale, if this is easily deducible. Otherwise, return "". */ static char * @@ -64,7 +65,7 @@ } } -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ /* If setlocale is successful, it returns the number of the codepage, as a string. Otherwise, fall back on Windows API GetACP, which returns the locale's codepage as a number (although @@ -76,9 +77,10 @@ else sprintf (buf + 2, "%u", GetACP ()); codeset = memcpy (buf, "CP", 2); -#endif +# endif return codeset; } +#endif #if REPLACE_NL_LANGINFO @@ -100,6 +102,24 @@ case T_FMT_AMPM: return (char *) "%I:%M:%S %p"; # endif +# if GNULIB_defined_ALTMON + case ALTMON_1: + case ALTMON_2: + case ALTMON_3: + case ALTMON_4: + case ALTMON_5: + case ALTMON_6: + case ALTMON_7: + case ALTMON_8: + case ALTMON_9: + case ALTMON_10: + case ALTMON_11: + case ALTMON_12: + /* We don't ship the appropriate localizations with gnulib. Therefore, + treat ALTMON_i like MON_i. */ + item = item - ALTMON_1 + MON_1; + break; +# endif # if GNULIB_defined_ERA case ERA: /* The format is not standardized. In glibc it is a sequence of strings @@ -171,8 +191,10 @@ return localeconv () ->decimal_point; case THOUSEP: return localeconv () ->thousands_sep; +# ifdef GROUPING case GROUPING: return localeconv () ->grouping; +# endif /* nl_langinfo items of the LC_TIME category. TODO: Really use the locale. */ case D_T_FMT: @@ -228,28 +250,49 @@ return (char *) abdays[item - ABDAY_1]; return nlbuf; } - case MON_1: - case MON_2: - case MON_3: - case MON_4: - case MON_5: - case MON_6: - case MON_7: - case MON_8: - case MON_9: - case MON_10: - case MON_11: - case MON_12: - { - static char const months[][sizeof "September"] = { - "January", "February", "March", "April", "May", "June", "July", - "September", "October", "November", "December" - }; + { + static char const months[][sizeof "September"] = { + "January", "February", "March", "April", "May", "June", "July", + "September", "October", "November", "December" + }; + case MON_1: + case MON_2: + case MON_3: + case MON_4: + case MON_5: + case MON_6: + case MON_7: + case MON_8: + case MON_9: + case MON_10: + case MON_11: + case MON_12: tmm.tm_mon = item - MON_1; if (!strftime (nlbuf, sizeof nlbuf, "%B", &tmm)) return (char *) months[item - MON_1]; return nlbuf; - } + case ALTMON_1: + case ALTMON_2: + case ALTMON_3: + case ALTMON_4: + case ALTMON_5: + case ALTMON_6: + case ALTMON_7: + case ALTMON_8: + case ALTMON_9: + case ALTMON_10: + case ALTMON_11: + case ALTMON_12: + tmm.tm_mon = item - ALTMON_1; + /* The platforms without nl_langinfo() don't support strftime with %OB. + We don't even need to try. */ + #if 0 + if (!strftime (nlbuf, sizeof nlbuf, "%OB", &tmm)) + #endif + if (!strftime (nlbuf, sizeof nlbuf, "%B", &tmm)) + return (char *) months[item - ALTMON_1]; + return nlbuf; + } case ABMON_1: case ABMON_2: case ABMON_3: @@ -279,6 +322,7 @@ /* nl_langinfo items of the LC_MONETARY category. */ case CRNCYSTR: return localeconv () ->currency_symbol; +# ifdef INT_CURR_SYMBOL case INT_CURR_SYMBOL: return localeconv () ->int_curr_symbol; case MON_DECIMAL_POINT: @@ -307,6 +351,7 @@ return & localeconv () ->p_sign_posn; case N_SIGN_POSN: return & localeconv () ->n_sign_posn; +# endif /* nl_langinfo items of the LC_MESSAGES category TODO: Really use the locale. */ case YESEXPR: diff -Nru wget-1.19.5/lib/_Noreturn.h wget-1.20.1/lib/_Noreturn.h --- wget-1.19.5/lib/_Noreturn.h 2018-01-19 21:19:16.000000000 +0000 +++ wget-1.20.1/lib/_Noreturn.h 2018-12-26 20:08:17.000000000 +0000 @@ -1,8 +1,12 @@ -#if !defined _Noreturn && __STDC_VERSION__ < 201112 -# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ - || 0x5110 <= __SUNPRO_C) +#ifndef _Noreturn +# if 201103 <= (defined __cplusplus ? __cplusplus : 0) +# define _Noreturn [[noreturn]] +# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ + || 4 < __GNUC__ + (7 <= __GNUC_MINOR__)) + /* _Noreturn works as-is. */ +# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C # define _Noreturn __attribute__ ((__noreturn__)) -# elif 1200 <= _MSC_VER +# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) # define _Noreturn __declspec (noreturn) # else # define _Noreturn diff -Nru wget-1.19.5/lib/open.c wget-1.20.1/lib/open.c --- wget-1.19.5/lib/open.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/open.c 2018-12-26 20:08:19.000000000 +0000 @@ -86,7 +86,7 @@ flags &= ~O_NONBLOCK; #endif -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ if (strcmp (filename, "/dev/null") == 0) filename = "NUL"; #endif diff -Nru wget-1.19.5/lib/pathmax.h wget-1.20.1/lib/pathmax.h --- wget-1.19.5/lib/pathmax.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/pathmax.h 2018-12-26 20:08:19.000000000 +0000 @@ -65,7 +65,7 @@ # define PATH_MAX 1024 # endif -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ /* The page "Naming Files, Paths, and Namespaces" on msdn.microsoft.com, section "Maximum Path Length Limitation", diff -Nru wget-1.19.5/lib/pipe2.c wget-1.20.1/lib/pipe2.c --- wget-1.19.5/lib/pipe2.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/pipe2.c 2018-12-26 20:08:19.000000000 +0000 @@ -29,7 +29,7 @@ # include "nonblocking.h" #endif -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Native Windows API. */ # include @@ -73,7 +73,7 @@ return -1; } -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Native Windows API. */ if (_pipe (fd, 4096, flags & ~O_NONBLOCK) < 0) @@ -152,8 +152,7 @@ #endif -#if GNULIB_defined_O_NONBLOCK || \ - !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) +#if GNULIB_defined_O_NONBLOCK || !(defined _WIN32 && ! defined __CYGWIN__) fail: { int saved_errno = errno; diff -Nru wget-1.19.5/lib/pipe.c wget-1.20.1/lib/pipe.c --- wget-1.19.5/lib/pipe.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/pipe.c 2018-12-26 20:08:19.000000000 +0000 @@ -19,7 +19,7 @@ /* Specification. */ #include -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Native Windows API. */ /* Get _pipe(). */ diff -Nru wget-1.19.5/lib/printf-parse.c wget-1.20.1/lib/printf-parse.c --- wget-1.19.5/lib/printf-parse.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/printf-parse.c 2018-12-26 20:08:19.000000000 +0000 @@ -419,7 +419,7 @@ cp++; } #endif -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* On native Windows, PRIdMAX is defined as "I64d". We cannot change it to "lld" because PRIdMAX must also be understood by the system's printf routines. */ diff -Nru wget-1.19.5/lib/raise.c wget-1.20.1/lib/raise.c --- wget-1.19.5/lib/raise.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/raise.c 2018-12-26 20:08:19.000000000 +0000 @@ -31,27 +31,9 @@ # include "msvc-inval.h" # endif -# undef raise - # if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static int -raise_nothrow (int sig) -{ - int result; - - TRY_MSVC_INVAL - { - result = raise (sig); - } - CATCH_MSVC_INVAL - { - result = -1; - errno = EINVAL; - } - DONE_MSVC_INVAL; - - return result; -} +/* Forward declaration. */ +static int raise_nothrow (int sig); # else # define raise_nothrow raise # endif @@ -61,12 +43,11 @@ # include -# define rpl_raise raise - #endif int -rpl_raise (int sig) +raise (int sig) +#undef raise { #if GNULIB_defined_signal_blocking && GNULIB_defined_SIGPIPE if (sig == SIGPIPE) @@ -79,3 +60,24 @@ return kill (getpid (), sig); #endif } + +#if HAVE_RAISE && HAVE_MSVC_INVALID_PARAMETER_HANDLER +static int +raise_nothrow (int sig) +{ + int result; + + TRY_MSVC_INVAL + { + result = raise (sig); + } + CATCH_MSVC_INVAL + { + result = -1; + errno = EINVAL; + } + DONE_MSVC_INVAL; + + return result; +} +#endif diff -Nru wget-1.19.5/lib/ref-add.sin wget-1.20.1/lib/ref-add.sin --- wget-1.19.5/lib/ref-add.sin 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/ref-add.sin 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -# Add this package to a list of references stored in a text file. -# -# 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 -# 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 Bruno Haible . -# -/^# Packages using this file: / { - s/# Packages using this file:// - ta - :a - s/ @PACKAGE@ / @PACKAGE@ / - tb - s/ $/ @PACKAGE@ / - :b - s/^/# Packages using this file:/ -} diff -Nru wget-1.19.5/lib/ref-del.sin wget-1.20.1/lib/ref-del.sin --- wget-1.19.5/lib/ref-del.sin 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/ref-del.sin 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -# Remove this package from a list of references stored in a text file. -# -# 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 -# 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 Bruno Haible . -# -/^# Packages using this file: / { - s/# Packages using this file:// - s/ @PACKAGE@ / / - s/^/# Packages using this file:/ -} diff -Nru wget-1.19.5/lib/regcomp.c wget-1.20.1/lib/regcomp.c --- wget-1.19.5/lib/regcomp.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/regcomp.c 2018-12-26 20:08:19.000000000 +0000 @@ -476,7 +476,7 @@ /* Try to allocate space for the fastmap. */ preg->fastmap = re_malloc (char, SBC_MAX); - if (BE (preg->fastmap == NULL, 0)) + if (__glibc_unlikely (preg->fastmap == NULL)) return REG_ESPACE; syntax |= (cflags & REG_ICASE) ? RE_ICASE : 0; @@ -502,7 +502,7 @@ ret = REG_EPAREN; /* We have already checked preg->fastmap != NULL. */ - if (BE (ret == REG_NOERROR, 1)) + if (__glibc_likely (ret == REG_NOERROR)) /* Compute the fastmap now, since regexec cannot modify the pattern buffer. This function never fails in this implementation. */ (void) re_compile_fastmap (preg); @@ -529,10 +529,9 @@ { const char *msg; size_t msg_size; + int nerrcodes = sizeof __re_error_msgid_idx / sizeof __re_error_msgid_idx[0]; - if (BE (errcode < 0 - || errcode >= (int) (sizeof (__re_error_msgid_idx) - / sizeof (__re_error_msgid_idx[0])), 0)) + if (__glibc_unlikely (errcode < 0 || errcode >= nerrcodes)) /* Only error codes returned by the rest of the code should be passed to this routine. If we are given anything else, or if other regex code generates an invalid error code, then the program has a bug. @@ -543,10 +542,10 @@ msg_size = strlen (msg) + 1; /* Includes the null. */ - if (BE (errbuf_size != 0, 1)) + if (__glibc_likely (errbuf_size != 0)) { size_t cpy_size = msg_size; - if (BE (msg_size > errbuf_size, 0)) + if (__glibc_unlikely (msg_size > errbuf_size)) { cpy_size = errbuf_size - 1; errbuf[cpy_size] = '\0'; @@ -644,7 +643,7 @@ regfree (regex_t *preg) { re_dfa_t *dfa = preg->buffer; - if (BE (dfa != NULL, 1)) + if (__glibc_likely (dfa != NULL)) { lock_fini (dfa->lock); free_dfa_content (dfa); @@ -754,7 +753,7 @@ /* Initialize the dfa. */ dfa = preg->buffer; - if (BE (preg->allocated < sizeof (re_dfa_t), 0)) + if (__glibc_unlikely (preg->allocated < sizeof (re_dfa_t))) { /* If zero allocated, but buffer is non-null, try to realloc enough space. This loses if buffer's address is bogus, but @@ -769,9 +768,9 @@ preg->used = sizeof (re_dfa_t); err = init_dfa (dfa, length); - if (BE (err == REG_NOERROR && lock_init (dfa->lock) != 0, 0)) + if (__glibc_unlikely (err == REG_NOERROR && lock_init (dfa->lock) != 0)) err = REG_ESPACE; - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { free_dfa_content (dfa); preg->buffer = NULL; @@ -786,7 +785,7 @@ err = re_string_construct (®exp, pattern, length, preg->translate, (syntax & RE_ICASE) != 0, dfa); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_compile_internal_free_return: free_workarea_compile (preg); @@ -801,12 +800,12 @@ /* Parse the regular expression, and build a structure tree. */ preg->re_nsub = 0; dfa->str_tree = parse (®exp, preg, syntax, &err); - if (BE (dfa->str_tree == NULL, 0)) + if (__glibc_unlikely (dfa->str_tree == NULL)) goto re_compile_internal_free_return; /* Analyze the tree and create the nfa. */ err = analyze (preg); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto re_compile_internal_free_return; #ifdef RE_ENABLE_I18N @@ -822,7 +821,7 @@ free_workarea_compile (preg); re_string_destruct (®exp); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { lock_fini (dfa->lock); free_dfa_content (dfa); @@ -864,7 +863,8 @@ calculation below, and for similar doubling calculations elsewhere. And it's <= rather than <, because some of the doubling calculations add 1 afterwards. */ - if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) / 2 <= pat_len, 0)) + if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / max_object_size) / 2 + <= pat_len)) return REG_ESPACE; dfa->nodes_alloc = pat_len + 1; @@ -908,7 +908,7 @@ int i, j, ch; dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); - if (BE (dfa->sb_char == NULL, 0)) + if (__glibc_unlikely (dfa->sb_char == NULL)) return REG_ESPACE; /* Set the bits corresponding to single byte chars. */ @@ -927,7 +927,7 @@ } #endif - if (BE (dfa->nodes == NULL || dfa->state_table == NULL, 0)) + if (__glibc_unlikely (dfa->nodes == NULL || dfa->state_table == NULL)) return REG_ESPACE; return REG_NOERROR; } @@ -943,7 +943,7 @@ int j; int ch = 0; dfa->word_ops_used = 1; - if (BE (dfa->map_notascii == 0, 1)) + if (__glibc_likely (dfa->map_notascii == 0)) { /* Avoid uint32_t and uint64_t as some non-GCC platforms lack them, an issue when this code is used in Gnulib. */ @@ -970,7 +970,7 @@ goto general_case; ch = 128; - if (BE (dfa->is_utf8, 1)) + if (__glibc_likely (dfa->is_utf8)) { memset (&dfa->word_char[i], '\0', (SBC_MAX - ch) / 8); return; @@ -1017,7 +1017,7 @@ first = dfa->str_tree->first->node_idx; dfa->init_node = first; err = re_node_set_init_copy (&init_nodes, dfa->eclosures + first); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; /* The back-references which are in initial states can epsilon transit, @@ -1061,7 +1061,7 @@ /* It must be the first time to invoke acquire_state. */ dfa->init_state = re_acquire_state_context (&err, dfa, &init_nodes, 0); /* We don't check ERR here, since the initial state must not be NULL. */ - if (BE (dfa->init_state == NULL, 0)) + if (__glibc_unlikely (dfa->init_state == NULL)) return err; if (dfa->init_state->has_constraint) { @@ -1073,8 +1073,9 @@ &init_nodes, CONTEXT_NEWLINE | CONTEXT_BEGBUF); - if (BE (dfa->init_state_word == NULL || dfa->init_state_nl == NULL - || dfa->init_state_begbuf == NULL, 0)) + if (__glibc_unlikely (dfa->init_state_word == NULL + || dfa->init_state_nl == NULL + || dfa->init_state_begbuf == NULL)) return err; } else @@ -1181,8 +1182,8 @@ dfa->org_indices = re_malloc (Idx, dfa->nodes_alloc); dfa->edests = re_malloc (re_node_set, dfa->nodes_alloc); dfa->eclosures = re_malloc (re_node_set, dfa->nodes_alloc); - if (BE (dfa->nexts == NULL || dfa->org_indices == NULL || dfa->edests == NULL - || dfa->eclosures == NULL, 0)) + if (__glibc_unlikely (dfa->nexts == NULL || dfa->org_indices == NULL + || dfa->edests == NULL || dfa->eclosures == NULL)) return REG_ESPACE; dfa->subexp_map = re_malloc (Idx, preg->re_nsub); @@ -1203,17 +1204,17 @@ } ret = postorder (dfa->str_tree, lower_subexps, preg); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; ret = postorder (dfa->str_tree, calc_first, dfa); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; preorder (dfa->str_tree, calc_next, dfa); ret = preorder (dfa->str_tree, link_nfa_nodes, dfa); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; ret = calc_eclosure (dfa); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; /* We only need this during the prune_impossible_nodes pass in regexec.c; @@ -1222,7 +1223,7 @@ || dfa->nbackref) { dfa->inveclosures = re_malloc (re_node_set, dfa->nodes_len); - if (BE (dfa->inveclosures == NULL, 0)) + if (__glibc_unlikely (dfa->inveclosures == NULL)) return REG_ESPACE; ret = calc_inveclosure (dfa); } @@ -1252,7 +1253,7 @@ do { reg_errcode_t err = fn (extra, node); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; if (node->parent == NULL) return REG_NOERROR; @@ -1274,7 +1275,7 @@ for (node = root; ; ) { reg_errcode_t err = fn (extra, node); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; /* Go to the left node, or up and to the right. */ @@ -1375,7 +1376,8 @@ cls = create_tree (dfa, NULL, NULL, OP_CLOSE_SUBEXP); tree1 = body ? create_tree (dfa, body, cls, CONCAT) : cls; tree = create_tree (dfa, op, tree1, CONCAT); - if (BE (tree == NULL || tree1 == NULL || op == NULL || cls == NULL, 0)) + if (__glibc_unlikely (tree == NULL || tree1 == NULL + || op == NULL || cls == NULL)) { *err = REG_ESPACE; return NULL; @@ -1401,7 +1403,7 @@ { node->first = node; node->node_idx = re_dfa_add_node (dfa, node->token); - if (BE (node->node_idx == -1, 0)) + if (__glibc_unlikely (node->node_idx == -1)) return REG_ESPACE; if (node->token.type == ANCHOR) dfa->nodes[node->node_idx].constraint = node->token.opr.ctx_type; @@ -1512,11 +1514,11 @@ org_dest = dfa->nexts[org_node]; re_node_set_empty (dfa->edests + clone_node); clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == -1, 0)) + if (__glibc_unlikely (clone_dest == -1)) return REG_ESPACE; dfa->nexts[clone_node] = dfa->nexts[org_node]; ok = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; } else if (dfa->edests[org_node].nelem == 0) @@ -1538,17 +1540,17 @@ if (org_node == root_node && clone_node != org_node) { ok = re_node_set_insert (dfa->edests + clone_node, org_dest); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; break; } /* In case the node has another constraint, append it. */ constraint |= dfa->nodes[org_node].constraint; clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == -1, 0)) + if (__glibc_unlikely (clone_dest == -1)) return REG_ESPACE; ok = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; } else /* dfa->edests[org_node].nelem == 2 */ @@ -1564,14 +1566,14 @@ /* There is no such duplicated node, create a new one. */ reg_errcode_t err; clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == -1, 0)) + if (__glibc_unlikely (clone_dest == -1)) return REG_ESPACE; ok = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; err = duplicate_node_closure (dfa, org_dest, clone_dest, root_node, constraint); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } else @@ -1579,16 +1581,16 @@ /* There is a duplicated node which satisfies the constraint, use it to avoid infinite loop. */ ok = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; } org_dest = dfa->edests[org_node].elems[1]; clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == -1, 0)) + if (__glibc_unlikely (clone_dest == -1)) return REG_ESPACE; ok = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; } org_node = org_dest; @@ -1622,7 +1624,7 @@ duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint) { Idx dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]); - if (BE (dup_idx != -1, 1)) + if (__glibc_likely (dup_idx != -1)) { dfa->nodes[dup_idx].constraint = constraint; dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].constraint; @@ -1648,7 +1650,7 @@ for (idx = 0; idx < dfa->eclosures[src].nelem; ++idx) { ok = re_node_set_insert_last (dfa->inveclosures + elems[idx], src); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; } } @@ -1689,7 +1691,7 @@ continue; /* Calculate epsilon closure of 'node_idx'. */ err = calc_eclosure_iter (&eclosure_elem, dfa, node_idx, true); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; if (dfa->eclosures[node_idx].nelem == 0) @@ -1712,7 +1714,7 @@ bool ok; bool incomplete = false; err = re_node_set_alloc (&eclosure, dfa->edests[node].nelem + 1); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; /* This indicates that we are calculating this node now. @@ -1727,7 +1729,7 @@ { err = duplicate_node_closure (dfa, node, node, node, dfa->nodes[node].constraint); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } @@ -1749,14 +1751,14 @@ if (dfa->eclosures[edest].nelem == 0) { err = calc_eclosure_iter (&eclosure_elem, dfa, edest, false); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } else eclosure_elem = dfa->eclosures[edest]; /* Merge the epsilon closure of 'edest'. */ err = re_node_set_merge (&eclosure, &eclosure_elem); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; /* If the epsilon closure of 'edest' is incomplete, the epsilon closure of this node is also incomplete. */ @@ -1769,7 +1771,7 @@ /* An epsilon closure includes itself. */ ok = re_node_set_insert (&eclosure, node); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; if (incomplete && !root) dfa->eclosures[node].nelem = 0; @@ -2139,14 +2141,14 @@ dfa->syntax = syntax; fetch_token (¤t_token, regexp, syntax | RE_CARET_ANCHORS_HERE); tree = parse_reg_exp (regexp, preg, ¤t_token, syntax, 0, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) + if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL)) return NULL; eor = create_tree (dfa, NULL, NULL, END_OF_RE); if (tree != NULL) root = create_tree (dfa, tree, eor, CONCAT); else root = eor; - if (BE (eor == NULL || root == NULL, 0)) + if (__glibc_unlikely (eor == NULL || root == NULL)) { *err = REG_ESPACE; return NULL; @@ -2171,7 +2173,7 @@ bin_tree_t *tree, *branch = NULL; bitset_word_t initial_bkref_map = dfa->completed_bkref_map; tree = parse_branch (regexp, preg, token, syntax, nest, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) + if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL)) return NULL; while (token->type == OP_ALT) @@ -2183,7 +2185,7 @@ bitset_word_t accumulated_bkref_map = dfa->completed_bkref_map; dfa->completed_bkref_map = initial_bkref_map; branch = parse_branch (regexp, preg, token, syntax, nest, err); - if (BE (*err != REG_NOERROR && branch == NULL, 0)) + if (__glibc_unlikely (*err != REG_NOERROR && branch == NULL)) { if (tree != NULL) postorder (tree, free_tree, NULL); @@ -2194,7 +2196,7 @@ else branch = NULL; tree = create_tree (dfa, tree, branch, OP_ALT); - if (BE (tree == NULL, 0)) + if (__glibc_unlikely (tree == NULL)) { *err = REG_ESPACE; return NULL; @@ -2219,14 +2221,14 @@ bin_tree_t *tree, *expr; re_dfa_t *dfa = preg->buffer; tree = parse_expression (regexp, preg, token, syntax, nest, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) + if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL)) return NULL; while (token->type != OP_ALT && token->type != END_OF_RE && (nest == 0 || token->type != OP_CLOSE_SUBEXP)) { expr = parse_expression (regexp, preg, token, syntax, nest, err); - if (BE (*err != REG_NOERROR && expr == NULL, 0)) + if (__glibc_unlikely (*err != REG_NOERROR && expr == NULL)) { if (tree != NULL) postorder (tree, free_tree, NULL); @@ -2267,7 +2269,7 @@ { case CHARACTER: tree = create_token_tree (dfa, NULL, NULL, token); - if (BE (tree == NULL, 0)) + if (__glibc_unlikely (tree == NULL)) { *err = REG_ESPACE; return NULL; @@ -2282,7 +2284,7 @@ fetch_token (token, regexp, syntax); mbc_remain = create_token_tree (dfa, NULL, NULL, token); tree = create_tree (dfa, tree, mbc_remain, CONCAT); - if (BE (mbc_remain == NULL || tree == NULL, 0)) + if (__glibc_unlikely (mbc_remain == NULL || tree == NULL)) { *err = REG_ESPACE; return NULL; @@ -2294,25 +2296,25 @@ case OP_OPEN_SUBEXP: tree = parse_sub_exp (regexp, preg, token, syntax, nest + 1, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) + if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL)) return NULL; break; case OP_OPEN_BRACKET: tree = parse_bracket_exp (regexp, dfa, token, syntax, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) + if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL)) return NULL; break; case OP_BACK_REF: - if (!BE (dfa->completed_bkref_map & (1 << token->opr.idx), 1)) + if (!__glibc_likely (dfa->completed_bkref_map & (1 << token->opr.idx))) { *err = REG_ESUBREG; return NULL; } dfa->used_bkref_map |= 1 << token->opr.idx; tree = create_token_tree (dfa, NULL, NULL, token); - if (BE (tree == NULL, 0)) + if (__glibc_unlikely (tree == NULL)) { *err = REG_ESPACE; return NULL; @@ -2358,7 +2360,7 @@ /* mb_partial and word_char bits should be initialized already by peek_token. */ tree = create_token_tree (dfa, NULL, NULL, token); - if (BE (tree == NULL, 0)) + if (__glibc_unlikely (tree == NULL)) { *err = REG_ESPACE; return NULL; @@ -2388,7 +2390,8 @@ } tree_last = create_token_tree (dfa, NULL, NULL, token); tree = create_tree (dfa, tree_first, tree_last, OP_ALT); - if (BE (tree_first == NULL || tree_last == NULL || tree == NULL, 0)) + if (__glibc_unlikely (tree_first == NULL || tree_last == NULL + || tree == NULL)) { *err = REG_ESPACE; return NULL; @@ -2397,7 +2400,7 @@ else { tree = create_token_tree (dfa, NULL, NULL, token); - if (BE (tree == NULL, 0)) + if (__glibc_unlikely (tree == NULL)) { *err = REG_ESPACE; return NULL; @@ -2412,7 +2415,7 @@ case OP_PERIOD: tree = create_token_tree (dfa, NULL, NULL, token); - if (BE (tree == NULL, 0)) + if (__glibc_unlikely (tree == NULL)) { *err = REG_ESPACE; return NULL; @@ -2427,7 +2430,7 @@ "alnum", "_", token->type == OP_NOTWORD, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) + if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL)) return NULL; break; @@ -2437,7 +2440,7 @@ "space", "", token->type == OP_NOTSPACE, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) + if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL)) return NULL; break; @@ -2463,7 +2466,7 @@ { bin_tree_t *dup_tree = parse_dup_op (tree, regexp, dfa, token, syntax, err); - if (BE (*err != REG_NOERROR && dup_tree == NULL, 0)) + if (__glibc_unlikely (*err != REG_NOERROR && dup_tree == NULL)) { if (tree != NULL) postorder (tree, free_tree, NULL); @@ -2509,13 +2512,14 @@ else { tree = parse_reg_exp (regexp, preg, token, syntax, nest, err); - if (BE (*err == REG_NOERROR && token->type != OP_CLOSE_SUBEXP, 0)) + if (__glibc_unlikely (*err == REG_NOERROR + && token->type != OP_CLOSE_SUBEXP)) { if (tree != NULL) postorder (tree, free_tree, NULL); *err = REG_EPAREN; } - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) return NULL; } @@ -2523,7 +2527,7 @@ dfa->completed_bkref_map |= 1 << cur_nsub; tree = create_tree (dfa, tree, NULL, SUBEXP); - if (BE (tree == NULL, 0)) + if (__glibc_unlikely (tree == NULL)) { *err = REG_ESPACE; return NULL; @@ -2556,17 +2560,17 @@ return NULL; } } - if (BE (start != -2, 1)) + if (__glibc_likely (start != -2)) { /* We treat "{n}" as "{n,n}". */ end = ((token->type == OP_CLOSE_DUP_NUM) ? start : ((token->type == CHARACTER && token->opr.c == ',') ? fetch_number (regexp, token, syntax) : -2)); } - if (BE (start == -2 || end == -2, 0)) + if (__glibc_unlikely (start == -2 || end == -2)) { /* Invalid sequence. */ - if (BE (!(syntax & RE_INVALID_INTERVAL_ORD), 0)) + if (__glibc_unlikely (!(syntax & RE_INVALID_INTERVAL_ORD))) { if (token->type == END_OF_RE) *err = REG_EBRACE; @@ -2585,15 +2589,15 @@ return elem; } - if (BE ((end != -1 && start > end) - || token->type != OP_CLOSE_DUP_NUM, 0)) + if (__glibc_unlikely ((end != -1 && start > end) + || token->type != OP_CLOSE_DUP_NUM)) { /* First number greater than second. */ *err = REG_BADBR; return NULL; } - if (BE (RE_DUP_MAX < (end == -1 ? start : end), 0)) + if (__glibc_unlikely (RE_DUP_MAX < (end == -1 ? start : end))) { *err = REG_ESIZE; return NULL; @@ -2607,23 +2611,23 @@ fetch_token (token, regexp, syntax); - if (BE (elem == NULL, 0)) + if (__glibc_unlikely (elem == NULL)) return NULL; - if (BE (start == 0 && end == 0, 0)) + if (__glibc_unlikely (start == 0 && end == 0)) { postorder (elem, free_tree, NULL); return NULL; } /* Extract "{n,m}" to "...{0,}". */ - if (BE (start > 0, 0)) + if (__glibc_unlikely (start > 0)) { tree = elem; for (i = 2; i <= start; ++i) { elem = duplicate_tree (elem, dfa); tree = create_tree (dfa, tree, elem, CONCAT); - if (BE (elem == NULL || tree == NULL, 0)) + if (__glibc_unlikely (elem == NULL || tree == NULL)) goto parse_dup_op_espace; } @@ -2632,7 +2636,7 @@ /* Duplicate ELEM before it is marked optional. */ elem = duplicate_tree (elem, dfa); - if (BE (elem == NULL, 0)) + if (__glibc_unlikely (elem == NULL)) goto parse_dup_op_espace; old_tree = tree; } @@ -2647,13 +2651,9 @@ tree = create_tree (dfa, elem, NULL, (end == -1 ? OP_DUP_ASTERISK : OP_ALT)); - if (BE (tree == NULL, 0)) + if (__glibc_unlikely (tree == NULL)) goto parse_dup_op_espace; -/* From gnulib's "intprops.h": - True if the arithmetic type T is signed. */ -#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) - /* This loop is actually executed only when end != -1, to rewrite {0,n} as ((...?)?)?... We have already created the start+1-th copy. */ @@ -2662,11 +2662,11 @@ { elem = duplicate_tree (elem, dfa); tree = create_tree (dfa, tree, elem, CONCAT); - if (BE (elem == NULL || tree == NULL, 0)) + if (__glibc_unlikely (elem == NULL || tree == NULL)) goto parse_dup_op_espace; tree = create_tree (dfa, tree, NULL, OP_ALT); - if (BE (tree == NULL, 0)) + if (__glibc_unlikely (tree == NULL)) goto parse_dup_op_espace; } @@ -2688,15 +2688,14 @@ # ifdef RE_ENABLE_I18N /* Convert the byte B to the corresponding wide character. In a - unibyte locale, treat B as itself if it is an encoding error. - In a multibyte locale, return WEOF if B is an encoding error. */ + unibyte locale, treat B as itself. In a multibyte locale, return + WEOF if B is an encoding error. */ static wint_t parse_byte (unsigned char b, re_charset_t *mbcset) { - wint_t wc = __btowc (b); - return wc == WEOF && !mbcset ? b : wc; + return mbcset == NULL ? b : __btowc (b); } -#endif +# endif /* Local function for parse_bracket_exp only used in case of NOT _LIBC. Build the range expression which starts from START_ELEM, and ends @@ -2722,17 +2721,18 @@ { unsigned int start_ch, end_ch; /* Equivalence Classes and Character Classes can't be a range start/end. */ - if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS - || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS, - 0)) + if (__glibc_unlikely (start_elem->type == EQUIV_CLASS + || start_elem->type == CHAR_CLASS + || end_elem->type == EQUIV_CLASS + || end_elem->type == CHAR_CLASS)) return REG_ERANGE; /* We can handle no multi character collating elements without libc support. */ - if (BE ((start_elem->type == COLL_SYM - && strlen ((char *) start_elem->opr.name) > 1) - || (end_elem->type == COLL_SYM - && strlen ((char *) end_elem->opr.name) > 1), 0)) + if (__glibc_unlikely ((start_elem->type == COLL_SYM + && strlen ((char *) start_elem->opr.name) > 1) + || (end_elem->type == COLL_SYM + && strlen ((char *) end_elem->opr.name) > 1))) return REG_ECOLLATE; # ifdef RE_ENABLE_I18N @@ -2753,7 +2753,8 @@ ? parse_byte (end_ch, mbcset) : end_elem->opr.wch); if (start_wc == WEOF || end_wc == WEOF) return REG_ECOLLATE; - else if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_wc > end_wc, 0)) + else if (__glibc_unlikely ((syntax & RE_NO_EMPTY_RANGES) + && start_wc > end_wc)) return REG_ERANGE; /* Got valid collation sequence values, add them as a new entry. @@ -2764,7 +2765,7 @@ if (mbcset) { /* Check the space of the arrays. */ - if (BE (*range_alloc == mbcset->nranges, 0)) + if (__glibc_unlikely (*range_alloc == mbcset->nranges)) { /* There is not enough space, need realloc. */ wchar_t *new_array_start, *new_array_end; @@ -2779,7 +2780,8 @@ new_array_end = re_realloc (mbcset->range_ends, wchar_t, new_nranges); - if (BE (new_array_start == NULL || new_array_end == NULL, 0)) + if (__glibc_unlikely (new_array_start == NULL + || new_array_end == NULL)) { re_free (new_array_start); re_free (new_array_end); @@ -2839,7 +2841,7 @@ # endif /* not RE_ENABLE_I18N */ { size_t name_len = strlen ((const char *) name); - if (BE (name_len != 1, 0)) + if (__glibc_unlikely (name_len != 1)) return REG_ECOLLATE; else { @@ -2974,18 +2976,21 @@ /* Equivalence Classes and Character Classes can't be a range start/end. */ - if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS - || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS, - 0)) + if (__glibc_unlikely (start_elem->type == EQUIV_CLASS + || start_elem->type == CHAR_CLASS + || end_elem->type == EQUIV_CLASS + || end_elem->type == CHAR_CLASS)) return REG_ERANGE; /* FIXME: Implement rational ranges here, too. */ start_collseq = lookup_collation_sequence_value (start_elem); end_collseq = lookup_collation_sequence_value (end_elem); /* Check start/end collation sequence values. */ - if (BE (start_collseq == UINT_MAX || end_collseq == UINT_MAX, 0)) + if (__glibc_unlikely (start_collseq == UINT_MAX + || end_collseq == UINT_MAX)) return REG_ECOLLATE; - if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_collseq > end_collseq, 0)) + if (__glibc_unlikely ((syntax & RE_NO_EMPTY_RANGES) + && start_collseq > end_collseq)) return REG_ERANGE; /* Got valid collation sequence values, add them as a new entry. @@ -2995,7 +3000,7 @@ if (nrules > 0 || dfa->mb_cur_max > 1) { /* Check the space of the arrays. */ - if (BE (*range_alloc == mbcset->nranges, 0)) + if (__glibc_unlikely (*range_alloc == mbcset->nranges)) { /* There is not enough space, need realloc. */ uint32_t *new_array_start; @@ -3009,7 +3014,8 @@ new_array_end = re_realloc (mbcset->range_ends, uint32_t, new_nranges); - if (BE (new_array_start == NULL || new_array_end == NULL, 0)) + if (__glibc_unlikely (new_array_start == NULL + || new_array_end == NULL)) return REG_ESPACE; mbcset->range_starts = new_array_start; @@ -3073,7 +3079,7 @@ /* Got valid collation sequence, add it as a new entry. */ /* Check the space of the arrays. */ - if (BE (*coll_sym_alloc == mbcset->ncoll_syms, 0)) + if (__glibc_unlikely (*coll_sym_alloc == mbcset->ncoll_syms)) { /* Not enough, realloc it. */ /* +1 in case of mbcset->ncoll_syms is 0. */ @@ -3082,7 +3088,7 @@ if *alloc == 0. */ int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t, new_coll_sym_alloc); - if (BE (new_coll_syms == NULL, 0)) + if (__glibc_unlikely (new_coll_syms == NULL)) return REG_ESPACE; mbcset->coll_syms = new_coll_syms; *coll_sym_alloc = new_coll_sym_alloc; @@ -3092,7 +3098,7 @@ } else { - if (BE (name_len != 1, 0)) + if (__glibc_unlikely (name_len != 1)) return REG_ECOLLATE; else { @@ -3136,9 +3142,9 @@ mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1); #endif /* RE_ENABLE_I18N */ #ifdef RE_ENABLE_I18N - if (BE (sbcset == NULL || mbcset == NULL, 0)) + if (__glibc_unlikely (sbcset == NULL || mbcset == NULL)) #else - if (BE (sbcset == NULL, 0)) + if (__glibc_unlikely (sbcset == NULL)) #endif /* RE_ENABLE_I18N */ { re_free (sbcset); @@ -3150,7 +3156,7 @@ } token_len = peek_token_bracket (token, regexp, syntax); - if (BE (token->type == END_OF_RE, 0)) + if (__glibc_unlikely (token->type == END_OF_RE)) { *err = REG_BADPAT; goto parse_bracket_exp_free_return; @@ -3165,7 +3171,7 @@ bitset_set (sbcset, '\n'); re_string_skip_bytes (regexp, token_len); /* Skip a token. */ token_len = peek_token_bracket (token, regexp, syntax); - if (BE (token->type == END_OF_RE, 0)) + if (__glibc_unlikely (token->type == END_OF_RE)) { *err = REG_BADPAT; goto parse_bracket_exp_free_return; @@ -3190,7 +3196,7 @@ start_elem.type = COLL_SYM; ret = parse_bracket_element (&start_elem, regexp, token, token_len, dfa, syntax, first_round); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) { *err = ret; goto parse_bracket_exp_free_return; @@ -3203,7 +3209,7 @@ /* Do not check for ranges if we know they are not allowed. */ if (start_elem.type != CHAR_CLASS && start_elem.type != EQUIV_CLASS) { - if (BE (token->type == END_OF_RE, 0)) + if (__glibc_unlikely (token->type == END_OF_RE)) { *err = REG_EBRACK; goto parse_bracket_exp_free_return; @@ -3212,7 +3218,7 @@ { re_string_skip_bytes (regexp, token_len); /* Skip '-'. */ token_len2 = peek_token_bracket (&token2, regexp, syntax); - if (BE (token2.type == END_OF_RE, 0)) + if (__glibc_unlikely (token2.type == END_OF_RE)) { *err = REG_EBRACK; goto parse_bracket_exp_free_return; @@ -3234,7 +3240,7 @@ end_elem.type = COLL_SYM; ret = parse_bracket_element (&end_elem, regexp, &token2, token_len2, dfa, syntax, true); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) { *err = ret; goto parse_bracket_exp_free_return; @@ -3254,7 +3260,7 @@ *err = build_range_exp (syntax, sbcset, &start_elem, &end_elem); # endif #endif /* RE_ENABLE_I18N */ - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) goto parse_bracket_exp_free_return; } else @@ -3267,7 +3273,7 @@ #ifdef RE_ENABLE_I18N case MB_CHAR: /* Check whether the array has enough space. */ - if (BE (mbchar_alloc == mbcset->nmbchars, 0)) + if (__glibc_unlikely (mbchar_alloc == mbcset->nmbchars)) { wchar_t *new_mbchars; /* Not enough, realloc it. */ @@ -3276,7 +3282,7 @@ /* Use realloc since array is NULL if *alloc == 0. */ new_mbchars = re_realloc (mbcset->mbchars, wchar_t, mbchar_alloc); - if (BE (new_mbchars == NULL, 0)) + if (__glibc_unlikely (new_mbchars == NULL)) goto parse_bracket_exp_espace; mbcset->mbchars = new_mbchars; } @@ -3289,7 +3295,7 @@ mbcset, &equiv_class_alloc, #endif /* RE_ENABLE_I18N */ start_elem.opr.name); - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) goto parse_bracket_exp_free_return; break; case COLL_SYM: @@ -3298,7 +3304,7 @@ mbcset, &coll_sym_alloc, #endif /* RE_ENABLE_I18N */ start_elem.opr.name); - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) goto parse_bracket_exp_free_return; break; case CHAR_CLASS: @@ -3308,7 +3314,7 @@ #endif /* RE_ENABLE_I18N */ (const char *) start_elem.opr.name, syntax); - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) goto parse_bracket_exp_free_return; break; default: @@ -3316,7 +3322,7 @@ break; } } - if (BE (token->type == END_OF_RE, 0)) + if (__glibc_unlikely (token->type == END_OF_RE)) { *err = REG_EBRACK; goto parse_bracket_exp_free_return; @@ -3347,7 +3353,7 @@ br_token.type = COMPLEX_BRACKET; br_token.opr.mbcset = mbcset; mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token); - if (BE (mbc_tree == NULL, 0)) + if (__glibc_unlikely (mbc_tree == NULL)) goto parse_bracket_exp_espace; for (sbc_idx = 0; sbc_idx < BITSET_WORDS; ++sbc_idx) if (sbcset[sbc_idx]) @@ -3360,12 +3366,12 @@ br_token.type = SIMPLE_BRACKET; br_token.opr.sbcset = sbcset; work_tree = create_token_tree (dfa, NULL, NULL, &br_token); - if (BE (work_tree == NULL, 0)) + if (__glibc_unlikely (work_tree == NULL)) goto parse_bracket_exp_espace; /* Then join them by ALT node. */ work_tree = create_tree (dfa, work_tree, mbc_tree, OP_ALT); - if (BE (work_tree == NULL, 0)) + if (__glibc_unlikely (work_tree == NULL)) goto parse_bracket_exp_espace; } else @@ -3384,7 +3390,7 @@ br_token.type = SIMPLE_BRACKET; br_token.opr.sbcset = sbcset; work_tree = create_token_tree (dfa, NULL, NULL, &br_token); - if (BE (work_tree == NULL, 0)) + if (__glibc_unlikely (work_tree == NULL)) goto parse_bracket_exp_espace; } return work_tree; @@ -3421,7 +3427,7 @@ if (token->type == OP_OPEN_COLL_ELEM || token->type == OP_OPEN_CHAR_CLASS || token->type == OP_OPEN_EQUIV_CLASS) return parse_bracket_symbol (elem, regexp, token); - if (BE (token->type == OP_CHARSET_RANGE, 0) && !accept_hyphen) + if (__glibc_unlikely (token->type == OP_CHARSET_RANGE) && !accept_hyphen) { /* A '-' must only appear as anything but a range indicator before the closing bracket. Everything else is an error. */ @@ -3516,7 +3522,7 @@ indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB); idx1 = findidx (table, indirect, extra, &cp, -1); - if (BE (idx1 == 0 || *cp != '\0', 0)) + if (__glibc_unlikely (idx1 == 0 || *cp != '\0')) /* This isn't a valid character. */ return REG_ECOLLATE; @@ -3535,21 +3541,13 @@ continue; /* Compare only if the length matches and the collation rule index is the same. */ - if (len == weights[idx2 & 0xffffff] && (idx1 >> 24) == (idx2 >> 24)) - { - int cnt = 0; - - while (cnt <= len && - weights[(idx1 & 0xffffff) + 1 + cnt] - == weights[(idx2 & 0xffffff) + 1 + cnt]) - ++cnt; - - if (cnt > len) - bitset_set (sbcset, ch); - } + if (len == weights[idx2 & 0xffffff] && (idx1 >> 24) == (idx2 >> 24) + && memcmp (weights + (idx1 & 0xffffff) + 1, + weights + (idx2 & 0xffffff) + 1, len) == 0) + bitset_set (sbcset, ch); } /* Check whether the array has enough space. */ - if (BE (*equiv_class_alloc == mbcset->nequiv_classes, 0)) + if (__glibc_unlikely (*equiv_class_alloc == mbcset->nequiv_classes)) { /* Not enough, realloc it. */ /* +1 in case of mbcset->nequiv_classes is 0. */ @@ -3558,7 +3556,7 @@ int32_t *new_equiv_classes = re_realloc (mbcset->equiv_classes, int32_t, new_equiv_class_alloc); - if (BE (new_equiv_classes == NULL, 0)) + if (__glibc_unlikely (new_equiv_classes == NULL)) return REG_ESPACE; mbcset->equiv_classes = new_equiv_classes; *equiv_class_alloc = new_equiv_class_alloc; @@ -3568,7 +3566,7 @@ else #endif /* _LIBC */ { - if (BE (strlen ((const char *) name) != 1, 0)) + if (__glibc_unlikely (strlen ((const char *) name) != 1)) return REG_ECOLLATE; bitset_set (sbcset, *name); } @@ -3602,7 +3600,7 @@ #ifdef RE_ENABLE_I18N /* Check the space of the arrays. */ - if (BE (*char_class_alloc == mbcset->nchar_classes, 0)) + if (__glibc_unlikely (*char_class_alloc == mbcset->nchar_classes)) { /* Not enough, realloc it. */ /* +1 in case of mbcset->nchar_classes is 0. */ @@ -3610,7 +3608,7 @@ /* Use realloc since array is NULL if *alloc == 0. */ wctype_t *new_char_classes = re_realloc (mbcset->char_classes, wctype_t, new_char_class_alloc); - if (BE (new_char_classes == NULL, 0)) + if (__glibc_unlikely (new_char_classes == NULL)) return REG_ESPACE; mbcset->char_classes = new_char_classes; *char_class_alloc = new_char_class_alloc; @@ -3620,7 +3618,7 @@ #define BUILD_CHARCLASS_LOOP(ctype_func) \ do { \ - if (BE (trans != NULL, 0)) \ + if (__glibc_unlikely (trans != NULL)) \ { \ for (i = 0; i < SBC_MAX; ++i) \ if (ctype_func (i)) \ @@ -3680,14 +3678,14 @@ bin_tree_t *tree; sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); - if (BE (sbcset == NULL, 0)) + if (__glibc_unlikely (sbcset == NULL)) { *err = REG_ESPACE; return NULL; } #ifdef RE_ENABLE_I18N mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1); - if (BE (mbcset == NULL, 0)) + if (__glibc_unlikely (mbcset == NULL)) { re_free (sbcset); *err = REG_ESPACE; @@ -3703,7 +3701,7 @@ #endif /* RE_ENABLE_I18N */ class_name, 0); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) { re_free (sbcset); #ifdef RE_ENABLE_I18N @@ -3733,7 +3731,7 @@ br_token.type = SIMPLE_BRACKET; br_token.opr.sbcset = sbcset; tree = create_token_tree (dfa, NULL, NULL, &br_token); - if (BE (tree == NULL, 0)) + if (__glibc_unlikely (tree == NULL)) goto build_word_op_espace; #ifdef RE_ENABLE_I18N @@ -3745,11 +3743,11 @@ br_token.opr.mbcset = mbcset; dfa->has_mb_node = 1; mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token); - if (BE (mbc_tree == NULL, 0)) + if (__glibc_unlikely (mbc_tree == NULL)) goto build_word_op_espace; /* Then join them by ALT node. */ tree = create_tree (dfa, tree, mbc_tree, OP_ALT); - if (BE (mbc_tree != NULL, 1)) + if (__glibc_likely (mbc_tree != NULL)) return tree; } else @@ -3785,7 +3783,7 @@ { fetch_token (token, input, syntax); c = token->opr.c; - if (BE (token->type == END_OF_RE, 0)) + if (__glibc_unlikely (token->type == END_OF_RE)) return -2; if (token->type == OP_CLOSE_DUP_NUM || c == ',') break; @@ -3806,9 +3804,9 @@ # ifdef _LIBC re_free (cset->coll_syms); re_free (cset->equiv_classes); +# endif re_free (cset->range_starts); re_free (cset->range_ends); -# endif re_free (cset->char_classes); re_free (cset); } @@ -3835,7 +3833,7 @@ const re_token_t *token) { bin_tree_t *tree; - if (BE (dfa->str_tree_storage_idx == BIN_TREE_STORAGE_SIZE, 0)) + if (__glibc_unlikely (dfa->str_tree_storage_idx == BIN_TREE_STORAGE_SIZE)) { bin_tree_storage_t *storage = re_malloc (bin_tree_storage_t, 1); diff -Nru wget-1.19.5/lib/regex.c wget-1.20.1/lib/regex.c --- wget-1.19.5/lib/regex.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/regex.c 2018-12-26 20:08:19.000000000 +0000 @@ -18,7 +18,7 @@ . */ #ifndef _LIBC -# include +# include # if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__ # pragma GCC diagnostic ignored "-Wsuggest-attribute=pure" diff -Nru wget-1.19.5/lib/regexec.c wget-1.20.1/lib/regexec.c --- wget-1.19.5/lib/regexec.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/regexec.c 2018-12-26 20:08:19.000000000 +0000 @@ -328,9 +328,8 @@ Idx len; char *s = NULL; - if (BE ((length1 < 0 || length2 < 0 || stop < 0 - || INT_ADD_WRAPV (length1, length2, &len)), - 0)) + if (__glibc_unlikely ((length1 < 0 || length2 < 0 || stop < 0 + || INT_ADD_WRAPV (length1, length2, &len)))) return -2; /* Concatenate the strings. */ @@ -339,7 +338,7 @@ { s = re_malloc (char, len); - if (BE (s == NULL, 0)) + if (__glibc_unlikely (s == NULL)) return -2; #ifdef _LIBC memcpy (__mempcpy (s, string1, length1), string2, length2); @@ -379,11 +378,13 @@ Idx last_start = start + range; /* Check for out-of-range. */ - if (BE (start < 0 || start > length, 0)) + if (__glibc_unlikely (start < 0 || start > length)) return -1; - if (BE (length < last_start || (0 <= range && last_start < start), 0)) + if (__glibc_unlikely (length < last_start + || (0 <= range && last_start < start))) last_start = length; - else if (BE (last_start < 0 || (range < 0 && start <= last_start), 0)) + else if (__glibc_unlikely (last_start < 0 + || (range < 0 && start <= last_start))) last_start = 0; lock_lock (dfa->lock); @@ -395,17 +396,17 @@ if (start < last_start && bufp->fastmap != NULL && !bufp->fastmap_accurate) re_compile_fastmap (bufp); - if (BE (bufp->no_sub, 0)) + if (__glibc_unlikely (bufp->no_sub)) regs = NULL; /* We need at least 1 register. */ if (regs == NULL) nregs = 1; - else if (BE (bufp->regs_allocated == REGS_FIXED - && regs->num_regs <= bufp->re_nsub, 0)) + else if (__glibc_unlikely (bufp->regs_allocated == REGS_FIXED + && regs->num_regs <= bufp->re_nsub)) { nregs = regs->num_regs; - if (BE (nregs < 1, 0)) + if (__glibc_unlikely (nregs < 1)) { /* Nothing can be copied to regs. */ regs = NULL; @@ -415,7 +416,7 @@ else nregs = bufp->re_nsub + 1; pmatch = re_malloc (regmatch_t, nregs); - if (BE (pmatch == NULL, 0)) + if (__glibc_unlikely (pmatch == NULL)) { rval = -2; goto out; @@ -434,11 +435,11 @@ /* If caller wants register contents data back, copy them. */ bufp->regs_allocated = re_copy_regs (regs, pmatch, nregs, bufp->regs_allocated); - if (BE (bufp->regs_allocated == REGS_UNALLOCATED, 0)) + if (__glibc_unlikely (bufp->regs_allocated == REGS_UNALLOCATED)) rval = -2; } - if (BE (rval == 0, 1)) + if (__glibc_likely (rval == 0)) { if (ret_len) { @@ -468,10 +469,10 @@ if (regs_allocated == REGS_UNALLOCATED) { /* No. So allocate them with malloc. */ regs->start = re_malloc (regoff_t, need_regs); - if (BE (regs->start == NULL, 0)) + if (__glibc_unlikely (regs->start == NULL)) return REGS_UNALLOCATED; regs->end = re_malloc (regoff_t, need_regs); - if (BE (regs->end == NULL, 0)) + if (__glibc_unlikely (regs->end == NULL)) { re_free (regs->start); return REGS_UNALLOCATED; @@ -482,14 +483,14 @@ { /* Yes. If we need more elements than were already allocated, reallocate them. If we need fewer, just leave it alone. */ - if (BE (need_regs > regs->num_regs, 0)) + if (__glibc_unlikely (need_regs > regs->num_regs)) { regoff_t *new_start = re_realloc (regs->start, regoff_t, need_regs); regoff_t *new_end; - if (BE (new_start == NULL, 0)) + if (__glibc_unlikely (new_start == NULL)) return REGS_UNALLOCATED; new_end = re_realloc (regs->end, regoff_t, need_regs); - if (BE (new_end == NULL, 0)) + if (__glibc_unlikely (new_end == NULL)) { re_free (new_start); return REGS_UNALLOCATED; @@ -615,9 +616,10 @@ nmatch -= extra_nmatch; /* Check if the DFA haven't been compiled. */ - if (BE (preg->used == 0 || dfa->init_state == NULL - || dfa->init_state_word == NULL || dfa->init_state_nl == NULL - || dfa->init_state_begbuf == NULL, 0)) + if (__glibc_unlikely (preg->used == 0 || dfa->init_state == NULL + || dfa->init_state_word == NULL + || dfa->init_state_nl == NULL + || dfa->init_state_begbuf == NULL)) return REG_NOMATCH; #ifdef DEBUG @@ -644,14 +646,14 @@ err = re_string_allocate (&mctx.input, string, length, dfa->nodes_len + 1, preg->translate, (preg->syntax & RE_ICASE) != 0, dfa); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; mctx.input.stop = stop; mctx.input.raw_stop = stop; mctx.input.newline_anchor = preg->newline_anchor; err = match_ctx_init (&mctx, eflags, dfa->nbackref * 2); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; /* We will log all the DFA states through which the dfa pass, @@ -661,15 +663,15 @@ if (nmatch > 1 || dfa->has_mb_node) { /* Avoid overflow. */ - if (BE ((MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) - <= mctx.input.bufs_len), 0)) + if (__glibc_unlikely ((MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) + <= mctx.input.bufs_len))) { err = REG_ESPACE; goto free_return; } mctx.state_log = re_malloc (re_dfastate_t *, mctx.input.bufs_len + 1); - if (BE (mctx.state_log == NULL, 0)) + if (__glibc_unlikely (mctx.state_log == NULL)) { err = REG_ESPACE; goto free_return; @@ -713,19 +715,19 @@ case 7: /* Fastmap with single-byte translation, match forward. */ - while (BE (match_first < right_lim, 1) + while (__glibc_likely (match_first < right_lim) && !fastmap[t[(unsigned char) string[match_first]]]) ++match_first; goto forward_match_found_start_or_reached_end; case 6: /* Fastmap without translation, match forward. */ - while (BE (match_first < right_lim, 1) + while (__glibc_likely (match_first < right_lim) && !fastmap[(unsigned char) string[match_first]]) ++match_first; forward_match_found_start_or_reached_end: - if (BE (match_first == right_lim, 0)) + if (__glibc_unlikely (match_first == right_lim)) { ch = match_first >= length ? 0 : (unsigned char) string[match_first]; @@ -758,11 +760,12 @@ /* If MATCH_FIRST is out of the valid range, reconstruct the buffers. */ __re_size_t offset = match_first - mctx.input.raw_mbs_idx; - if (BE (offset >= (__re_size_t) mctx.input.valid_raw_len, 0)) + if (__glibc_unlikely (offset + >= (__re_size_t) mctx.input.valid_raw_len)) { err = re_string_reconstruct (&mctx.input, match_first, eflags); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; offset = match_first - mctx.input.raw_mbs_idx; @@ -786,7 +789,7 @@ /* Reconstruct the buffers so that the matcher can assume that the matching starts from the beginning of the buffer. */ err = re_string_reconstruct (&mctx.input, match_first, eflags); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; #ifdef RE_ENABLE_I18N @@ -803,7 +806,7 @@ start <= last_start ? &match_first : NULL); if (match_last != -1) { - if (BE (match_last == -2, 0)) + if (__glibc_unlikely (match_last == -2)) { err = REG_ESPACE; goto free_return; @@ -823,7 +826,7 @@ err = prune_impossible_nodes (&mctx); if (err == REG_NOERROR) break; - if (BE (err != REG_NOMATCH, 0)) + if (__glibc_unlikely (err != REG_NOMATCH)) goto free_return; match_last = -1; } @@ -860,7 +863,7 @@ { err = set_regs (preg, &mctx, nmatch, pmatch, dfa->has_plural_match && dfa->nbackref > 0); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; } @@ -871,7 +874,7 @@ if (pmatch[reg_idx].rm_so != -1) { #ifdef RE_ENABLE_I18N - if (BE (mctx.input.offsets_needed != 0, 0)) + if (__glibc_unlikely (mctx.input.offsets_needed != 0)) { pmatch[reg_idx].rm_so = (pmatch[reg_idx].rm_so == mctx.input.valid_len @@ -930,11 +933,12 @@ halt_node = mctx->last_node; /* Avoid overflow. */ - if (BE (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) <= match_last, 0)) + if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) + <= match_last)) return REG_ESPACE; sifted_states = re_malloc (re_dfastate_t *, match_last + 1); - if (BE (sifted_states == NULL, 0)) + if (__glibc_unlikely (sifted_states == NULL)) { ret = REG_ESPACE; goto free_return; @@ -942,7 +946,7 @@ if (dfa->nbackref) { lim_states = re_malloc (re_dfastate_t *, match_last + 1); - if (BE (lim_states == NULL, 0)) + if (__glibc_unlikely (lim_states == NULL)) { ret = REG_ESPACE; goto free_return; @@ -955,7 +959,7 @@ match_last); ret = sift_states_backward (mctx, &sctx); re_node_set_free (&sctx.limits); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) goto free_return; if (sifted_states[0] != NULL || lim_states[0] != NULL) break; @@ -977,7 +981,7 @@ match_last + 1); re_free (lim_states); lim_states = NULL; - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) goto free_return; } else @@ -985,7 +989,7 @@ sift_ctx_init (&sctx, sifted_states, lim_states, halt_node, match_last); ret = sift_states_backward (mctx, &sctx); re_node_set_free (&sctx.limits); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) goto free_return; if (sifted_states[0] == NULL) { @@ -1068,7 +1072,7 @@ err = REG_NOERROR; cur_state = acquire_init_state_context (&err, mctx, cur_str_idx); /* An initial state must not be NULL (invalid). */ - if (BE (cur_state == NULL, 0)) + if (__glibc_unlikely (cur_state == NULL)) { assert (err == REG_ESPACE); return -2; @@ -1080,24 +1084,24 @@ /* Check OP_OPEN_SUBEXP in the initial state in case that we use them later. E.g. Processing back references. */ - if (BE (dfa->nbackref, 0)) + if (__glibc_unlikely (dfa->nbackref)) { at_init_state = false; err = check_subexp_matching_top (mctx, &cur_state->nodes, 0); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; if (cur_state->has_backref) { err = transit_state_bkref (mctx, &cur_state->nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } } } /* If the RE accepts NULL string. */ - if (BE (cur_state->halt, 0)) + if (__glibc_unlikely (cur_state->halt)) { if (!cur_state->has_constraint || check_halt_state_context (mctx, cur_state, cur_str_idx)) @@ -1117,13 +1121,13 @@ re_dfastate_t *old_state = cur_state; Idx next_char_idx = re_string_cur_idx (&mctx->input) + 1; - if ((BE (next_char_idx >= mctx->input.bufs_len, 0) + if ((__glibc_unlikely (next_char_idx >= mctx->input.bufs_len) && mctx->input.bufs_len < mctx->input.len) - || (BE (next_char_idx >= mctx->input.valid_len, 0) + || (__glibc_unlikely (next_char_idx >= mctx->input.valid_len) && mctx->input.valid_len < mctx->input.len)) { err = extend_buffers (mctx, next_char_idx + 1); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { assert (err == REG_ESPACE); return -2; @@ -1139,7 +1143,7 @@ /* Reached the invalid state or an error. Try to recover a valid state using the state log, if available and if we have not already found a valid (even if not the longest) match. */ - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return -2; if (mctx->state_log == NULL @@ -1148,7 +1152,7 @@ break; } - if (BE (at_init_state, 0)) + if (__glibc_unlikely (at_init_state)) { if (old_state == cur_state) next_start_idx = next_char_idx; @@ -1237,7 +1241,7 @@ re_node_set *edests = &dfa->edests[node]; Idx dest_node; ok = re_node_set_insert (eps_via_nodes, node); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return -2; /* Pick up a valid destination, or return -1 if none is found. */ @@ -1299,7 +1303,7 @@ { Idx dest_node; ok = re_node_set_insert (eps_via_nodes, node); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return -2; dest_node = dfa->edests[node].elems[0]; if (re_node_set_contains (&mctx->state_log[*pidx]->nodes, @@ -1449,9 +1453,9 @@ cur_node = proceed_next_node (mctx, nmatch, pmatch, &idx, cur_node, &eps_via_nodes, fs); - if (BE (cur_node < 0, 0)) + if (__glibc_unlikely (cur_node < 0)) { - if (BE (cur_node == -2, 0)) + if (__glibc_unlikely (cur_node == -2)) { re_node_set_free (&eps_via_nodes); if (prev_idx_match_malloced) @@ -1579,10 +1583,10 @@ /* Build sifted state_log[str_idx]. It has the nodes which can epsilon transit to the last_node and the last_node itself. */ err = re_node_set_init_1 (&cur_dest, sctx->last_node); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; /* Then check each states in the state_log. */ @@ -1603,7 +1607,7 @@ if (mctx->state_log[str_idx]) { err = build_sifted_states (mctx, sctx, str_idx, &cur_dest); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; } @@ -1612,7 +1616,7 @@ - It is in CUR_SRC. And update state_log. */ err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; } err = REG_NOERROR; @@ -1674,7 +1678,7 @@ continue; } ok = re_node_set_insert (cur_dest, prev_node); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; } @@ -1695,7 +1699,7 @@ { reg_errcode_t err; err = extend_buffers (mctx, next_state_log_idx + 1); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } @@ -1723,11 +1727,11 @@ re_node_set merged_set; err = re_node_set_init_union (&merged_set, &dst[st_idx]->nodes, &src[st_idx]->nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; dst[st_idx] = re_acquire_state (&err, dfa, &merged_set); re_node_set_free (&merged_set); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } } @@ -1754,7 +1758,7 @@ /* At first, add the nodes which can epsilon transit to a node in DEST_NODE. */ err = add_epsilon_src_nodes (dfa, dest_nodes, candidates); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; /* Then, check the limitations in the current sift_context. */ @@ -1762,20 +1766,20 @@ { err = check_subexp_limits (dfa, dest_nodes, candidates, &sctx->limits, mctx->bkref_ents, str_idx); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } } sctx->sifted_states[str_idx] = re_acquire_state (&err, dfa, dest_nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } if (candidates && mctx->state_log[str_idx]->has_backref) { err = sift_states_bkref (mctx, sctx, str_idx, candidates); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } return REG_NOERROR; @@ -1790,19 +1794,19 @@ Idx i; re_dfastate_t *state = re_acquire_state (&err, dfa, dest_nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; if (!state->inveclosure.alloc) { err = re_node_set_alloc (&state->inveclosure, dest_nodes->nelem); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return REG_ESPACE; for (i = 0; i < dest_nodes->nelem; i++) { err = re_node_set_merge (&state->inveclosure, dfa->inveclosures + dest_nodes->elems[i]); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return REG_ESPACE; } } @@ -1837,7 +1841,7 @@ { err = re_node_set_add_intersect (&except_nodes, candidates, dfa->inveclosures + cur_node); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&except_nodes); return err; @@ -2043,7 +2047,7 @@ { err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes, candidates); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } @@ -2061,7 +2065,7 @@ Remove it form the current sifted state. */ err = sub_epsilon_src_nodes (dfa, node, dest_nodes, candidates); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; --node_idx; } @@ -2081,7 +2085,7 @@ Remove it form the current sifted state. */ err = sub_epsilon_src_nodes (dfa, node, dest_nodes, candidates); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } } @@ -2147,27 +2151,27 @@ { local_sctx = *sctx; err = re_node_set_init_copy (&local_sctx.limits, &sctx->limits); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; } local_sctx.last_node = node; local_sctx.last_str_idx = str_idx; ok = re_node_set_insert (&local_sctx.limits, enabled_idx); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) { err = REG_ESPACE; goto free_return; } cur_state = local_sctx.sifted_states[str_idx]; err = sift_states_backward (mctx, &local_sctx); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; if (sctx->limited_states != NULL) { err = merge_state_array (dfa, sctx->limited_states, local_sctx.sifted_states, str_idx + 1); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; } local_sctx.sifted_states[str_idx] = cur_state; @@ -2229,10 +2233,10 @@ #ifdef RE_ENABLE_I18N /* If the current state can accept multibyte. */ - if (BE (state->accept_mb, 0)) + if (__glibc_unlikely (state->accept_mb)) { *err = transit_state_mb (mctx, state); - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) return NULL; } #endif /* RE_ENABLE_I18N */ @@ -2249,11 +2253,11 @@ for (;;) { trtable = state->trtable; - if (BE (trtable != NULL, 1)) + if (__glibc_likely (trtable != NULL)) return trtable[ch]; trtable = state->word_trtable; - if (BE (trtable != NULL, 1)) + if (__glibc_likely (trtable != NULL)) { unsigned int context; context @@ -2309,7 +2313,7 @@ table_nodes = next_state->entrance_nodes; *err = re_node_set_init_union (&next_nodes, table_nodes, log_nodes); - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) return NULL; } else @@ -2329,21 +2333,21 @@ re_node_set_free (&next_nodes); } - if (BE (dfa->nbackref, 0) && next_state != NULL) + if (__glibc_unlikely (dfa->nbackref) && next_state != NULL) { /* Check OP_OPEN_SUBEXP in the current state in case that we use them later. We must check them here, since the back references in the next state might use them. */ *err = check_subexp_matching_top (mctx, &next_state->nodes, cur_idx); - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) return NULL; /* If the next state has back references. */ if (next_state->has_backref) { *err = transit_state_bkref (mctx, &next_state->nodes); - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) return NULL; next_state = mctx->state_log[cur_idx]; } @@ -2407,7 +2411,7 @@ & ((bitset_word_t) 1 << dfa->nodes[node].opr.idx))) { err = match_ctx_add_subtop (mctx, node, str_idx); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } } @@ -2429,7 +2433,7 @@ unsigned int context; *err = re_node_set_alloc (&next_nodes, state->nodes.nelem + 1); - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) return NULL; for (node_cnt = 0; node_cnt < state->nodes.nelem; ++node_cnt) { @@ -2438,7 +2442,7 @@ { *err = re_node_set_merge (&next_nodes, dfa->eclosures + dfa->nexts[cur_node]); - if (BE (*err != REG_NOERROR, 0)) + if (__glibc_unlikely (*err != REG_NOERROR)) { re_node_set_free (&next_nodes); return NULL; @@ -2497,7 +2501,7 @@ mctx->max_mb_elem_len = ((mctx->max_mb_elem_len < naccepted) ? naccepted : mctx->max_mb_elem_len); err = clean_state_log_if_needed (mctx, dest_idx); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; #ifdef DEBUG assert (dfa->nexts[cur_node_idx] != -1); @@ -2511,7 +2515,7 @@ { err = re_node_set_init_union (&dest_nodes, dest_state->entrance_nodes, new_nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } context = re_string_context_at (&mctx->input, dest_idx - 1, @@ -2520,7 +2524,8 @@ = re_acquire_state_context (&err, dfa, &dest_nodes, context); if (dest_state != NULL) re_node_set_free (&dest_nodes); - if (BE (mctx->state_log[dest_idx] == NULL && err != REG_NOERROR, 0)) + if (__glibc_unlikely (mctx->state_log[dest_idx] == NULL + && err != REG_NOERROR)) return err; } return REG_NOERROR; @@ -2559,7 +2564,7 @@ Check the substring which the substring matched. */ bkc_idx = mctx->nbkref_ents; err = get_subexp (mctx, node_idx, cur_str_idx); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; /* And add the epsilon closures (which is 'new_dest_nodes') of @@ -2592,8 +2597,8 @@ mctx->state_log[dest_str_idx] = re_acquire_state_context (&err, dfa, new_dest_nodes, context); - if (BE (mctx->state_log[dest_str_idx] == NULL - && err != REG_NOERROR, 0)) + if (__glibc_unlikely (mctx->state_log[dest_str_idx] == NULL + && err != REG_NOERROR)) goto free_return; } else @@ -2602,7 +2607,7 @@ err = re_node_set_init_union (&dest_nodes, dest_state->entrance_nodes, new_dest_nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&dest_nodes); goto free_return; @@ -2610,8 +2615,8 @@ mctx->state_log[dest_str_idx] = re_acquire_state_context (&err, dfa, &dest_nodes, context); re_node_set_free (&dest_nodes); - if (BE (mctx->state_log[dest_str_idx] == NULL - && err != REG_NOERROR, 0)) + if (__glibc_unlikely (mctx->state_log[dest_str_idx] == NULL + && err != REG_NOERROR)) goto free_return; } /* We need to check recursively if the backreference can epsilon @@ -2621,10 +2626,10 @@ { err = check_subexp_matching_top (mctx, new_dest_nodes, cur_str_idx); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; err = transit_state_bkref (mctx, new_dest_nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto free_return; } } @@ -2685,7 +2690,8 @@ at the back reference? */ if (sl_str_diff > 0) { - if (BE (bkref_str_off + sl_str_diff > mctx->input.valid_len, 0)) + if (__glibc_unlikely (bkref_str_off + sl_str_diff + > mctx->input.valid_len)) { /* Not enough chars for a successful match. */ if (bkref_str_off + sl_str_diff > mctx->input.len) @@ -2694,7 +2700,7 @@ err = clean_state_log_if_needed (mctx, bkref_str_off + sl_str_diff); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; buf = (const char *) re_string_get_buffer (&mctx->input); } @@ -2713,7 +2719,7 @@ if (err == REG_NOMATCH) continue; - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } @@ -2732,14 +2738,14 @@ at the back reference? */ if (sl_str_off > 0) { - if (BE (bkref_str_off >= mctx->input.valid_len, 0)) + if (__glibc_unlikely (bkref_str_off >= mctx->input.valid_len)) { /* If we are at the end of the input, we cannot match. */ if (bkref_str_off >= mctx->input.len) break; err = extend_buffers (mctx, bkref_str_off + 1); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; buf = (const char *) re_string_get_buffer (&mctx->input); @@ -2770,10 +2776,10 @@ OP_CLOSE_SUBEXP); if (err == REG_NOMATCH) continue; - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; sub_last = match_ctx_add_sublast (sub_top, cls_node, sl_str); - if (BE (sub_last == NULL, 0)) + if (__glibc_unlikely (sub_last == NULL)) return REG_ESPACE; err = get_subexp_sub (mctx, sub_top, sub_last, bkref_node, bkref_str_idx); @@ -2804,7 +2810,7 @@ return err; err = match_ctx_add_entry (mctx, bkref_node, bkref_str, sub_top->str_idx, sub_last->str_idx); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; to_idx = bkref_str + sub_last->str_idx - sub_top->str_idx; return clean_state_log_if_needed (mctx, to_idx); @@ -2854,19 +2860,19 @@ subexp_num = dfa->nodes[top_node].opr.idx; /* Extend the buffer if we need. */ - if (BE (path->alloc < last_str + mctx->max_mb_elem_len + 1, 0)) + if (__glibc_unlikely (path->alloc < last_str + mctx->max_mb_elem_len + 1)) { re_dfastate_t **new_array; Idx old_alloc = path->alloc; Idx incr_alloc = last_str + mctx->max_mb_elem_len + 1; Idx new_alloc; - if (BE (IDX_MAX - old_alloc < incr_alloc, 0)) + if (__glibc_unlikely (IDX_MAX - old_alloc < incr_alloc)) return REG_ESPACE; new_alloc = old_alloc + incr_alloc; - if (BE (SIZE_MAX / sizeof (re_dfastate_t *) < new_alloc, 0)) + if (__glibc_unlikely (SIZE_MAX / sizeof (re_dfastate_t *) < new_alloc)) return REG_ESPACE; new_array = re_realloc (path->array, re_dfastate_t *, new_alloc); - if (BE (new_array == NULL, 0)) + if (__glibc_unlikely (new_array == NULL)) return REG_ESPACE; path->array = new_array; path->alloc = new_alloc; @@ -2887,10 +2893,10 @@ if (str_idx == top_str) { err = re_node_set_init_1 (&next_nodes, top_node); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&next_nodes); return err; @@ -2902,7 +2908,7 @@ if (cur_state && cur_state->has_backref) { err = re_node_set_init_copy (&next_nodes, &cur_state->nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } else @@ -2914,14 +2920,14 @@ { err = expand_bkref_cache (mctx, &next_nodes, str_idx, subexp_num, type); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&next_nodes); return err; } } cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context); - if (BE (cur_state == NULL && err != REG_NOERROR, 0)) + if (__glibc_unlikely (cur_state == NULL && err != REG_NOERROR)) { re_node_set_free (&next_nodes); return err; @@ -2936,7 +2942,7 @@ { err = re_node_set_merge (&next_nodes, &mctx->state_log[str_idx + 1]->nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&next_nodes); return err; @@ -2947,7 +2953,7 @@ err = check_arrival_add_next_nodes (mctx, str_idx, &cur_state->non_eps_nodes, &next_nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&next_nodes); return err; @@ -2957,14 +2963,14 @@ if (next_nodes.nelem) { err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&next_nodes); return err; } err = expand_bkref_cache (mctx, &next_nodes, str_idx, subexp_num, type); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&next_nodes); return err; @@ -2972,7 +2978,7 @@ } context = re_string_context_at (&mctx->input, str_idx - 1, mctx->eflags); cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context); - if (BE (cur_state == NULL && err != REG_NOERROR, 0)) + if (__glibc_unlikely (cur_state == NULL && err != REG_NOERROR)) { re_node_set_free (&next_nodes); return err; @@ -3041,22 +3047,22 @@ if (dest_state) { err = re_node_set_merge (&union_set, &dest_state->nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&union_set); return err; } } ok = re_node_set_insert (&union_set, next_node); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) { re_node_set_free (&union_set); return REG_ESPACE; } mctx->state_log[next_idx] = re_acquire_state (&err, dfa, &union_set); - if (BE (mctx->state_log[next_idx] == NULL - && err != REG_NOERROR, 0)) + if (__glibc_unlikely (mctx->state_log[next_idx] == NULL + && err != REG_NOERROR)) { re_node_set_free (&union_set); return err; @@ -3068,7 +3074,7 @@ || check_node_accept (mctx, dfa->nodes + cur_node, str_idx)) { ok = re_node_set_insert (next_nodes, dfa->nexts[cur_node]); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) { re_node_set_free (&union_set); return REG_ESPACE; @@ -3096,7 +3102,7 @@ assert (cur_nodes->nelem); #endif err = re_node_set_alloc (&new_nodes, cur_nodes->nelem); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; /* Create a new node set NEW_NODES with the nodes which are epsilon closures of the node in CUR_NODES. */ @@ -3110,7 +3116,7 @@ { /* There are no problematic nodes, just merge them. */ err = re_node_set_merge (&new_nodes, eclosure); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&new_nodes); return err; @@ -3121,7 +3127,7 @@ /* There are problematic nodes, re-calculate incrementally. */ err = check_arrival_expand_ecl_sub (dfa, &new_nodes, cur_node, ex_subexp, type); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_node_set_free (&new_nodes); return err; @@ -3153,13 +3159,13 @@ if (type == OP_CLOSE_SUBEXP) { ok = re_node_set_insert (dst_nodes, cur_node); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; } break; } ok = re_node_set_insert (dst_nodes, cur_node); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) return REG_ESPACE; if (dfa->edests[cur_node].nelem == 0) break; @@ -3169,7 +3175,7 @@ err = check_arrival_expand_ecl_sub (dfa, dst_nodes, dfa->edests[cur_node].elems[1], ex_subexp, type); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } cur_node = dfa->edests[cur_node].elems[0]; @@ -3221,8 +3227,8 @@ err2 = check_arrival_expand_ecl (dfa, &new_dests, subexp_num, type); err3 = re_node_set_merge (cur_nodes, &new_dests); re_node_set_free (&new_dests); - if (BE (err != REG_NOERROR || err2 != REG_NOERROR - || err3 != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR || err2 != REG_NOERROR + || err3 != REG_NOERROR)) { err = (err != REG_NOERROR ? err : (err2 != REG_NOERROR ? err2 : err3)); @@ -3244,7 +3250,7 @@ err = re_node_set_init_copy (&union_set, &mctx->state_log[to_idx]->nodes); ok = re_node_set_insert (&union_set, next_node); - if (BE (err != REG_NOERROR || ! ok, 0)) + if (__glibc_unlikely (err != REG_NOERROR || ! ok)) { re_node_set_free (&union_set); err = err != REG_NOERROR ? err : REG_ESPACE; @@ -3254,13 +3260,13 @@ else { err = re_node_set_init_1 (&union_set, next_node); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return err; } mctx->state_log[to_idx] = re_acquire_state (&err, dfa, &union_set); re_node_set_free (&union_set); - if (BE (mctx->state_log[to_idx] == NULL - && err != REG_NOERROR, 0)) + if (__glibc_unlikely (mctx->state_log[to_idx] == NULL + && err != REG_NOERROR)) return err; } } @@ -3303,7 +3309,7 @@ else { dests_alloc = re_malloc (struct dests_alloc, 1); - if (BE (dests_alloc == NULL, 0)) + if (__glibc_unlikely (dests_alloc == NULL)) return false; dests_node_malloced = true; } @@ -3316,7 +3322,7 @@ /* At first, group all nodes belonging to 'state' into several destinations. */ ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch); - if (BE (ndests <= 0, 0)) + if (__glibc_unlikely (ndests <= 0)) { if (dests_node_malloced) re_free (dests_alloc); @@ -3325,7 +3331,7 @@ { state->trtable = (re_dfastate_t **) calloc (sizeof (re_dfastate_t *), SBC_MAX); - if (BE (state->trtable == NULL, 0)) + if (__glibc_unlikely (state->trtable == NULL)) return false; return true; } @@ -3333,14 +3339,14 @@ } err = re_node_set_alloc (&follows, ndests + 1); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto out_free; /* Avoid arithmetic overflow in size calculation. */ - if (BE ((((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX) - / (3 * sizeof (re_dfastate_t *))) - < ndests), - 0)) + size_t ndests_max + = ((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX) + / (3 * sizeof (re_dfastate_t *))); + if (__glibc_unlikely (ndests_max < ndests)) goto out_free; if (__libc_use_alloca ((sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX @@ -3350,7 +3356,7 @@ else { dest_states = re_malloc (re_dfastate_t *, ndests * 3); - if (BE (dest_states == NULL, 0)) + if (__glibc_unlikely (dest_states == NULL)) { out_free: if (dest_states_malloced) @@ -3380,12 +3386,12 @@ if (next_node != -1) { err = re_node_set_merge (&follows, dfa->eclosures + next_node); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto out_free; } } dest_states[i] = re_acquire_state_context (&err, dfa, &follows, 0); - if (BE (dest_states[i] == NULL && err != REG_NOERROR, 0)) + if (__glibc_unlikely (dest_states[i] == NULL && err != REG_NOERROR)) goto out_free; /* If the new state has context constraint, build appropriate states for these contexts. */ @@ -3393,7 +3399,8 @@ { dest_states_word[i] = re_acquire_state_context (&err, dfa, &follows, CONTEXT_WORD); - if (BE (dest_states_word[i] == NULL && err != REG_NOERROR, 0)) + if (__glibc_unlikely (dest_states_word[i] == NULL + && err != REG_NOERROR)) goto out_free; if (dest_states[i] != dest_states_word[i] && dfa->mb_cur_max > 1) @@ -3401,7 +3408,7 @@ dest_states_nl[i] = re_acquire_state_context (&err, dfa, &follows, CONTEXT_NEWLINE); - if (BE (dest_states_nl[i] == NULL && err != REG_NOERROR, 0)) + if (__glibc_unlikely (dest_states_nl[i] == NULL && err != REG_NOERROR)) goto out_free; } else @@ -3412,7 +3419,7 @@ bitset_merge (acceptable, dests_ch[i]); } - if (!BE (need_word_trtable, 0)) + if (!__glibc_unlikely (need_word_trtable)) { /* We don't care about whether the following character is a word character, or we are in a single-byte character set so we can @@ -3420,7 +3427,7 @@ 256-entry transition table. */ trtable = state->trtable = (re_dfastate_t **) calloc (sizeof (re_dfastate_t *), SBC_MAX); - if (BE (trtable == NULL, 0)) + if (__glibc_unlikely (trtable == NULL)) goto out_free; /* For all characters ch...: */ @@ -3428,7 +3435,7 @@ for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1; elem; mask <<= 1, elem >>= 1, ++ch) - if (BE (elem & 1, 0)) + if (__glibc_unlikely (elem & 1)) { /* There must be exactly one destination which accepts character ch. See group_nodes_into_DFAstates. */ @@ -3451,7 +3458,7 @@ starting at trtable[SBC_MAX]. */ trtable = state->word_trtable = (re_dfastate_t **) calloc (sizeof (re_dfastate_t *), 2 * SBC_MAX); - if (BE (trtable == NULL, 0)) + if (__glibc_unlikely (trtable == NULL)) goto out_free; /* For all characters ch...: */ @@ -3459,7 +3466,7 @@ for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1; elem; mask <<= 1, elem >>= 1, ++ch) - if (BE (elem & 1, 0)) + if (__glibc_unlikely (elem & 1)) { /* There must be exactly one destination which accepts character ch. See group_nodes_into_DFAstates. */ @@ -3658,14 +3665,14 @@ bitset_copy (dests_ch[ndests], remains); bitset_copy (dests_ch[j], intersec); err = re_node_set_init_copy (dests_node + ndests, &dests_node[j]); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto error_return; ++ndests; } /* Put the position in the current group. */ ok = re_node_set_insert (&dests_node[j], cur_nodes->elems[i]); - if (BE (! ok, 0)) + if (__glibc_unlikely (! ok)) goto error_return; /* If all characters are consumed, go to next node. */ @@ -3677,7 +3684,7 @@ { bitset_copy (dests_ch[ndests], accepts); err = re_node_set_init_1 (dests_node + ndests, cur_nodes->elems[i]); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) goto error_return; ++ndests; bitset_empty (accepts); @@ -3711,10 +3718,10 @@ int char_len, elem_len; Idx i; - if (BE (node->type == OP_UTF8_PERIOD, 0)) + if (__glibc_unlikely (node->type == OP_UTF8_PERIOD)) { unsigned char c = re_string_byte_at (input, str_idx), d; - if (BE (c < 0xc2, 1)) + if (__glibc_likely (c < 0xc2)) return 0; if (str_idx + 2 > input->len) @@ -3878,30 +3885,27 @@ indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB); int32_t idx = findidx (table, indirect, extra, &cp, elem_len); + int32_t rule = idx >> 24; + idx &= 0xffffff; if (idx > 0) - for (i = 0; i < cset->nequiv_classes; ++i) - { - int32_t equiv_class_idx = cset->equiv_classes[i]; - size_t weight_len = weights[idx & 0xffffff]; - if (weight_len == weights[equiv_class_idx & 0xffffff] - && (idx >> 24) == (equiv_class_idx >> 24)) - { - Idx cnt = 0; - - idx &= 0xffffff; - equiv_class_idx &= 0xffffff; - - while (cnt <= weight_len - && (weights[equiv_class_idx + 1 + cnt] - == weights[idx + 1 + cnt])) - ++cnt; - if (cnt > weight_len) - { - match_len = elem_len; - goto check_node_accept_bytes_match; - } - } - } + { + size_t weight_len = weights[idx]; + for (i = 0; i < cset->nequiv_classes; ++i) + { + int32_t equiv_class_idx = cset->equiv_classes[i]; + int32_t equiv_class_rule = equiv_class_idx >> 24; + equiv_class_idx &= 0xffffff; + if (weights[equiv_class_idx] == weight_len + && equiv_class_rule == rule + && memcmp (weights + idx + 1, + weights + equiv_class_idx + 1, + weight_len) == 0) + { + match_len = elem_len; + goto check_node_accept_bytes_match; + } + } + } } } else @@ -4052,15 +4056,15 @@ re_string_t *pstr = &mctx->input; /* Avoid overflow. */ - if (BE (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) / 2 - <= pstr->bufs_len, 0)) + if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) / 2 + <= pstr->bufs_len)) return REG_ESPACE; /* Double the lengths of the buffers, but allocate at least MIN_LEN. */ ret = re_string_realloc_buffers (pstr, MAX (min_len, MIN (pstr->len, pstr->bufs_len * 2))); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; if (mctx->state_log != NULL) @@ -4071,7 +4075,7 @@ does not have the right size. */ re_dfastate_t **new_array = re_realloc (mctx->state_log, re_dfastate_t *, pstr->bufs_len + 1); - if (BE (new_array == NULL, 0)) + if (__glibc_unlikely (new_array == NULL)) return REG_ESPACE; mctx->state_log = new_array; } @@ -4083,7 +4087,7 @@ if (pstr->mb_cur_max > 1) { ret = build_wcs_upper_buffer (pstr); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; } else @@ -4122,12 +4126,12 @@ size_t max_object_size = MAX (sizeof (struct re_backref_cache_entry), sizeof (re_sub_match_top_t *)); - if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < n, 0)) + if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / max_object_size) < n)) return REG_ESPACE; mctx->bkref_ents = re_malloc (struct re_backref_cache_entry, n); mctx->sub_tops = re_malloc (re_sub_match_top_t *, n); - if (BE (mctx->bkref_ents == NULL || mctx->sub_tops == NULL, 0)) + if (__glibc_unlikely (mctx->bkref_ents == NULL || mctx->sub_tops == NULL)) return REG_ESPACE; } /* Already zero-ed by the caller. @@ -4198,7 +4202,7 @@ struct re_backref_cache_entry* new_entry; new_entry = re_realloc (mctx->bkref_ents, struct re_backref_cache_entry, mctx->abkref_ents * 2); - if (BE (new_entry == NULL, 0)) + if (__glibc_unlikely (new_entry == NULL)) { re_free (mctx->bkref_ents); return REG_ESPACE; @@ -4267,19 +4271,19 @@ assert (mctx->sub_tops != NULL); assert (mctx->asub_tops > 0); #endif - if (BE (mctx->nsub_tops == mctx->asub_tops, 0)) + if (__glibc_unlikely (mctx->nsub_tops == mctx->asub_tops)) { Idx new_asub_tops = mctx->asub_tops * 2; re_sub_match_top_t **new_array = re_realloc (mctx->sub_tops, re_sub_match_top_t *, new_asub_tops); - if (BE (new_array == NULL, 0)) + if (__glibc_unlikely (new_array == NULL)) return REG_ESPACE; mctx->sub_tops = new_array; mctx->asub_tops = new_asub_tops; } mctx->sub_tops[mctx->nsub_tops] = calloc (1, sizeof (re_sub_match_top_t)); - if (BE (mctx->sub_tops[mctx->nsub_tops] == NULL, 0)) + if (__glibc_unlikely (mctx->sub_tops[mctx->nsub_tops] == NULL)) return REG_ESPACE; mctx->sub_tops[mctx->nsub_tops]->node = node; mctx->sub_tops[mctx->nsub_tops++]->str_idx = str_idx; @@ -4293,19 +4297,19 @@ match_ctx_add_sublast (re_sub_match_top_t *subtop, Idx node, Idx str_idx) { re_sub_match_last_t *new_entry; - if (BE (subtop->nlasts == subtop->alasts, 0)) + if (__glibc_unlikely (subtop->nlasts == subtop->alasts)) { Idx new_alasts = 2 * subtop->alasts + 1; re_sub_match_last_t **new_array = re_realloc (subtop->lasts, re_sub_match_last_t *, new_alasts); - if (BE (new_array == NULL, 0)) + if (__glibc_unlikely (new_array == NULL)) return NULL; subtop->lasts = new_array; subtop->alasts = new_alasts; } new_entry = calloc (1, sizeof (re_sub_match_last_t)); - if (BE (new_entry != NULL, 1)) + if (__glibc_likely (new_entry != NULL)) { subtop->lasts[subtop->nlasts] = new_entry; new_entry->node = node; diff -Nru wget-1.19.5/lib/regex.h wget-1.20.1/lib/regex.h --- wget-1.19.5/lib/regex.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/regex.h 2018-12-26 20:08:19.000000000 +0000 @@ -1,7 +1,6 @@ /* Definitions for data structures and routines for the regular expression library. - Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2018 Free Software - Foundation, Inc. + Copyright (C) 1985, 1989-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -608,28 +607,28 @@ # endif #endif -/* GCC 2.95 and later have "__restrict"; C99 compilers have +/* For plain 'restrict', use glibc's __restrict if defined. + Otherwise, GCC 2.95 and later have "__restrict"; C99 compilers have "restrict", and "configure" may have defined "restrict". Other compilers use __restrict, __restrict__, and _Restrict, and 'configure' might #define 'restrict' to those words, so pick a different name. */ #ifndef _Restrict_ -# if 199901L <= __STDC_VERSION__ -# define _Restrict_ restrict -# elif 2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__) +# if defined __restrict || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) # define _Restrict_ __restrict +# elif 199901L <= __STDC_VERSION__ || defined restrict +# define _Restrict_ restrict # else # define _Restrict_ # endif #endif -/* gcc 3.1 and up support the [restrict] syntax. Don't trust - sys/cdefs.h's definition of __restrict_arr, though, as it - mishandles gcc -ansi -pedantic. */ +/* For [restrict], use glibc's __restrict_arr if available. + Otherwise, GCC 3.1 (not in C++ mode) and C99 support [restrict]. */ #ifndef _Restrict_arr_ -# if ((199901L <= __STDC_VERSION__ \ - || ((3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__)) \ - && !defined __STRICT_ANSI__)) \ - && !defined __GNUG__) +# ifdef __restrict_arr +# define _Restrict_arr_ __restrict_arr +# elif ((199901L <= __STDC_VERSION__ || 3 < __GNUC__ + (1 <= __GNUC_MINOR__)) \ + && !defined __GNUG__) # define _Restrict_arr_ _Restrict_ # else # define _Restrict_arr_ diff -Nru wget-1.19.5/lib/regex_internal.c wget-1.20.1/lib/regex_internal.c --- wget-1.19.5/lib/regex_internal.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/regex_internal.c 2018-12-26 20:08:19.000000000 +0000 @@ -28,6 +28,16 @@ const re_node_set *nodes, unsigned int context, re_hashval_t hash); +static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr, + Idx new_buf_len); +#ifdef RE_ENABLE_I18N +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); +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) __attribute__ ((pure)); /* Functions for string operation. */ @@ -49,7 +59,7 @@ re_string_construct_common (str, len, pstr, trans, icase, dfa); ret = re_string_realloc_buffers (pstr, init_buf_len); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; pstr->word_char = dfa->word_char; @@ -74,7 +84,7 @@ if (len > 0) { ret = re_string_realloc_buffers (pstr, len + 1); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; } pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str; @@ -87,14 +97,14 @@ while (1) { ret = build_wcs_upper_buffer (pstr); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; if (pstr->valid_raw_len >= len) break; if (pstr->bufs_len > pstr->valid_len + dfa->mb_cur_max) break; ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; } } @@ -136,17 +146,18 @@ /* Avoid overflow in realloc. */ const size_t max_object_size = MAX (sizeof (wint_t), sizeof (Idx)); - if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_buf_len, 0)) + if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / max_object_size) + < new_buf_len)) return REG_ESPACE; new_wcs = re_realloc (pstr->wcs, wint_t, new_buf_len); - if (BE (new_wcs == NULL, 0)) + if (__glibc_unlikely (new_wcs == NULL)) return REG_ESPACE; pstr->wcs = new_wcs; if (pstr->offsets != NULL) { Idx *new_offsets = re_realloc (pstr->offsets, Idx, new_buf_len); - if (BE (new_offsets == NULL, 0)) + if (__glibc_unlikely (new_offsets == NULL)) return REG_ESPACE; pstr->offsets = new_offsets; } @@ -156,7 +167,7 @@ { unsigned char *new_mbs = re_realloc (pstr->mbs, unsigned char, new_buf_len); - if (BE (new_mbs == NULL, 0)) + if (__glibc_unlikely (new_mbs == NULL)) return REG_ESPACE; pstr->mbs = new_mbs; } @@ -220,7 +231,7 @@ remain_len = end_idx - byte_idx; prev_st = pstr->cur_state; /* Apply the translation if we need. */ - if (BE (pstr->trans != NULL, 0)) + if (__glibc_unlikely (pstr->trans != NULL)) { int i, ch; @@ -234,17 +245,18 @@ else p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx; mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state); - if (BE (mbclen == (size_t) -1 || mbclen == 0 - || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len), 0)) + if (__glibc_unlikely (mbclen == (size_t) -1 || mbclen == 0 + || (mbclen == (size_t) -2 + && pstr->bufs_len >= pstr->len))) { /* We treat these cases as a singlebyte character. */ mbclen = 1; wc = (wchar_t) pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]; - if (BE (pstr->trans != NULL, 0)) + if (__glibc_unlikely (pstr->trans != NULL)) wc = pstr->trans[wc]; pstr->cur_state = prev_st; } - else if (BE (mbclen == (size_t) -2, 0)) + else if (__glibc_unlikely (mbclen == (size_t) -2)) { /* The buffer doesn't have enough space, finish to build. */ pstr->cur_state = prev_st; @@ -307,7 +319,7 @@ mbclen = __mbrtowc (&wc, ((const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx), remain_len, &pstr->cur_state); - if (BE (mbclen < (size_t) -2, 1)) + if (__glibc_likely (0 < mbclen && mbclen < (size_t) -2)) { wchar_t wcu = __towupper (wc); if (wcu != wc) @@ -315,7 +327,7 @@ size_t mbcdlen; mbcdlen = __wcrtomb (buf, wcu, &prev_st); - if (BE (mbclen == mbcdlen, 1)) + if (__glibc_likely (mbclen == mbcdlen)) memcpy (pstr->mbs + byte_idx, buf, mbclen); else { @@ -340,7 +352,7 @@ pstr->mbs[byte_idx] = ch; /* And also cast it to wide char. */ pstr->wcs[byte_idx++] = (wchar_t) ch; - if (BE (mbclen == (size_t) -1, 0)) + if (__glibc_unlikely (mbclen == (size_t) -1)) pstr->cur_state = prev_st; } else @@ -362,7 +374,7 @@ offsets_needed: remain_len = end_idx - byte_idx; prev_st = pstr->cur_state; - if (BE (pstr->trans != NULL, 0)) + if (__glibc_unlikely (pstr->trans != NULL)) { int i, ch; @@ -376,15 +388,15 @@ else p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + src_idx; mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state); - if (BE (mbclen < (size_t) -2, 1)) + if (__glibc_likely (0 < mbclen && mbclen < (size_t) -2)) { wchar_t wcu = __towupper (wc); if (wcu != wc) { size_t mbcdlen; - mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st); - if (BE (mbclen == mbcdlen, 1)) + mbcdlen = __wcrtomb ((char *) buf, wcu, &prev_st); + if (__glibc_likely (mbclen == mbcdlen)) memcpy (pstr->mbs + byte_idx, buf, mbclen); else if (mbcdlen != (size_t) -1) { @@ -434,7 +446,7 @@ else memcpy (pstr->mbs + byte_idx, p, mbclen); - if (BE (pstr->offsets_needed != 0, 0)) + if (__glibc_unlikely (pstr->offsets_needed != 0)) { size_t i; for (i = 0; i < mbclen; ++i) @@ -453,17 +465,17 @@ /* It is an invalid character or '\0'. Just use the byte. */ int ch = pstr->raw_mbs[pstr->raw_mbs_idx + src_idx]; - if (BE (pstr->trans != NULL, 0)) + if (__glibc_unlikely (pstr->trans != NULL)) ch = pstr->trans [ch]; pstr->mbs[byte_idx] = ch; - if (BE (pstr->offsets_needed != 0, 0)) + if (__glibc_unlikely (pstr->offsets_needed != 0)) pstr->offsets[byte_idx] = src_idx; ++src_idx; /* And also cast it to wide char. */ pstr->wcs[byte_idx++] = (wchar_t) ch; - if (BE (mbclen == (size_t) -1, 0)) + if (__glibc_unlikely (mbclen == (size_t) -1)) pstr->cur_state = prev_st; } else @@ -498,7 +510,8 @@ prev_st = pstr->cur_state; mbclen = __mbrtowc (&wc2, (const char *) pstr->raw_mbs + rawbuf_idx, remain_len, &pstr->cur_state); - if (BE (mbclen == (size_t) -2 || mbclen == (size_t) -1 || mbclen == 0, 0)) + if (__glibc_unlikely (mbclen == (size_t) -2 || mbclen == (size_t) -1 + || mbclen == 0)) { /* We treat these cases as a single byte character. */ if (mbclen == 0 || remain_len == 0) @@ -530,7 +543,7 @@ for (char_idx = pstr->valid_len; char_idx < end_idx; ++char_idx) { int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx]; - if (BE (pstr->trans != NULL, 0)) + if (__glibc_unlikely (pstr->trans != NULL)) ch = pstr->trans[ch]; pstr->mbs[char_idx] = toupper (ch); } @@ -566,7 +579,7 @@ { Idx offset; - if (BE (pstr->raw_mbs_idx <= idx, 0)) + if (__glibc_unlikely (pstr->raw_mbs_idx <= idx)) offset = idx - pstr->raw_mbs_idx; else { @@ -588,14 +601,14 @@ offset = idx; } - if (BE (offset != 0, 1)) + if (__glibc_likely (offset != 0)) { /* Should the already checked characters be kept? */ - if (BE (offset < pstr->valid_raw_len, 1)) + if (__glibc_likely (offset < pstr->valid_raw_len)) { /* Yes, move them to the front of the buffer. */ #ifdef RE_ENABLE_I18N - if (BE (pstr->offsets_needed, 0)) + if (__glibc_unlikely (pstr->offsets_needed)) { Idx low = 0, high = pstr->valid_len, mid; do @@ -667,7 +680,7 @@ memmove (pstr->wcs, pstr->wcs + offset, (pstr->valid_len - offset) * sizeof (wint_t)); #endif /* RE_ENABLE_I18N */ - if (BE (pstr->mbs_allocated, 0)) + if (__glibc_unlikely (pstr->mbs_allocated)) memmove (pstr->mbs, pstr->mbs + offset, pstr->valid_len - offset); pstr->valid_len -= offset; @@ -683,7 +696,7 @@ /* No, skip all characters until IDX. */ Idx prev_valid_len = pstr->valid_len; - if (BE (pstr->offsets_needed, 0)) + if (__glibc_unlikely (pstr->offsets_needed)) { pstr->len = pstr->raw_len - idx + offset; pstr->stop = pstr->raw_stop - idx + offset; @@ -711,7 +724,7 @@ #ifdef _LIBC /* We know the wchar_t encoding is UCS4, so for the simple case, ASCII characters, skip the conversion step. */ - if (isascii (*p) && BE (pstr->trans == NULL, 1)) + if (isascii (*p) && __glibc_likely (pstr->trans == NULL)) { memset (&pstr->cur_state, '\0', sizeof (mbstate_t)); /* pstr->valid_len = 0; */ @@ -729,7 +742,7 @@ size_t mbclen; const unsigned char *pp = p; - if (BE (pstr->trans != NULL, 0)) + if (__glibc_unlikely (pstr->trans != NULL)) { int i = mlen < 6 ? mlen : 6; while (--i >= 0) @@ -759,13 +772,13 @@ pstr->tip_context = re_string_context_at (pstr, prev_valid_len - 1, eflags); else - pstr->tip_context = ((BE (pstr->word_ops_used != 0, 0) + pstr->tip_context = ((__glibc_unlikely (pstr->word_ops_used != 0) && IS_WIDE_WORD_CHAR (wc)) ? CONTEXT_WORD : ((IS_WIDE_NEWLINE (wc) && pstr->newline_anchor) ? CONTEXT_NEWLINE : 0)); - if (BE (pstr->valid_len, 0)) + if (__glibc_unlikely (pstr->valid_len)) { for (wcs_idx = 0; wcs_idx < pstr->valid_len; ++wcs_idx) pstr->wcs[wcs_idx] = WEOF; @@ -787,7 +800,7 @@ ? CONTEXT_NEWLINE : 0)); } } - if (!BE (pstr->mbs_allocated, 0)) + if (!__glibc_unlikely (pstr->mbs_allocated)) pstr->mbs += offset; } pstr->raw_mbs_idx = idx; @@ -801,7 +814,7 @@ if (pstr->icase) { reg_errcode_t ret = build_wcs_upper_buffer (pstr); - if (BE (ret != REG_NOERROR, 0)) + if (__glibc_unlikely (ret != REG_NOERROR)) return ret; } else @@ -809,7 +822,7 @@ } else #endif /* RE_ENABLE_I18N */ - if (BE (pstr->mbs_allocated, 0)) + if (__glibc_unlikely (pstr->mbs_allocated)) { if (pstr->icase) build_upper_buffer (pstr); @@ -831,7 +844,7 @@ Idx off; /* Handle the common (easiest) cases first. */ - if (BE (!pstr->mbs_allocated, 1)) + if (__glibc_likely (!pstr->mbs_allocated)) return re_string_peek_byte (pstr, idx); #ifdef RE_ENABLE_I18N @@ -863,7 +876,7 @@ static unsigned char re_string_fetch_byte_case (re_string_t *pstr) { - if (BE (!pstr->mbs_allocated, 1)) + if (__glibc_likely (!pstr->mbs_allocated)) return re_string_fetch_byte (pstr); #ifdef RE_ENABLE_I18N @@ -914,11 +927,11 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags) { int c; - if (BE (idx < 0, 0)) + if (__glibc_unlikely (idx < 0)) /* In this case, we use the value stored in input->tip_context, since we can't know the character in input->mbs[-1] here. */ return input->tip_context; - if (BE (idx == input->len, 0)) + if (__glibc_unlikely (idx == input->len)) return ((eflags & REG_NOTEOL) ? CONTEXT_ENDBUF : CONTEXT_NEWLINE | CONTEXT_ENDBUF); #ifdef RE_ENABLE_I18N @@ -937,7 +950,8 @@ return input->tip_context; } wc = input->wcs[wc_idx]; - if (BE (input->word_ops_used != 0, 0) && IS_WIDE_WORD_CHAR (wc)) + if (__glibc_unlikely (input->word_ops_used != 0) + && IS_WIDE_WORD_CHAR (wc)) return CONTEXT_WORD; return (IS_WIDE_NEWLINE (wc) && input->newline_anchor ? CONTEXT_NEWLINE : 0); @@ -961,7 +975,8 @@ set->alloc = size; set->nelem = 0; set->elems = re_malloc (Idx, size); - if (BE (set->elems == NULL, 0) && (MALLOC_0_IS_NONNULL || size != 0)) + if (__glibc_unlikely (set->elems == NULL) + && (MALLOC_0_IS_NONNULL || size != 0)) return REG_ESPACE; return REG_NOERROR; } @@ -973,7 +988,7 @@ set->alloc = 1; set->nelem = 1; set->elems = re_malloc (Idx, 1); - if (BE (set->elems == NULL, 0)) + if (__glibc_unlikely (set->elems == NULL)) { set->alloc = set->nelem = 0; return REG_ESPACE; @@ -988,7 +1003,7 @@ { set->alloc = 2; set->elems = re_malloc (Idx, 2); - if (BE (set->elems == NULL, 0)) + if (__glibc_unlikely (set->elems == NULL)) return REG_ESPACE; if (elem1 == elem2) { @@ -1021,7 +1036,7 @@ { dest->alloc = dest->nelem; dest->elems = re_malloc (Idx, dest->alloc); - if (BE (dest->elems == NULL, 0)) + if (__glibc_unlikely (dest->elems == NULL)) { dest->alloc = dest->nelem = 0; return REG_ESPACE; @@ -1052,7 +1067,7 @@ { Idx new_alloc = src1->nelem + src2->nelem + dest->alloc; Idx *new_elems = re_realloc (dest->elems, Idx, new_alloc); - if (BE (new_elems == NULL, 0)) + if (__glibc_unlikely (new_elems == NULL)) return REG_ESPACE; dest->elems = new_elems; dest->alloc = new_alloc; @@ -1138,7 +1153,7 @@ { dest->alloc = src1->nelem + src2->nelem; dest->elems = re_malloc (Idx, dest->alloc); - if (BE (dest->elems == NULL, 0)) + if (__glibc_unlikely (dest->elems == NULL)) return REG_ESPACE; } else @@ -1192,13 +1207,13 @@ { Idx new_alloc = 2 * (src->nelem + dest->alloc); Idx *new_buffer = re_realloc (dest->elems, Idx, new_alloc); - if (BE (new_buffer == NULL, 0)) + if (__glibc_unlikely (new_buffer == NULL)) return REG_ESPACE; dest->elems = new_buffer; dest->alloc = new_alloc; } - if (BE (dest->nelem == 0, 0)) + if (__glibc_unlikely (dest->nelem == 0)) { dest->nelem = src->nelem; memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx)); @@ -1271,9 +1286,9 @@ Idx idx; /* In case the set is empty. */ if (set->alloc == 0) - return BE (re_node_set_init_1 (set, elem) == REG_NOERROR, 1); + return __glibc_likely (re_node_set_init_1 (set, elem) == REG_NOERROR); - if (BE (set->nelem, 0) == 0) + if (__glibc_unlikely (set->nelem) == 0) { /* We already guaranteed above that set->alloc != 0. */ set->elems[0] = elem; @@ -1287,7 +1302,7 @@ Idx *new_elems; set->alloc = set->alloc * 2; new_elems = re_realloc (set->elems, Idx, set->alloc); - if (BE (new_elems == NULL, 0)) + if (__glibc_unlikely (new_elems == NULL)) return false; set->elems = new_elems; } @@ -1326,7 +1341,7 @@ Idx *new_elems; set->alloc = (set->alloc + 1) * 2; new_elems = re_realloc (set->elems, Idx, set->alloc); - if (BE (new_elems == NULL, 0)) + if (__glibc_unlikely (new_elems == NULL)) return false; set->elems = new_elems; } @@ -1393,7 +1408,7 @@ static Idx re_dfa_add_node (re_dfa_t *dfa, re_token_t token) { - if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0)) + if (__glibc_unlikely (dfa->nodes_len >= dfa->nodes_alloc)) { size_t new_nodes_alloc = dfa->nodes_alloc * 2; Idx *new_nexts, *new_indices; @@ -1404,19 +1419,20 @@ const size_t max_object_size = MAX (sizeof (re_token_t), MAX (sizeof (re_node_set), sizeof (Idx))); - if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_nodes_alloc, 0)) + if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / max_object_size) + < new_nodes_alloc)) return -1; new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc); - if (BE (new_nodes == NULL, 0)) + if (__glibc_unlikely (new_nodes == NULL)) return -1; dfa->nodes = new_nodes; new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc); new_indices = re_realloc (dfa->org_indices, Idx, new_nodes_alloc); new_edests = re_realloc (dfa->edests, re_node_set, new_nodes_alloc); new_eclosures = re_realloc (dfa->eclosures, re_node_set, new_nodes_alloc); - if (BE (new_nexts == NULL || new_indices == NULL - || new_edests == NULL || new_eclosures == NULL, 0)) + if (__glibc_unlikely (new_nexts == NULL || new_indices == NULL + || new_edests == NULL || new_eclosures == NULL)) { re_free (new_nexts); re_free (new_indices); @@ -1475,7 +1491,7 @@ /* Suppress bogus uninitialized-variable warnings. */ *err = REG_NOERROR; #endif - if (BE (nodes->nelem == 0, 0)) + if (__glibc_unlikely (nodes->nelem == 0)) { *err = REG_NOERROR; return NULL; @@ -1494,7 +1510,7 @@ /* There are no appropriate state in the dfa, create the new one. */ new_state = create_ci_newstate (dfa, nodes, hash); - if (BE (new_state == NULL, 0)) + if (__glibc_unlikely (new_state == NULL)) *err = REG_ESPACE; return new_state; @@ -1541,7 +1557,7 @@ } /* There are no appropriate state in 'dfa', create the new one. */ new_state = create_cd_newstate (dfa, nodes, context, hash); - if (BE (new_state == NULL, 0)) + if (__glibc_unlikely (new_state == NULL)) *err = REG_ESPACE; return new_state; @@ -1562,7 +1578,7 @@ newstate->hash = hash; err = re_node_set_alloc (&newstate->non_eps_nodes, newstate->nodes.nelem); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) return REG_ESPACE; for (i = 0; i < newstate->nodes.nelem; i++) { @@ -1573,12 +1589,12 @@ } spot = dfa->state_table + (hash & dfa->state_hash_mask); - if (BE (spot->alloc <= spot->num, 0)) + if (__glibc_unlikely (spot->alloc <= spot->num)) { Idx new_alloc = 2 * spot->num + 2; re_dfastate_t **new_array = re_realloc (spot->array, re_dfastate_t *, new_alloc); - if (BE (new_array == NULL, 0)) + if (__glibc_unlikely (new_array == NULL)) return REG_ESPACE; spot->array = new_array; spot->alloc = new_alloc; @@ -1616,10 +1632,10 @@ re_dfastate_t *newstate; newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1); - if (BE (newstate == NULL, 0)) + if (__glibc_unlikely (newstate == NULL)) return NULL; err = re_node_set_init_copy (&newstate->nodes, nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_free (newstate); return NULL; @@ -1645,7 +1661,7 @@ newstate->has_constraint = 1; } err = register_state (dfa, newstate, hash); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { free_state (newstate); newstate = NULL; @@ -1666,10 +1682,10 @@ re_dfastate_t *newstate; newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1); - if (BE (newstate == NULL, 0)) + if (__glibc_unlikely (newstate == NULL)) return NULL; err = re_node_set_init_copy (&newstate->nodes, nodes); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { re_free (newstate); return NULL; @@ -1701,7 +1717,7 @@ if (newstate->entrance_nodes == &newstate->nodes) { newstate->entrance_nodes = re_malloc (re_node_set, 1); - if (BE (newstate->entrance_nodes == NULL, 0)) + if (__glibc_unlikely (newstate->entrance_nodes == NULL)) { free_state (newstate); return NULL; @@ -1721,7 +1737,7 @@ } } err = register_state (dfa, newstate, hash); - if (BE (err != REG_NOERROR, 0)) + if (__glibc_unlikely (err != REG_NOERROR)) { free_state (newstate); newstate = NULL; diff -Nru wget-1.19.5/lib/regex_internal.h wget-1.20.1/lib/regex_internal.h --- wget-1.19.5/lib/regex_internal.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/regex_internal.h 2018-12-26 20:08:19.000000000 +0000 @@ -33,13 +33,13 @@ #include #include -#include "intprops.h" +#include #ifdef _LIBC # include # define lock_define(name) __libc_lock_define (, name) # define lock_init(lock) (__libc_lock_init (lock), 0) -# define lock_fini(lock) 0 +# define lock_fini(lock) ((void) 0) # define lock_lock(lock) __libc_lock_lock (lock) # define lock_unlock(lock) __libc_lock_unlock (lock) #elif defined GNULIB_LOCK && !defined USE_UNLOCKED_IO @@ -116,8 +116,6 @@ # define RE_ENABLE_I18N #endif -#define BE(expr, val) __builtin_expect (expr, val) - /* Number of ASCII characters. */ #define ASCII_CHARS 0x80 @@ -133,7 +131,10 @@ /* Rename to standard API for using out of glibc. */ #ifndef _LIBC # undef __wctype +# undef __iswalnum # undef __iswctype +# undef __towlower +# undef __towupper # define __wctype wctype # define __iswalnum iswalnum # define __iswctype iswctype @@ -441,17 +442,6 @@ # define IS_IN(libc) false #endif -static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr, - Idx new_buf_len); -#ifdef RE_ENABLE_I18N -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); -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) __attribute__ ((pure)); - #define re_string_peek_byte(pstr, offset) \ ((pstr)->mbs[(pstr)->cur_idx + offset]) #define re_string_fetch_byte(pstr) \ @@ -757,31 +747,31 @@ /* Functions for bitset_t operation. */ -static void +static inline void bitset_set (bitset_t set, Idx i) { set[i / BITSET_WORD_BITS] |= (bitset_word_t) 1 << i % BITSET_WORD_BITS; } -static void +static inline void bitset_clear (bitset_t set, Idx i) { set[i / BITSET_WORD_BITS] &= ~ ((bitset_word_t) 1 << i % BITSET_WORD_BITS); } -static bool +static inline bool bitset_contain (const bitset_t set, Idx i) { return (set[i / BITSET_WORD_BITS] >> i % BITSET_WORD_BITS) & 1; } -static void +static inline void bitset_empty (bitset_t set) { memset (set, '\0', sizeof (bitset_t)); } -static void +static inline void bitset_set_all (bitset_t set) { memset (set, -1, sizeof (bitset_word_t) * (SBC_MAX / BITSET_WORD_BITS)); @@ -790,13 +780,13 @@ ((bitset_word_t) 1 << SBC_MAX % BITSET_WORD_BITS) - 1; } -static void +static inline void bitset_copy (bitset_t dest, const bitset_t src) { memcpy (dest, src, sizeof (bitset_t)); } -static void __attribute__ ((unused)) +static inline void bitset_not (bitset_t set) { int bitset_i; @@ -808,7 +798,7 @@ & ~set[BITSET_WORDS - 1]); } -static void __attribute__ ((unused)) +static inline void bitset_merge (bitset_t dest, const bitset_t src) { int bitset_i; @@ -816,7 +806,7 @@ dest[bitset_i] |= src[bitset_i]; } -static void __attribute__ ((unused)) +static inline void bitset_mask (bitset_t dest, const bitset_t src) { int bitset_i; diff -Nru wget-1.19.5/lib/secure_getenv.c wget-1.20.1/lib/secure_getenv.c --- wget-1.19.5/lib/secure_getenv.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/secure_getenv.c 2018-12-26 20:08:19.000000000 +0000 @@ -38,7 +38,7 @@ if (geteuid () != getuid () || getegid () != getgid ()) return NULL; return getenv (name); -#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* native Windows */ +#elif defined _WIN32 && ! defined __CYGWIN__ /* native Windows */ /* On native Windows, there is no such concept as setuid or setgid binaries. - Programs launched as system services have high privileges, but they don't inherit environment variables from a user. diff -Nru wget-1.19.5/lib/select.c wget-1.20.1/lib/select.c --- wget-1.19.5/lib/select.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/select.c 2018-12-26 20:08:19.000000000 +0000 @@ -22,7 +22,7 @@ #include #include -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Native Windows. */ #include @@ -47,6 +47,10 @@ #undef select +/* Avoid warnings from gcc -Wcast-function-type. */ +#define GetProcAddress \ + (void *) GetProcAddress + struct bitset { unsigned char in[FD_SETSIZE / CHAR_BIT]; unsigned char out[FD_SETSIZE / CHAR_BIT]; diff -Nru wget-1.19.5/lib/sha1.c wget-1.20.1/lib/sha1.c --- wget-1.19.5/lib/sha1.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/sha1.c 2018-12-26 20:08:19.000000000 +0000 @@ -37,11 +37,11 @@ # include "unlocked-io.h" #endif +#include #ifdef WORDS_BIGENDIAN # define SWAP(n) (n) #else -# define SWAP(n) \ - (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) +# define SWAP(n) bswap_32 (n) #endif #define BLOCKSIZE 32768 @@ -122,21 +122,29 @@ } #endif +#ifdef GL_COMPILE_CRYPTO_STREAM + +#include "af_alg.h" + /* Compute SHA1 message digest for bytes read from STREAM. The - resulting message digest number will be written into the 16 bytes + resulting message digest number will be written into the 20 bytes beginning at RESBLOCK. */ int sha1_stream (FILE *stream, void *resblock) { - struct sha1_ctx ctx; - size_t sum; + switch (afalg_stream (stream, "sha1", resblock, SHA1_DIGEST_SIZE)) + { + case 0: return 0; + case -EIO: return 1; + } char *buffer = malloc (BLOCKSIZE + 72); if (!buffer) return 1; - /* Initialize the computation context. */ + struct sha1_ctx ctx; sha1_init_ctx (&ctx); + size_t sum; /* Iterate over full file contents. */ while (1) @@ -150,6 +158,14 @@ /* Read block. Take care for partial reads. */ while (1) { + /* Either process a partial fread() from this loop, + or the fread() in afalg_stream may have gotten EOF. + We need to avoid a subsequent fread() as EOF may + not be sticky. For details of such systems, see: + https://sourceware.org/bugzilla/show_bug.cgi?id=1190 */ + if (feof (stream)) + goto process_partial_block; + n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); sum += n; @@ -169,12 +185,6 @@ } goto process_partial_block; } - - /* We've read at least one byte, so ignore errors. But always - check for EOF, since feof may be true even though N > 0. - Otherwise, we could end up calling fread after EOF. */ - if (feof (stream)) - goto process_partial_block; } /* Process buffer with BLOCKSIZE bytes. Note that @@ -194,6 +204,7 @@ free (buffer); return 0; } +#endif #if ! HAVE_OPENSSL_SHA1 /* Compute SHA1 message digest for LEN bytes beginning at BUFFER. The diff -Nru wget-1.19.5/lib/sha1.h wget-1.20.1/lib/sha1.h --- wget-1.19.5/lib/sha1.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/sha1.h 2018-12-26 20:08:19.000000000 +0000 @@ -87,8 +87,11 @@ extern void *sha1_buffer (const char *buffer, size_t len, void *resblock); # endif -/* Compute SHA1 message digest for bytes read from STREAM. The - resulting message digest number will be written into the 20 bytes +/* Compute SHA1 message digest for bytes read from STREAM. + STREAM is an open file stream. Regular files are handled more efficiently. + The contents of STREAM from its current position to its end will be read. + The case that the last operation on STREAM was an 'ungetc' is not supported. + The resulting message digest number will be written into the 20 bytes beginning at RESBLOCK. */ extern int sha1_stream (FILE *stream, void *resblock); diff -Nru wget-1.19.5/lib/sha256.c wget-1.20.1/lib/sha256.c --- wget-1.19.5/lib/sha256.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/sha256.c 2018-12-26 20:08:19.000000000 +0000 @@ -36,11 +36,11 @@ # include "unlocked-io.h" #endif +#include #ifdef WORDS_BIGENDIAN # define SWAP(n) (n) #else -# define SWAP(n) \ - (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) +# define SWAP(n) bswap_32 (n) #endif #define BLOCKSIZE 32768 @@ -91,17 +91,17 @@ ctx->buflen = 0; } -/* Copy the value from v into the memory location pointed to by *cp, - If your architecture allows unaligned access this is equivalent to - * (uint32_t *) cp = v */ +/* Copy the value from v into the memory location pointed to by *CP, + If your architecture allows unaligned access, this is equivalent to + * (__typeof__ (v) *) cp = v */ static void set_uint32 (char *cp, uint32_t v) { memcpy (cp, &v, sizeof v); } -/* Put result from CTX in first 32 bytes following RESBUF. The result - must be in little endian byte order. */ +/* Put result from CTX in first 32 bytes following RESBUF. + The result must be in little endian byte order. */ void * sha256_read_ctx (const struct sha256_ctx *ctx, void *resbuf) { @@ -169,21 +169,32 @@ } #endif -/* Compute SHA256 message digest for bytes read from STREAM. The - resulting message digest number will be written into the 32 bytes - beginning at RESBLOCK. */ -int -sha256_stream (FILE *stream, void *resblock) +#ifdef GL_COMPILE_CRYPTO_STREAM + +#include "af_alg.h" + +/* Compute message digest for bytes read from STREAM using algorithm ALG. + Write the message digest into RESBLOCK, which contains HASHLEN bytes. + The initial and finishing operations are INIT_CTX and FINISH_CTX. + Return zero if and only if successful. */ +static int +shaxxx_stream (FILE *stream, char const *alg, void *resblock, + ssize_t hashlen, void (*init_ctx) (struct sha256_ctx *), + void *(*finish_ctx) (struct sha256_ctx *, void *)) { - struct sha256_ctx ctx; - size_t sum; + switch (afalg_stream (stream, alg, resblock, hashlen)) + { + case 0: return 0; + case -EIO: return 1; + } char *buffer = malloc (BLOCKSIZE + 72); if (!buffer) return 1; - /* Initialize the computation context. */ - sha256_init_ctx (&ctx); + struct sha256_ctx ctx; + init_ctx (&ctx); + size_t sum; /* Iterate over full file contents. */ while (1) @@ -197,6 +208,14 @@ /* Read block. Take care for partial reads. */ while (1) { + /* Either process a partial fread() from this loop, + or the fread() in afalg_stream may have gotten EOF. + We need to avoid a subsequent fread() as EOF may + not be sticky. For details of such systems, see: + https://sourceware.org/bugzilla/show_bug.cgi?id=1190 */ + if (feof (stream)) + goto process_partial_block; + n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); sum += n; @@ -216,12 +235,6 @@ } goto process_partial_block; } - - /* We've read at least one byte, so ignore errors. But always - check for EOF, since feof may be true even though N > 0. - Otherwise, we could end up calling fread after EOF. */ - if (feof (stream)) - goto process_partial_block; } /* Process buffer with BLOCKSIZE bytes. Note that @@ -237,84 +250,28 @@ sha256_process_bytes (buffer, sum, &ctx); /* Construct result in desired memory. */ - sha256_finish_ctx (&ctx, resblock); + finish_ctx (&ctx, resblock); free (buffer); return 0; } -/* FIXME: Avoid code duplication */ int -sha224_stream (FILE *stream, void *resblock) +sha256_stream (FILE *stream, void *resblock) { - struct sha256_ctx ctx; - size_t sum; - - char *buffer = malloc (BLOCKSIZE + 72); - if (!buffer) - return 1; - - /* Initialize the computation context. */ - sha224_init_ctx (&ctx); - - /* Iterate over full file contents. */ - while (1) - { - /* We read the file in blocks of BLOCKSIZE bytes. One call of the - computation function processes the whole buffer so that with the - next round of the loop another block can be read. */ - size_t n; - sum = 0; - - /* Read block. Take care for partial reads. */ - while (1) - { - n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); - - sum += n; - - if (sum == BLOCKSIZE) - break; - - if (n == 0) - { - /* Check for the error flag IFF N == 0, so that we don't - exit the loop after a partial read due to e.g., EAGAIN - or EWOULDBLOCK. */ - if (ferror (stream)) - { - free (buffer); - return 1; - } - goto process_partial_block; - } - - /* We've read at least one byte, so ignore errors. But always - check for EOF, since feof may be true even though N > 0. - Otherwise, we could end up calling fread after EOF. */ - if (feof (stream)) - goto process_partial_block; - } - - /* Process buffer with BLOCKSIZE bytes. Note that - BLOCKSIZE % 64 == 0 - */ - sha256_process_block (buffer, BLOCKSIZE, &ctx); - } - - process_partial_block:; - - /* Process any remaining bytes. */ - if (sum > 0) - sha256_process_bytes (buffer, sum, &ctx); + return shaxxx_stream (stream, "sha256", resblock, SHA256_DIGEST_SIZE, + sha256_init_ctx, sha256_finish_ctx); +} - /* Construct result in desired memory. */ - sha224_finish_ctx (&ctx, resblock); - free (buffer); - return 0; +int +sha224_stream (FILE *stream, void *resblock) +{ + return shaxxx_stream (stream, "sha224", resblock, SHA224_DIGEST_SIZE, + sha224_init_ctx, sha224_finish_ctx); } +#endif #if ! HAVE_OPENSSL_SHA256 -/* Compute SHA512 message digest for LEN bytes beginning at BUFFER. The +/* Compute SHA256 message digest for LEN bytes beginning at BUFFER. The result is always in little endian byte order, so that a byte-wise output yields to the wanted ASCII representation of the message digest. */ diff -Nru wget-1.19.5/lib/sha256.h wget-1.20.1/lib/sha256.h --- wget-1.19.5/lib/sha256.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/sha256.h 2018-12-26 20:08:19.000000000 +0000 @@ -89,8 +89,11 @@ extern void *sha224_buffer (const char *buffer, size_t len, void *resblock); # endif -/* Compute SHA256 (SHA224) message digest for bytes read from STREAM. The - resulting message digest number will be written into the 32 (28) bytes +/* Compute SHA256 (SHA224) message digest for bytes read from STREAM. + STREAM is an open file stream. Regular files are handled more efficiently. + The contents of STREAM from its current position to its end will be read. + The case that the last operation on STREAM was an 'ungetc' is not supported. + The resulting message digest number will be written into the 32 (28) bytes beginning at RESBLOCK. */ extern int sha256_stream (FILE *stream, void *resblock); extern int sha224_stream (FILE *stream, void *resblock); diff -Nru wget-1.19.5/lib/sha512.c wget-1.20.1/lib/sha512.c --- wget-1.19.5/lib/sha512.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/sha512.c 2018-12-26 20:08:19.000000000 +0000 @@ -36,18 +36,11 @@ # include "unlocked-io.h" #endif +#include #ifdef WORDS_BIGENDIAN # define SWAP(n) (n) #else -# define SWAP(n) \ - u64or (u64or (u64or (u64shl (n, 56), \ - u64shl (u64and (n, u64lo (0x0000ff00)), 40)), \ - u64or (u64shl (u64and (n, u64lo (0x00ff0000)), 24), \ - u64shl (u64and (n, u64lo (0xff000000)), 8))), \ - u64or (u64or (u64and (u64shr (n, 8), u64lo (0xff000000)), \ - u64and (u64shr (n, 24), u64lo (0x00ff0000))), \ - u64or (u64and (u64shr (n, 40), u64lo (0x0000ff00)), \ - u64shr (n, 56)))) +# define SWAP(n) bswap_64 (n) #endif #define BLOCKSIZE 32768 @@ -177,21 +170,32 @@ } #endif -/* Compute SHA512 message digest for bytes read from STREAM. The - resulting message digest number will be written into the 64 bytes - beginning at RESBLOCK. */ -int -sha512_stream (FILE *stream, void *resblock) +#ifdef GL_COMPILE_CRYPTO_STREAM + +#include "af_alg.h" + +/* Compute message digest for bytes read from STREAM using algorithm ALG. + Write the message digest into RESBLOCK, which contains HASHLEN bytes. + The initial and finishing operations are INIT_CTX and FINISH_CTX. + Return zero if and only if successful. */ +static int +shaxxx_stream (FILE *stream, char const *alg, void *resblock, + ssize_t hashlen, void (*init_ctx) (struct sha512_ctx *), + void *(*finish_ctx) (struct sha512_ctx *, void *)) { - struct sha512_ctx ctx; - size_t sum; + switch (afalg_stream (stream, alg, resblock, hashlen)) + { + case 0: return 0; + case -EIO: return 1; + } char *buffer = malloc (BLOCKSIZE + 72); if (!buffer) return 1; - /* Initialize the computation context. */ - sha512_init_ctx (&ctx); + struct sha512_ctx ctx; + init_ctx (&ctx); + size_t sum; /* Iterate over full file contents. */ while (1) @@ -205,6 +209,14 @@ /* Read block. Take care for partial reads. */ while (1) { + /* Either process a partial fread() from this loop, + or the fread() in afalg_stream may have gotten EOF. + We need to avoid a subsequent fread() as EOF may + not be sticky. For details of such systems, see: + https://sourceware.org/bugzilla/show_bug.cgi?id=1190 */ + if (feof (stream)) + goto process_partial_block; + n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); sum += n; @@ -224,12 +236,6 @@ } goto process_partial_block; } - - /* We've read at least one byte, so ignore errors. But always - check for EOF, since feof may be true even though N > 0. - Otherwise, we could end up calling fread after EOF. */ - if (feof (stream)) - goto process_partial_block; } /* Process buffer with BLOCKSIZE bytes. Note that @@ -245,81 +251,25 @@ sha512_process_bytes (buffer, sum, &ctx); /* Construct result in desired memory. */ - sha512_finish_ctx (&ctx, resblock); + finish_ctx (&ctx, resblock); free (buffer); return 0; } -/* FIXME: Avoid code duplication */ int -sha384_stream (FILE *stream, void *resblock) +sha512_stream (FILE *stream, void *resblock) { - struct sha512_ctx ctx; - size_t sum; - - char *buffer = malloc (BLOCKSIZE + 72); - if (!buffer) - return 1; - - /* Initialize the computation context. */ - sha384_init_ctx (&ctx); - - /* Iterate over full file contents. */ - while (1) - { - /* We read the file in blocks of BLOCKSIZE bytes. One call of the - computation function processes the whole buffer so that with the - next round of the loop another block can be read. */ - size_t n; - sum = 0; - - /* Read block. Take care for partial reads. */ - while (1) - { - n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); - - sum += n; - - if (sum == BLOCKSIZE) - break; - - if (n == 0) - { - /* Check for the error flag IFF N == 0, so that we don't - exit the loop after a partial read due to e.g., EAGAIN - or EWOULDBLOCK. */ - if (ferror (stream)) - { - free (buffer); - return 1; - } - goto process_partial_block; - } - - /* We've read at least one byte, so ignore errors. But always - check for EOF, since feof may be true even though N > 0. - Otherwise, we could end up calling fread after EOF. */ - if (feof (stream)) - goto process_partial_block; - } - - /* Process buffer with BLOCKSIZE bytes. Note that - BLOCKSIZE % 128 == 0 - */ - sha512_process_block (buffer, BLOCKSIZE, &ctx); - } - - process_partial_block:; - - /* Process any remaining bytes. */ - if (sum > 0) - sha512_process_bytes (buffer, sum, &ctx); + return shaxxx_stream (stream, "sha512", resblock, SHA512_DIGEST_SIZE, + sha512_init_ctx, sha512_finish_ctx); +} - /* Construct result in desired memory. */ - sha384_finish_ctx (&ctx, resblock); - free (buffer); - return 0; +int +sha384_stream (FILE *stream, void *resblock) +{ + return shaxxx_stream (stream, "sha384", resblock, SHA384_DIGEST_SIZE, + sha384_init_ctx, sha384_finish_ctx); } +#endif #if ! HAVE_OPENSSL_SHA512 /* Compute SHA512 message digest for LEN bytes beginning at BUFFER. The diff -Nru wget-1.19.5/lib/sha512.h wget-1.20.1/lib/sha512.h --- wget-1.19.5/lib/sha512.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/sha512.h 2018-12-26 20:08:19.000000000 +0000 @@ -92,8 +92,11 @@ extern void *sha384_buffer (const char *buffer, size_t len, void *resblock); # endif -/* Compute SHA512 (SHA384) message digest for bytes read from STREAM. The - resulting message digest number will be written into the 64 (48) bytes +/* Compute SHA512 (SHA384) message digest for bytes read from STREAM. + STREAM is an open file stream. Regular files are handled more efficiently. + The contents of STREAM from its current position to its end will be read. + The case that the last operation on STREAM was an 'ungetc' is not supported. + The resulting message digest number will be written into the 64 (48) bytes beginning at RESBLOCK. */ extern int sha512_stream (FILE *stream, void *resblock); extern int sha384_stream (FILE *stream, void *resblock); diff -Nru wget-1.19.5/lib/sigaction.c wget-1.20.1/lib/sigaction.c --- wget-1.19.5/lib/sigaction.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/sigaction.c 2018-12-26 20:08:19.000000000 +0000 @@ -67,7 +67,7 @@ /* On native Windows, as of 2008, the signal SIGABRT_COMPAT is an alias for the signal SIGABRT. Only one signal handler is stored for both SIGABRT and SIGABRT_COMPAT. SIGABRT_COMPAT is not a signal of its own. */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # undef SIGABRT_COMPAT # define SIGABRT_COMPAT 6 #endif diff -Nru wget-1.19.5/lib/sig-handler.h wget-1.20.1/lib/sig-handler.h --- wget-1.19.5/lib/sig-handler.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/sig-handler.h 2018-12-26 20:08:19.000000000 +0000 @@ -37,15 +37,12 @@ SIG_HANDLER_INLINE sa_handler_t _GL_ATTRIBUTE_PURE get_handler (struct sigaction const *a) { -#ifdef SA_SIGINFO /* POSIX says that special values like SIG_IGN can only occur when action.sa_flags does not contain SA_SIGINFO. But in Linux 2.4, for example, sa_sigaction and sa_handler are aliases and a signal - is ignored if sa_sigaction (after casting) equals SIG_IGN. So - use (and cast) sa_sigaction in that case. */ - if (a->sa_flags & SA_SIGINFO) - return (sa_handler_t) a->sa_sigaction; -#endif + is ignored if sa_sigaction (after casting) equals SIG_IGN. In + this case, this implementation relies on the fact that the two + are aliases, and simply returns sa_handler. */ return a->sa_handler; } diff -Nru wget-1.19.5/lib/sigprocmask.c wget-1.20.1/lib/sigprocmask.c --- wget-1.19.5/lib/sigprocmask.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/sigprocmask.c 2018-12-26 20:08:19.000000000 +0000 @@ -50,7 +50,7 @@ /* On native Windows, as of 2008, the signal SIGABRT_COMPAT is an alias for the signal SIGABRT. Only one signal handler is stored for both SIGABRT and SIGABRT_COMPAT. SIGABRT_COMPAT is not a signal of its own. */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # undef SIGABRT_COMPAT # define SIGABRT_COMPAT 6 #endif diff -Nru wget-1.19.5/lib/spawn_faction_addclose.c wget-1.20.1/lib/spawn_faction_addclose.c --- wget-1.19.5/lib/spawn_faction_addclose.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/spawn_faction_addclose.c 2018-12-26 20:08:19.000000000 +0000 @@ -26,7 +26,7 @@ # define __sysconf(open_max) getdtablesize () #endif -#if !HAVE_WORKING_POSIX_SPAWN +#if REPLACE_POSIX_SPAWN # include "spawn_int.h" #endif @@ -43,7 +43,7 @@ if (fd < 0 || fd >= maxfd) return EBADF; -#if HAVE_WORKING_POSIX_SPAWN +#if !REPLACE_POSIX_SPAWN return posix_spawn_file_actions_addclose (file_actions, fd); #else /* Allocate more memory if needed. */ diff -Nru wget-1.19.5/lib/spawn_faction_adddup2.c wget-1.20.1/lib/spawn_faction_adddup2.c --- wget-1.19.5/lib/spawn_faction_adddup2.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/spawn_faction_adddup2.c 2018-12-26 20:08:19.000000000 +0000 @@ -26,7 +26,7 @@ # define __sysconf(open_max) getdtablesize () #endif -#if !HAVE_WORKING_POSIX_SPAWN +#if REPLACE_POSIX_SPAWN # include "spawn_int.h" #endif @@ -43,7 +43,7 @@ if (fd < 0 || newfd < 0 || fd >= maxfd || newfd >= maxfd) return EBADF; -#if HAVE_WORKING_POSIX_SPAWN +#if !REPLACE_POSIX_SPAWN return posix_spawn_file_actions_adddup2 (file_actions, fd, newfd); #else /* Allocate more memory if needed. */ diff -Nru wget-1.19.5/lib/spawn_faction_addopen.c wget-1.20.1/lib/spawn_faction_addopen.c --- wget-1.19.5/lib/spawn_faction_addopen.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/spawn_faction_addopen.c 2018-12-26 20:08:19.000000000 +0000 @@ -26,7 +26,7 @@ # define __sysconf(open_max) getdtablesize () #endif -#if !HAVE_WORKING_POSIX_SPAWN +#if REPLACE_POSIX_SPAWN # include "spawn_int.h" #endif @@ -44,7 +44,7 @@ if (fd < 0 || fd >= maxfd) return EBADF; -#if HAVE_WORKING_POSIX_SPAWN +#if !REPLACE_POSIX_SPAWN return posix_spawn_file_actions_addopen (file_actions, fd, path, oflag, mode); #else /* Allocate more memory if needed. */ diff -Nru wget-1.19.5/lib/spawni.c wget-1.20.1/lib/spawni.c --- wget-1.19.5/lib/spawni.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/spawni.c 2018-12-26 20:08:19.000000000 +0000 @@ -32,7 +32,7 @@ #if _LIBC || HAVE_PATHS_H # include #else -# define _PATH_BSHELL "/bin/sh" +# define _PATH_BSHELL BOURNE_SHELL #endif #include @@ -89,7 +89,7 @@ #define SPAWN_ERROR 127 -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Native Windows API. */ int @@ -284,6 +284,12 @@ /* The 'dup2' call failed. */ _exit (SPAWN_ERROR); break; + + case spawn_do_chdir: + if (chdir (action->action.chdir_action.path) < 0) + /* The 'chdir' call failed. */ + _exit (SPAWN_ERROR); + break; } } } diff -Nru wget-1.19.5/lib/spawn.in.h wget-1.20.1/lib/spawn.in.h --- wget-1.19.5/lib/spawn.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/spawn.in.h 2018-12-26 20:08:19.000000000 +0000 @@ -79,10 +79,10 @@ /* Data structure to contain attributes for thread creation. */ -#if @REPLACE_POSIX_SPAWN@ +#if @REPLACE_POSIX_SPAWN@ || (@HAVE_POSIX_SPAWNATTR_T@ && !@HAVE_POSIX_SPAWN@) # define posix_spawnattr_t rpl_posix_spawnattr_t #endif -#if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWNATTR_T@ +#if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWNATTR_T@ || !@HAVE_POSIX_SPAWN@ # if !GNULIB_defined_posix_spawnattr_t typedef struct { @@ -101,10 +101,10 @@ /* Data structure to contain information about the actions to be performed in the new process with respect to file descriptors. */ -#if @REPLACE_POSIX_SPAWN@ +#if @REPLACE_POSIX_SPAWN@ || (@HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ && !@HAVE_POSIX_SPAWN@) # define posix_spawn_file_actions_t rpl_posix_spawn_file_actions_t #endif -#if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ +#if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ || !@HAVE_POSIX_SPAWN@ # if !GNULIB_defined_posix_spawn_file_actions_t typedef struct { @@ -878,6 +878,41 @@ # endif #endif +#if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ +/* Add an action to FILE-ACTIONS which tells the implementation to call + 'chdir' to the given directory during the 'spawn' call. */ +# if @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define posix_spawn_file_actions_addchdir rpl_posix_spawn_file_actions_addchdir +# endif +_GL_FUNCDECL_RPL (posix_spawn_file_actions_addchdir, int, + (posix_spawn_file_actions_t *_Restrict_ __file_actions, + const char *_Restrict_ __path) + __THROW _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (posix_spawn_file_actions_addchdir, int, + (posix_spawn_file_actions_t *_Restrict_ __file_actions, + const char *_Restrict_ __path)); +# else +# if !@HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ +_GL_FUNCDECL_SYS (posix_spawn_file_actions_addchdir, int, + (posix_spawn_file_actions_t *_Restrict_ __file_actions, + const char *_Restrict_ __path) + __THROW _GL_ARG_NONNULL ((1, 2))); +# endif +_GL_CXXALIAS_SYS (posix_spawn_file_actions_addchdir, int, + (posix_spawn_file_actions_t *_Restrict_ __file_actions, + const char *_Restrict_ __path)); +# endif +_GL_CXXALIASWARN (posix_spawn_file_actions_addchdir); +#elif defined GNULIB_POSIXCHECK +# undef posix_spawn_file_actions_addchdir +# if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR +_GL_WARN_ON_USE (posix_spawn_file_actions_addchdir, + "posix_spawn_file_actions_addchdir is unportable - " + "use gnulib module posix_spawn_file_actions_addchdir for portability"); +# endif +#endif + #endif /* _@GUARD_PREFIX@_SPAWN_H */ #endif /* _@GUARD_PREFIX@_SPAWN_H */ diff -Nru wget-1.19.5/lib/spawn_int.h wget-1.20.1/lib/spawn_int.h --- wget-1.19.5/lib/spawn_int.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/spawn_int.h 2018-12-26 20:08:19.000000000 +0000 @@ -23,7 +23,8 @@ { spawn_do_close, spawn_do_dup2, - spawn_do_open + spawn_do_open, + spawn_do_chdir } tag; union @@ -44,6 +45,10 @@ int oflag; mode_t mode; } open_action; + struct + { + const char *path; + } chdir_action; } action; }; diff -Nru wget-1.19.5/lib/spawn-pipe.c wget-1.20.1/lib/spawn-pipe.c --- wget-1.19.5/lib/spawn-pipe.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/spawn-pipe.c 2018-12-26 20:08:19.000000000 +0000 @@ -40,8 +40,7 @@ #define _(str) gettext (str) -#if (((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ - || defined __KLIBC__) +#if (defined _WIN32 && ! defined __CYGWIN__) || defined __KLIBC__ /* Native Windows API. */ # include @@ -72,9 +71,10 @@ return retval; } +#undef close /* avoid warning related to gnulib module unistd */ #define close nonintr_close -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ static int nonintr_open (const char *pathname, int oflag, mode_t mode) { @@ -115,8 +115,7 @@ bool slave_process, bool exit_on_error, int fd[2]) { -#if (((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ - || defined __KLIBC__) +#if (defined _WIN32 && ! defined __CYGWIN__) || defined __KLIBC__ /* Native Windows API. This uses _pipe(), dup2(), and spawnv(). It could also be implemented diff -Nru wget-1.19.5/lib/spawn-pipe.h wget-1.20.1/lib/spawn-pipe.h --- wget-1.19.5/lib/spawn-pipe.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/spawn-pipe.h 2018-12-26 20:08:19.000000000 +0000 @@ -130,7 +130,7 @@ int fd[2]); /* The name of the "always silent" device. */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Native Windows API. */ # define DEV_NULL "NUL" #else diff -Nru wget-1.19.5/lib/stat.c wget-1.20.1/lib/stat.c --- wget-1.19.5/lib/stat.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/stat.c 2018-12-26 20:08:19.000000000 +0000 @@ -27,7 +27,7 @@ #include #undef __need_system_sys_stat_h -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # define WINDOWS_NATIVE #endif diff -Nru wget-1.19.5/lib/stat-time.h wget-1.20.1/lib/stat-time.h --- wget-1.19.5/lib/stat-time.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/stat-time.h 2018-12-26 20:08:19.000000000 +0000 @@ -168,7 +168,7 @@ #elif defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC t.tv_sec = st->st_birthtime; t.tv_nsec = st->st_birthtimensec; -#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#elif defined _WIN32 && ! defined __CYGWIN__ /* Native Windows platforms (but not Cygwin) put the "file creation time" in st_ctime (!). See . */ @@ -213,7 +213,7 @@ #if defined __sun && defined STAT_TIMESPEC if (result == 0) { - long int timespec_resolution = 1000000000; + long int timespec_hz = 1000000000; short int const ts_off[] = { offsetof (struct stat, st_atim), offsetof (struct stat, st_mtim), offsetof (struct stat, st_ctim) }; @@ -221,11 +221,11 @@ 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; + long int q = ts->tv_nsec / timespec_hz; + long int r = ts->tv_nsec % timespec_hz; if (r < 0) { - r += timespec_resolution; + r += timespec_hz; q--; } ts->tv_nsec = r; diff -Nru wget-1.19.5/lib/stat-w32.c wget-1.20.1/lib/stat-w32.c --- wget-1.19.5/lib/stat-w32.c 2018-01-19 21:19:16.000000000 +0000 +++ wget-1.20.1/lib/stat-w32.c 2018-12-26 20:08:19.000000000 +0000 @@ -18,7 +18,7 @@ #include -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Ensure that defines FILE_ID_INFO. */ #undef _WIN32_WINNT @@ -38,6 +38,10 @@ #include "pathmax.h" #include "verify.h" +/* Avoid warnings from gcc -Wcast-function-type. */ +#define GetProcAddress \ + (void *) GetProcAddress + #if _GL_WINDOWS_STAT_INODES == 2 /* GetFileInformationByHandleEx was introduced only in Windows Vista. */ typedef DWORD (WINAPI * GetFileInformationByHandleExFuncType) (HANDLE hFile, diff -Nru wget-1.19.5/lib/stdio-impl.h wget-1.20.1/lib/stdio-impl.h --- wget-1.19.5/lib/stdio-impl.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/stdio-impl.h 2018-12-26 20:08:19.000000000 +0000 @@ -18,6 +18,12 @@ the same implementation of stdio extension API, except that some fields have different naming conventions, or their access requires some casts. */ +/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this + problem by defining it ourselves. FIXME: Do not rely on glibc + internals. */ +#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN +# define _IO_IN_BACKUP 0x100 +#endif /* BSD stdio derived implementations. */ @@ -54,25 +60,79 @@ # define _flags pub._flags # define _r pub._r # define _w pub._w +# elif defined __ANDROID__ /* Android */ + /* Up to this commit from 2015-10-12 + + the innards of FILE were public, and fp_ub could be defined like for OpenBSD, + see + and . + After this commit, the innards of FILE are hidden. */ +# define fp_ ((struct { unsigned char *_p; \ + int _r; \ + int _w; \ + int _flags; \ + int _file; \ + struct { unsigned char *_base; size_t _size; } _bf; \ + int _lbfsize; \ + void *_cookie; \ + void *_close; \ + void *_read; \ + void *_seek; \ + void *_write; \ + struct { unsigned char *_base; size_t _size; } _ext; \ + unsigned char *_up; \ + int _ur; \ + unsigned char _ubuf[3]; \ + unsigned char _nbuf[1]; \ + struct { unsigned char *_base; size_t _size; } _lb; \ + int _blksize; \ + fpos_t _offset; \ + /* More fields, not relevant here. */ \ + } *) fp) # else # define fp_ fp # endif -# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Minix 3, Android */ +# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */ /* See - and */ + and + and */ struct __sfileext { struct __sbuf _ub; /* ungetc buffer */ /* More fields, not relevant here. */ }; # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub -# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */ +# elif defined __ANDROID__ /* Android */ + struct __sfileext + { + struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */ + /* More fields, not relevant here. */ + }; +# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub +# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */ # define fp_ub fp_->_ub # endif # define HASUB(fp) (fp_ub._base != NULL) +# if defined __ANDROID__ /* Android */ + /* Needed after this commit from 2016-01-25 + */ +# ifndef __SEOF +# define __SLBF 1 +# define __SNBF 2 +# define __SRD 4 +# define __SWR 8 +# define __SRW 0x10 +# define __SEOF 0x20 +# define __SERR 0x40 +# endif +# ifndef __SOFF +# define __SOFF 0x1000 +# endif +# endif + #endif @@ -112,7 +172,7 @@ # define _flag __flag # endif -#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* newer Windows with MSVC */ +#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */ /* does not define the innards of FILE any more. */ # define WINDOWS_OPAQUE_FILE diff -Nru wget-1.19.5/lib/stdio.in.h wget-1.20.1/lib/stdio.in.h --- wget-1.19.5/lib/stdio.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/stdio.in.h 2018-12-26 20:08:19.000000000 +0000 @@ -122,7 +122,7 @@ it before we #define perror rpl_perror. */ /* But in any case avoid namespace pollution on glibc systems. */ #if (@GNULIB_PERROR@ || defined GNULIB_POSIXCHECK) \ - && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ + && (defined _WIN32 && ! defined __CYGWIN__) \ && ! defined __GLIBC__ # include #endif @@ -133,7 +133,7 @@ it before we #define rename rpl_rename. */ /* But in any case avoid namespace pollution on glibc systems. */ #if (@GNULIB_REMOVE@ || @GNULIB_RENAME@ || defined GNULIB_POSIXCHECK) \ - && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ + && (defined _WIN32 && ! defined __CYGWIN__) \ && ! defined __GLIBC__ # include #endif diff -Nru wget-1.19.5/lib/stdio-write.c wget-1.20.1/lib/stdio-write.c --- wget-1.19.5/lib/stdio-write.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/stdio-write.c 2018-12-26 20:08:19.000000000 +0000 @@ -30,7 +30,7 @@ error EINVAL. This write() function is at the basis of the function which flushes the buffer of a FILE stream. */ -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ # include # include diff -Nru wget-1.19.5/lib/stdlib.in.h wget-1.20.1/lib/stdlib.in.h --- wget-1.19.5/lib/stdlib.in.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/stdlib.in.h 2018-12-26 20:08:19.000000000 +0000 @@ -47,11 +47,14 @@ /* Solaris declares getloadavg() in . */ #if (@GNULIB_GETLOADAVG@ || defined GNULIB_POSIXCHECK) && @HAVE_SYS_LOADAVG_H@ +/* OpenIndiana has a bug: must be included before + . */ +# include # include #endif /* Native Windows platforms declare mktemp() in . */ -#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) +#if 0 && (defined _WIN32 && ! defined __CYGWIN__) # include #endif @@ -87,9 +90,10 @@ # endif #endif -#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) +#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_MKOSTEMP@ || @GNULIB_MKOSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !(defined _WIN32 && ! defined __CYGWIN__) /* On Mac OS X 10.3, only declares mkstemp. */ /* On Mac OS X 10.5, only declares mkstemps. */ +/* On Mac OS X 10.13, only declares mkostemp and mkostemps. */ /* On Cygwin 1.7.1, only declares getsubopt. */ /* But avoid namespace pollution on glibc systems and native Windows. */ # include diff -Nru wget-1.19.5/lib/strerror_r.c wget-1.20.1/lib/strerror_r.c --- wget-1.19.5/lib/strerror_r.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/strerror_r.c 2018-12-26 20:08:19.000000000 +0000 @@ -61,7 +61,7 @@ # define USE_SYSTEM_STRERROR 1 -# if defined __NetBSD__ || defined __hpux || ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __sgi || (defined __sun && !defined _LP64) || defined __CYGWIN__ +# if defined __NetBSD__ || defined __hpux || (defined _WIN32 && !defined __CYGWIN__) || defined __sgi || (defined __sun && !defined _LP64) || defined __CYGWIN__ /* No locking needed. */ @@ -258,7 +258,7 @@ /* Try to do what strerror (errnum) does, but without clobbering the buffer used by strerror(). */ -# if defined __NetBSD__ || defined __hpux || ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __CYGWIN__ /* NetBSD, HP-UX, native Windows, Cygwin */ +# if defined __NetBSD__ || defined __hpux || (defined _WIN32 && !defined __CYGWIN__) || defined __CYGWIN__ /* NetBSD, HP-UX, native Windows, Cygwin */ /* NetBSD: sys_nerr, sys_errlist are declared through _NETBSD_SOURCE and above. @@ -335,7 +335,7 @@ #endif -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +#if 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. */ diff -Nru wget-1.19.5/lib/strpbrk.c wget-1.20.1/lib/strpbrk.c --- wget-1.19.5/lib/strpbrk.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/strpbrk.c 2018-12-26 20:08:19.000000000 +0000 @@ -22,7 +22,9 @@ #include #include -#undef strpbrk +#if _LIBC +# undef strpbrk +#endif /* Find the first occurrence in S of any character in ACCEPT. */ char * diff -Nru wget-1.19.5/lib/strtol.c wget-1.20.1/lib/strtol.c --- wget-1.19.5/lib/strtol.c 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/strtol.c 2018-12-26 20:08:19.000000000 +0000 @@ -117,35 +117,6 @@ # define STRTOL_LONG_MIN LLONG_MIN # define STRTOL_LONG_MAX LLONG_MAX # define STRTOL_ULONG_MAX ULLONG_MAX - -/* The extra casts in the following macros work around compiler bugs, - e.g., in Cray C 5.0.3.0. */ - -/* True if the arithmetic type T is signed. */ -# define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) - -/* Minimum and maximum values for integer types. - These macros have undefined behavior for signed types that either - have padding bits or do not use two's complement. If this is a - problem for you, please let us know how to fix it for your host. */ - -/* The maximum and minimum values for the integer type T. */ -# define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) -# define TYPE_MAXIMUM(t) \ - ((t) (! TYPE_SIGNED (t) \ - ? (t) -1 \ - : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) - -# ifndef ULLONG_MAX -# define ULLONG_MAX TYPE_MAXIMUM (unsigned long long) -# endif -# ifndef LLONG_MAX -# define LLONG_MAX TYPE_MAXIMUM (long long int) -# endif -# ifndef LLONG_MIN -# define LLONG_MIN TYPE_MINIMUM (long long int) -# endif - # if __GNUC__ == 2 && __GNUC_MINOR__ < 7 /* Work around gcc bug with using this constant. */ static const unsigned long long int maxquad = ULLONG_MAX; diff -Nru wget-1.19.5/lib/sys-limits.h wget-1.20.1/lib/sys-limits.h --- wget-1.19.5/lib/sys-limits.h 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/lib/sys-limits.h 2018-12-26 20:08:19.000000000 +0000 @@ -0,0 +1,42 @@ +/* System call limits + + Copyright 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 _SYS_LIMITS_H +#define _SYS_LIMITS_H + +#include + +/* Maximum number of bytes to read or write in a single system call. + This can be useful for system calls like sendfile on GNU/Linux, + which do not handle more than MAX_RW_COUNT bytes correctly. + The Linux kernel MAX_RW_COUNT is at least INT_MAX >> 20 << 20, + where the 20 comes from the Hexagon port with 1 MiB pages; use that + as an approximation, as the exact value may not be available to us. + + Using this also works around a serious Linux bug before 2.6.16; see + . + + Using this also works around a Tru64 5.1 bug, where attempting + to read INT_MAX bytes fails with errno == EINVAL. See + . + + Using this is likely to work around similar bugs in other operating + systems. */ + +enum { SYS_BUFSIZE_MAX = INT_MAX >> 20 << 20 }; + +#endif diff -Nru wget-1.19.5/lib/sys_socket.in.h wget-1.20.1/lib/sys_socket.in.h --- wget-1.19.5/lib/sys_socket.in.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/sys_socket.in.h 2018-12-26 20:08:19.000000000 +0000 @@ -215,6 +215,15 @@ #endif +/* Ensure SO_REUSEPORT is defined. */ +/* For the subtle differences between SO_REUSEPORT and SO_REUSEADDR, see + https://stackoverflow.com/questions/14388706/socket-options-so-reuseaddr-and-so-reuseport-how-do-they-differ-do-they-mean-t + and https://lwn.net/Articles/542629/ + */ +#ifndef SO_REUSEPORT +# define SO_REUSEPORT SO_REUSEADDR +#endif + /* Fix some definitions from . */ #if @HAVE_WINSOCK2_H@ diff -Nru wget-1.19.5/lib/sys_stat.in.h wget-1.20.1/lib/sys_stat.in.h --- wget-1.19.5/lib/sys_stat.in.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/sys_stat.in.h 2018-12-26 20:08:19.000000000 +0000 @@ -57,13 +57,13 @@ /* Before doing "#define mkdir rpl_mkdir" below, we need to include all headers that may declare mkdir(). Native Windows platforms declare mkdir in and/or , not in . */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # include /* mingw32, mingw64 */ # include /* mingw64, MSVC 9 */ #endif /* Native Windows platforms declare umask() in . */ -#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) +#if 0 && (defined _WIN32 && ! defined __CYGWIN__) # include #endif @@ -576,7 +576,7 @@ Additionally, it declares _mkdir (and depending on compile flags, an alias mkdir), only in the nonstandard includes and , which are included above. */ -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ # if !GNULIB_defined_rpl_mkdir static int diff -Nru wget-1.19.5/lib/sys_types.in.h wget-1.20.1/lib/sys_types.in.h --- wget-1.19.5/lib/sys_types.in.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/sys_types.in.h 2018-12-26 20:08:19.000000000 +0000 @@ -20,6 +20,17 @@ #endif @PRAGMA_COLUMNS@ +#if defined _WIN32 && !defined __CYGWIN__ \ + && (defined __need_off_t || defined __need___off64_t \ + || defined __need_ssize_t || defined __need_time_t) + +/* Special invocation convention inside mingw header files. */ + +#@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@ + +#else +/* Normal invocation convention. */ + #ifndef _@GUARD_PREFIX@_SYS_TYPES_H /* The include_next requires a split double-inclusion guard. */ @@ -86,10 +97,10 @@ /* MSVC 9 defines size_t in , not in . */ /* But avoid namespace pollution on glibc systems. */ -#if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ - && ! defined __GLIBC__ +#if (defined _WIN32 && ! defined __CYGWIN__) && ! defined __GLIBC__ # include #endif #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */ #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */ +#endif /* __need_XXX */ diff -Nru wget-1.19.5/lib/sys_wait.in.h wget-1.20.1/lib/sys_wait.in.h --- wget-1.19.5/lib/sys_wait.in.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/sys_wait.in.h 2018-12-26 20:08:19.000000000 +0000 @@ -23,7 +23,7 @@ @PRAGMA_COLUMNS@ /* The include_next requires a split double-inclusion guard. */ -#if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) +#if !(defined _WIN32 && ! defined __CYGWIN__) # @INCLUDE_NEXT@ @NEXT_SYS_WAIT_H@ #endif @@ -39,7 +39,7 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ -#if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) +#if !(defined _WIN32 && ! defined __CYGWIN__) /* Unix API. */ /* The following macros apply to an argument x, that is a status of a process, @@ -111,7 +111,7 @@ /* Declarations of functions. */ #if @GNULIB_WAITPID@ -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ _GL_FUNCDECL_SYS (waitpid, pid_t, (pid_t pid, int *statusp, int options)); # endif _GL_CXXALIAS_SYS (waitpid, pid_t, (pid_t pid, int *statusp, int options)); diff -Nru wget-1.19.5/lib/timegm.c wget-1.20.1/lib/timegm.c --- wget-1.19.5/lib/timegm.c 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/timegm.c 2018-12-26 20:08:19.000000000 +0000 @@ -1,20 +1,21 @@ /* Convert UTC calendar time to simple time. Like mktime but assumes UTC. - Copyright (C) 1994, 1997, 2003-2004, 2006-2007, 2009-2018 Free Software - Foundation, Inc. This file is part of the GNU C Library. + Copyright (C) 1994-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 - 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. + 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 _LIBC # include @@ -22,14 +23,7 @@ #include -#ifdef _LIBC -typedef time_t mktime_offset_t; -#else -# undef __gmtime_r -# define __gmtime_r gmtime_r -# define __mktime_internal mktime_internal -# include "mktime-internal.h" -#endif +#include "mktime-internal.h" time_t timegm (struct tm *tmp) diff -Nru wget-1.19.5/lib/time.in.h wget-1.20.1/lib/time.in.h --- wget-1.19.5/lib/time.in.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/time.in.h 2018-12-26 20:08:19.000000000 +0000 @@ -48,7 +48,7 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ -/* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3). +/* Some systems don't define struct timespec (e.g., AIX 4.1). Or they define it with the wrong member names or define it in (e.g., FreeBSD circa 1997). Stock Mingw prior to 3.0 does not define it, but the pthreads-win32 library defines it in . */ @@ -212,7 +212,7 @@ # define localtime rpl_localtime # endif _GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer) - _GL_ARG_NONNULL ((1))); + _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer)); # else _GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer)); diff -Nru wget-1.19.5/lib/timespec.h wget-1.20.1/lib/timespec.h --- wget-1.19.5/lib/timespec.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/timespec.h 2018-12-26 20:08:19.000000000 +0000 @@ -17,9 +17,9 @@ along with this program. If not, see . */ #if ! defined TIMESPEC_H -# define TIMESPEC_H +#define TIMESPEC_H -# include +#include #ifndef _GL_INLINE_HEADER_BEGIN #error "Please include config.h first." @@ -33,13 +33,20 @@ extern "C" { #endif +#include "arg-nonnull.h" #include "verify.h" -/* Resolution of timespec timestamps (in units per second), and log - base 10 of the resolution. */ +/* Inverse resolution of timespec timestamps (in units per second), + and log base 10 of the inverse resolution. */ -enum { TIMESPEC_RESOLUTION = 1000000000 }; -enum { LOG10_TIMESPEC_RESOLUTION = 9 }; +enum { TIMESPEC_HZ = 1000000000 }; +enum { LOG10_TIMESPEC_HZ = 9 }; + +/* Obsolescent names for backward compatibility. + They are misnomers, because TIMESPEC_RESOLUTION is not a resolution. */ + +enum { TIMESPEC_RESOLUTION = TIMESPEC_HZ }; +enum { LOG10_TIMESPEC_RESOLUTION = LOG10_TIMESPEC_HZ }; /* Return a timespec with seconds S and nanoseconds NS. */ @@ -87,9 +94,9 @@ 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); + https://lists.gnu.org/r/bug-gnulib/2017-10/msg00006.html */ + assume (-1 <= a.tv_nsec && a.tv_nsec <= 2 * TIMESPEC_HZ); + assume (-1 <= b.tv_nsec && b.tv_nsec <= 2 * TIMESPEC_HZ); return a.tv_nsec - b.tv_nsec; } @@ -116,8 +123,9 @@ return a.tv_sec + a.tv_nsec / 1e9; } -void gettime (struct timespec *); -int settime (struct timespec const *); +struct timespec current_timespec (void); +void gettime (struct timespec *) _GL_ARG_NONNULL ((1)); +int settime (struct timespec const *) _GL_ARG_NONNULL ((1)); #ifdef __cplusplus } diff -Nru wget-1.19.5/lib/tmpdir.c wget-1.20.1/lib/tmpdir.c --- wget-1.19.5/lib/tmpdir.c 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/tmpdir.c 2018-12-26 20:08:19.000000000 +0000 @@ -42,7 +42,7 @@ #include -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include #endif @@ -60,7 +60,7 @@ /* Pathname support. ISSLASH(C) tests whether C is a directory separator character. */ -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ +#if defined _WIN32 || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ /* Native Windows, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') #else @@ -115,7 +115,7 @@ } if (dir == NULL) { -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ char dirbuf[PATH_MAX]; DWORD retval; diff -Nru wget-1.19.5/lib/unistd.in.h wget-1.20.1/lib/unistd.in.h --- wget-1.19.5/lib/unistd.in.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/unistd.in.h 2018-12-26 20:08:20.000000000 +0000 @@ -61,7 +61,7 @@ /* But avoid namespace pollution on glibc systems. */ #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \ || ((@GNULIB_UNLINK@ || defined GNULIB_POSIXCHECK) \ - && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) \ + && (defined _WIN32 && ! defined __CYGWIN__)) \ || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \ && defined __CYGWIN__)) \ && ! defined __GLIBC__ @@ -94,13 +94,13 @@ lseek(), read(), unlink(), write() in . */ #if ((@GNULIB_CHDIR@ || @GNULIB_GETCWD@ || @GNULIB_RMDIR@ \ || defined GNULIB_POSIXCHECK) \ - && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + && (defined _WIN32 && ! defined __CYGWIN__)) # include /* mingw32, mingw64 */ # include /* mingw64, MSVC 9 */ #elif (@GNULIB_CLOSE@ || @GNULIB_DUP@ || @GNULIB_DUP2@ || @GNULIB_ISATTY@ \ || @GNULIB_LSEEK@ || @GNULIB_READ@ || @GNULIB_UNLINK@ || @GNULIB_WRITE@ \ || defined GNULIB_POSIXCHECK) \ - && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) + && (defined _WIN32 && ! defined __CYGWIN__) # include #endif @@ -400,6 +400,13 @@ #if @GNULIB_ENVIRON@ +# if defined __CYGWIN__ && !defined __i386__ +/* The 'environ' variable is defined in a DLL. Therefore its declaration needs + the '__declspec(dllimport)' attribute, but the system's lacks it. + This leads to a link error on 64-bit Cygwin when the option + -Wl,--disable-auto-import is in use. */ +_GL_EXTERN_C __declspec(dllimport) char **environ; +# endif # if !@HAVE_DECL_ENVIRON@ /* Set of environment variables and values. An array of strings of the form "VARIABLE=VALUE", terminated with a NULL. */ @@ -425,12 +432,12 @@ #elif defined GNULIB_POSIXCHECK # if HAVE_RAW_DECL_ENVIRON _GL_UNISTD_INLINE char *** +_GL_WARN_ON_USE_ATTRIBUTE ("environ is unportable - " + "use gnulib module environ for portability") rpl_environ (void) { return &environ; } -_GL_WARN_ON_USE (rpl_environ, "environ is unportable - " - "use gnulib module environ for portability"); # undef environ # define environ (*rpl_environ ()) # endif @@ -928,6 +935,36 @@ #endif +#if @GNULIB_GETPASS@ +/* Function getpass() from module 'getpass': + Read a password from /dev/tty or stdin. + Function getpass() from module 'getpass-gnu': + Read a password of arbitrary length from /dev/tty or stdin. */ +# if @REPLACE_GETPASS@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getpass +# define getpass rpl_getpass +# endif +_GL_FUNCDECL_RPL (getpass, char *, (const char *prompt) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (getpass, char *, (const char *prompt)); +# else +# if !@HAVE_GETPASS@ +_GL_FUNCDECL_SYS (getpass, char *, (const char *prompt) + _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (getpass, char *, (const char *prompt)); +# endif +_GL_CXXALIASWARN (getpass); +#elif defined GNULIB_POSIXCHECK +# undef getpass +# if HAVE_RAW_DECL_GETPASS +_GL_WARN_ON_USE (getpass, "getpass is unportable - " + "use gnulib module getpass or getpass-gnu for portability"); +# endif +#endif + + #if @GNULIB_GETUSERSHELL@ /* Return the next valid login shell on the system, or NULL when the end of the list has been reached. */ @@ -1482,7 +1519,7 @@ _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length)); # else -# if !@HAVE_TRUNCATE@ +# if !@HAVE_DECL_TRUNCATE@ _GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length) _GL_ARG_NONNULL ((1))); # endif diff -Nru wget-1.19.5/lib/utime.c wget-1.20.1/lib/utime.c --- wget-1.19.5/lib/utime.c 2018-01-19 21:19:16.000000000 +0000 +++ wget-1.20.1/lib/utime.c 2018-12-26 20:08:20.000000000 +0000 @@ -21,7 +21,7 @@ /* Specification. */ #include -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # include # include diff -Nru wget-1.19.5/lib/utime.in.h wget-1.20.1/lib/utime.in.h --- wget-1.19.5/lib/utime.in.h 2018-01-19 21:19:16.000000000 +0000 +++ wget-1.20.1/lib/utime.in.h 2018-12-26 20:08:20.000000000 +0000 @@ -45,7 +45,7 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Define 'struct utimbuf' as an alias of 'struct _utimbuf' (or possibly, if present, 'struct __utimbuf64'). */ diff -Nru wget-1.19.5/lib/utimens.c wget-1.20.1/lib/utimens.c --- wget-1.19.5/lib/utimens.c 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/utimens.c 2018-12-26 20:08:20.000000000 +0000 @@ -39,8 +39,7 @@ 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) +#if defined _WIN32 && ! defined __CYGWIN__ && ! defined EMACS_CONFIGURATION # define USE_SETFILETIME # define WIN32_LEAN_AND_MEAN # include @@ -92,11 +91,11 @@ if ((timespec[0].tv_nsec != UTIME_NOW && timespec[0].tv_nsec != UTIME_OMIT && ! (0 <= timespec[0].tv_nsec - && timespec[0].tv_nsec < TIMESPEC_RESOLUTION)) + && timespec[0].tv_nsec < TIMESPEC_HZ)) || (timespec[1].tv_nsec != UTIME_NOW && timespec[1].tv_nsec != UTIME_OMIT && ! (0 <= timespec[1].tv_nsec - && timespec[1].tv_nsec < TIMESPEC_RESOLUTION))) + && timespec[1].tv_nsec < TIMESPEC_HZ))) { errno = EINVAL; return -1; diff -Nru wget-1.19.5/lib/vasnprintf.c wget-1.20.1/lib/vasnprintf.c --- wget-1.19.5/lib/vasnprintf.c 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/vasnprintf.c 2018-12-26 20:08:20.000000000 +0000 @@ -860,7 +860,9 @@ size_t a_len = a.nlimbs; /* 0.03345 is slightly larger than log(2)/(9*log(10)). */ size_t c_len = 9 * ((size_t)(a_len * (GMP_LIMB_BITS * 0.03345f)) + 1); - char *c_ptr = (char *) malloc (xsum (c_len, extra_zeroes)); + /* We need extra_zeroes bytes for zeroes, followed by c_len bytes for the + digits of a, followed by 1 byte for the terminating NUL. */ + char *c_ptr = (char *) malloc (xsum (xsum (extra_zeroes, c_len), 1)); if (c_ptr != NULL) { char *d_ptr = c_ptr; @@ -2694,7 +2696,7 @@ errno = EILSEQ; return NULL; } - if (precision < count) + if (precision < (unsigned int) count) break; arg_end++; characters += count; @@ -4243,7 +4245,7 @@ static const wchar_t decimal_format[] = /* Produce the same number of exponent digits as the native printf implementation. */ -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ { '%', '+', '.', '3', 'd', '\0' }; # else { '%', '+', '.', '2', 'd', '\0' }; @@ -4257,7 +4259,7 @@ static const char decimal_format[] = /* Produce the same number of exponent digits as the native printf implementation. */ -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ "%+.3d"; # else "%+.2d"; @@ -4436,7 +4438,7 @@ static const wchar_t decimal_format[] = /* Produce the same number of exponent digits as the native printf implementation. */ -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ { '%', '+', '.', '3', 'd', '\0' }; # else { '%', '+', '.', '2', 'd', '\0' }; @@ -4450,7 +4452,7 @@ static const char decimal_format[] = /* Produce the same number of exponent digits as the native printf implementation. */ -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ "%+.3d"; # else "%+.2d"; @@ -4508,7 +4510,7 @@ *p++ = '+'; /* Produce the same number of exponent digits as the native printf implementation. */ -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ *p++ = '0'; # endif *p++ = '0'; @@ -4836,7 +4838,7 @@ #if HAVE_LONG_LONG_INT case TYPE_LONGLONGINT: case TYPE_ULONGLONGINT: -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ *fbp++ = 'I'; *fbp++ = '6'; *fbp++ = '4'; @@ -4872,7 +4874,7 @@ # if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ && !defined __UCLIBC__) \ || (defined __APPLE__ && defined __MACH__) \ - || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + || (defined _WIN32 && ! defined __CYGWIN__)) fbp[1] = '%'; fbp[2] = 'n'; fbp[3] = '\0'; @@ -5125,7 +5127,7 @@ { /* Verify that snprintf() has NUL-terminated its result. */ - if (count < maxlen + if ((unsigned int) count < maxlen && ((TCHAR_T *) (result + length)) [count] != '\0') abort (); /* Portability hack. */ diff -Nru wget-1.19.5/lib/verify.h wget-1.20.1/lib/verify.h --- wget-1.19.5/lib/verify.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/verify.h 2018-12-26 20:08:20.000000000 +0000 @@ -276,7 +276,8 @@ when 'assume' silences warnings even with older GCCs. */ # define assume(R) ((R) ? (void) 0 : __builtin_trap ()) #else -# define assume(R) ((void) (0 && (R))) + /* Some tools grok NOTREACHED, e.g., Oracle Studio 12.6. */ +# define assume(R) ((R) ? (void) 0 : /*NOTREACHED*/ (void) 0) #endif /* @assert.h omit end@ */ diff -Nru wget-1.19.5/lib/wait-process.c wget-1.20.1/lib/wait-process.c --- wget-1.19.5/lib/wait-process.c 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/wait-process.c 2018-12-26 20:08:20.000000000 +0000 @@ -39,7 +39,7 @@ #define SIZEOF(a) (sizeof(a) / sizeof(a[0])) -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN # include diff -Nru wget-1.19.5/lib/warn-on-use.h wget-1.20.1/lib/warn-on-use.h --- wget-1.19.5/lib/warn-on-use.h 2018-01-19 21:19:17.000000000 +0000 +++ wget-1.20.1/lib/warn-on-use.h 2018-12-26 20:08:20.000000000 +0000 @@ -20,23 +20,32 @@ 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 + _GL_WARN_ON_USE_ATTRIBUTE ("literal string") expands to the + attribute used in _GL_WARN_ON_USE. If the compiler does not support + this feature, it expands to empty. + + These macros are 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. + instead. + _GL_WARN_ON_USE is for functions with 'extern' linkage. + _GL_WARN_ON_USE_ATTRIBUTE is for functions with 'static' or 'inline' + linkage. + + 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 ]], @@ -54,12 +63,21 @@ (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 + #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 + or better (avoiding contradictory use of 'static' and 'extern'): + #if HAVE_RAW_DECL_ENVIRON + static char *** + _GL_WARN_ON_USE_ATTRIBUTE ("environ is not always properly declared") + rpl_environ (void) { return &environ; } + # undef environ + # define environ (*rpl_environ ()) + #endif */ #ifndef _GL_WARN_ON_USE @@ -67,13 +85,17 @@ /* 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))) +# define _GL_WARN_ON_USE_ATTRIBUTE(message) \ + __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 +# define _GL_WARN_ON_USE_ATTRIBUTE(message) # else /* Unsupported. */ # define _GL_WARN_ON_USE(function, message) \ _GL_WARN_EXTERN_C int _gl_warn_on_use +# define _GL_WARN_ON_USE_ATTRIBUTE(message) # endif #endif diff -Nru wget-1.19.5/lib/wctype.in.h wget-1.20.1/lib/wctype.in.h --- wget-1.19.5/lib/wctype.in.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/wctype.in.h 2018-12-26 20:08:20.000000000 +0000 @@ -60,7 +60,7 @@ 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__ +#if defined _WIN32 && ! defined __CYGWIN__ # include # include #endif diff -Nru wget-1.19.5/lib/wcwidth.c wget-1.20.1/lib/wcwidth.c --- wget-1.19.5/lib/wcwidth.c 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/wcwidth.c 2018-12-26 20:08:20.000000000 +0000 @@ -26,17 +26,40 @@ #include "streq.h" #include "uniwidth.h" +/* Returns 1 if the current locale is an UTF-8 locale, 0 otherwise. */ +static inline int +is_locale_utf8 (void) +{ + const char *encoding = locale_charset (); + return STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0); +} + +#if GNULIB_WCHAR_SINGLE +/* When we know that the locale does not change, provide a speedup by + caching the value of is_locale_utf8. */ +static int cached_is_locale_utf8 = -1; +static inline int +is_locale_utf8_cached (void) +{ + if (cached_is_locale_utf8 < 0) + cached_is_locale_utf8 = is_locale_utf8 (); + return cached_is_locale_utf8; +} +#else +/* By default, don't make assumptions, hence no caching. */ +# define is_locale_utf8_cached is_locale_utf8 +#endif + int wcwidth (wchar_t wc) #undef wcwidth { /* In UTF-8 locales, use a Unicode aware width function. */ - const char *encoding = locale_charset (); - if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0)) + if (is_locale_utf8_cached ()) { /* We assume that in a UTF-8 locale, a wide character is the same as a Unicode character. */ - return uc_width (wc, encoding); + return uc_width (wc, "UTF-8"); } else { diff -Nru wget-1.19.5/lib/write.c wget-1.20.1/lib/write.c --- wget-1.19.5/lib/write.c 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/write.c 2018-12-26 20:08:20.000000000 +0000 @@ -25,7 +25,7 @@ GetLastError() = ERROR_NO_DATA, and write() in consequence fails with error EINVAL. */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # include # include diff -Nru wget-1.19.5/lib/xalloc.h wget-1.20.1/lib/xalloc.h --- wget-1.19.5/lib/xalloc.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/xalloc.h 2018-12-26 20:08:20.000000000 +0000 @@ -36,12 +36,6 @@ #endif -#if __GNUC__ >= 3 -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -#else -# define _GL_ATTRIBUTE_MALLOC -#endif - #if ! defined __clang__ && \ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) # define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) diff -Nru wget-1.19.5/lib/xstrndup.h wget-1.20.1/lib/xstrndup.h --- wget-1.19.5/lib/xstrndup.h 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/lib/xstrndup.h 2018-12-26 20:08:20.000000000 +0000 @@ -20,4 +20,4 @@ /* Return a newly allocated copy of at most N bytes of STRING. In other words, return a copy of the initial segment of length N of STRING. */ -extern char *xstrndup (const char *string, size_t n); +extern char *xstrndup (const char *string, size_t n) _GL_ATTRIBUTE_MALLOC; diff -Nru wget-1.19.5/m4/af_alg.m4 wget-1.20.1/m4/af_alg.m4 --- wget-1.19.5/m4/af_alg.m4 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/m4/af_alg.m4 2018-12-26 20:08:20.000000000 +0000 @@ -0,0 +1,56 @@ +# af_alg.m4 serial 4 +dnl Copyright 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 Matteo Croce. + +AC_DEFUN_ONCE([gl_AF_ALG], +[ + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + AC_REQUIRE([AC_C_INLINE]) + + dnl Check whether linux/if_alg.h has needed features. + AC_CACHE_CHECK([whether linux/if_alg.h has struct sockaddr_alg.], + [gl_cv_header_linux_if_alg_salg], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include + #include + struct sockaddr_alg salg = { + .salg_family = AF_ALG, + .salg_type = "hash", + .salg_name = "sha1", + };]])], + [gl_cv_header_linux_if_alg_salg=yes], + [gl_cv_header_linux_if_alg_salg=no])]) + if test "$gl_cv_header_linux_if_alg_salg" = yes; then + AC_DEFINE([HAVE_LINUX_IF_ALG_H], [1], + [Define to 1 if you have 'struct sockaddr_alg' defined.]) + fi + + dnl The default is to not use AF_ALG if available, + dnl as it's system dependent as to whether the kernel + dnl routines are faster than libcrypto for example. + use_af_alg=no + AC_ARG_WITH([linux-crypto], + [AS_HELP_STRING([[--with-linux-crypto]], + [use Linux kernel cryptographic API (if available)])], + [use_af_alg=$withval], + [use_af_alg=no]) + dnl We cannot use it if it is not available. + if test "$gl_cv_header_linux_if_alg_salg" != yes; then + if test "$use_af_alg" != no; then + AC_MSG_WARN([Linux kernel cryptographic API not found]) + fi + use_af_alg=no + fi + + if test "$use_af_alg" != no; then + USE_AF_ALG=1 + else + USE_AF_ALG=0 + fi + AC_DEFINE_UNQUOTED([USE_LINUX_CRYPTO_API], [$USE_AF_ALG], + [Define to 1 if you want to use the Linux kernel cryptographic API.]) +]) diff -Nru wget-1.19.5/m4/asm-underscore.m4 wget-1.20.1/m4/asm-underscore.m4 --- wget-1.19.5/m4/asm-underscore.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/asm-underscore.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# asm-underscore.m4 serial 3 +# asm-underscore.m4 serial 4 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, @@ -14,6 +14,7 @@ AC_DEFUN([gl_ASM_SYMBOL_PREFIX], [ + AC_REQUIRE([AC_PROG_EGREP]) dnl We don't use GCC's __USER_LABEL_PREFIX__ here, because dnl 1. It works only for GCC. dnl 2. It is incorrectly defined on some platforms, in some GCC versions. @@ -29,7 +30,7 @@ EOF # Look for the assembly language name 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 '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then + if LC_ALL=C $EGREP '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then gl_cv_prog_as_underscore=yes else gl_cv_prog_as_underscore=no diff -Nru wget-1.19.5/m4/byteswap.m4 wget-1.20.1/m4/byteswap.m4 --- wget-1.19.5/m4/byteswap.m4 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/m4/byteswap.m4 2018-12-26 20:08:20.000000000 +0000 @@ -0,0 +1,19 @@ +# byteswap.m4 serial 4 +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. + +dnl Written by Oskar Liljeblad. + +AC_DEFUN([gl_BYTESWAP], +[ + dnl Prerequisites of lib/byteswap.in.h. + AC_CHECK_HEADERS([byteswap.h], [ + BYTESWAP_H='' + ], [ + BYTESWAP_H='byteswap.h' + ]) + AC_SUBST([BYTESWAP_H]) + AM_CONDITIONAL([GL_GENERATE_BYTESWAP_H], [test -n "$BYTESWAP_H"]) +]) diff -Nru wget-1.19.5/m4/configmake.m4 wget-1.20.1/m4/configmake.m4 --- wget-1.19.5/m4/configmake.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/configmake.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -# configmake.m4 serial 2 -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. - -# gl_CONFIGMAKE_PREP -# ------------------ -# Guarantee all of the standard directory variables, even when used with -# autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir -# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b, -# and runstatedir in 1.14.1). -AC_DEFUN([gl_CONFIGMAKE_PREP], -[ - dnl Technically, datadir should default to datarootdir. But if - dnl autoconf is too old to provide datarootdir, then reversing the - dnl definition is a reasonable compromise. Only AC_SUBST a variable - dnl if it was not already defined earlier by autoconf. - if test "x$datarootdir" = x; then - AC_SUBST([datarootdir], ['${datadir}']) - fi - dnl Copy the approach used in autoconf 2.60. - if test "x$docdir" = x; then - AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], - ['${datarootdir}/doc/${PACKAGE_TARNAME}'], - ['${datarootdir}/doc/${PACKAGE}'])]) - fi - dnl The remaining variables missing from autoconf 2.59 are easier. - if test "x$htmldir" = x; then - AC_SUBST([htmldir], ['${docdir}']) - fi - if test "x$dvidir" = x; then - AC_SUBST([dvidir], ['${docdir}']) - fi - if test "x$pdfdir" = x; then - AC_SUBST([pdfdir], ['${docdir}']) - fi - if test "x$psdir" = x; then - AC_SUBST([psdir], ['${docdir}']) - fi - if test "x$lispdir" = x; then - AC_SUBST([lispdir], ['${datarootdir}/emacs/site-lisp']) - fi - if test "x$localedir" = x; then - AC_SUBST([localedir], ['${datarootdir}/locale']) - fi - dnl Added in autoconf 2.70 - if test "x$runstatedir" = x; then - AC_SUBST([runstatedir], ['${localstatedir}/run']) - fi - - dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely - dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe. - AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}']) -]) diff -Nru wget-1.19.5/m4/environ.m4 wget-1.20.1/m4/environ.m4 --- wget-1.19.5/m4/environ.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/environ.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# environ.m4 serial 6 +# environ.m4 serial 7 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, @@ -29,16 +29,14 @@ AC_DEFUN([gt_CHECK_VAR_DECL], [ define([gt_cv_var], [gt_cv_var_]$2[_declaration]) - AC_MSG_CHECKING([if $2 is properly declared]) - AC_CACHE_VAL([gt_cv_var], [ - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[$1 - extern struct { int foo; } $2;]], - [[$2.foo = 1;]])], - [gt_cv_var=no], - [gt_cv_var=yes])]) - AC_MSG_RESULT([$gt_cv_var]) + AC_CACHE_CHECK([if $2 is properly declared], [gt_cv_var], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[$1 + extern struct { int foo; } $2;]], + [[$2.foo = 1;]])], + [gt_cv_var=no], + [gt_cv_var=yes])]) if test $gt_cv_var = yes; then AC_DEFINE([HAVE_]m4_translit($2, [a-z], [A-Z])[_DECL], 1, [Define if you have the declaration of $2.]) diff -Nru wget-1.19.5/m4/errno_h.m4 wget-1.20.1/m4/errno_h.m4 --- wget-1.19.5/m4/errno_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/errno_h.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,9 +1,11 @@ -# errno_h.m4 serial 12 +# errno_h.m4 serial 13 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. +AC_PREREQ([2.61]) + AC_DEFUN_ONCE([gl_HEADER_ERRNO_H], [ AC_REQUIRE([AC_PROG_CC]) @@ -129,9 +131,3 @@ AC_SUBST($1[_VALUE]) fi ]) - -dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. -dnl Remove this when we can assume autoconf >= 2.61. -m4_ifdef([AC_COMPUTE_INT], [], [ - AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) -]) diff -Nru wget-1.19.5/m4/extensions.m4 wget-1.20.1/m4/extensions.m4 --- wget-1.19.5/m4/extensions.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/extensions.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# serial 17 -*- Autoconf -*- +# serial 18 -*- Autoconf -*- # Enable extensions on systems that normally disable them. # Copyright (C) 2003, 2006-2018 Free Software Foundation, Inc. @@ -118,6 +118,11 @@ #ifndef _XOPEN_SOURCE # undef _XOPEN_SOURCE #endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif /* Enable general extensions on Solaris. */ #ifndef __EXTENSIONS__ # undef __EXTENSIONS__ @@ -163,6 +168,7 @@ [ac_cv_should_define__xopen_source=yes])])]) test $ac_cv_should_define__xopen_source = yes && AC_DEFINE([_XOPEN_SOURCE], [500]) + AC_DEFINE([_HPUX_ALT_XOPEN_SOCKET_API]) ])# AC_USE_SYSTEM_EXTENSIONS # gl_USE_SYSTEM_EXTENSIONS diff -Nru wget-1.19.5/m4/extern-inline.m4 wget-1.20.1/m4/extern-inline.m4 --- wget-1.19.5/m4/extern-inline.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/extern-inline.m4 2018-12-26 20:08:20.000000000 +0000 @@ -25,7 +25,8 @@ if isdigit is mistakenly implemented via a static inline function, a program containing an extern inline function that calls isdigit may not work since the C standard prohibits extern inline functions - from calling static functions. This bug is known to occur on: + from calling static functions (ISO C 99 section 6.7.4.(3). + This bug is known to occur on: OS X 10.8 and earlier; see: https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html @@ -38,7 +39,18 @@ OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and for clang but remains for g++; see . - Assume DragonFly and FreeBSD will be similar. */ + Assume DragonFly and FreeBSD will be similar. + + GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 + inline semantics, unless -fgnu89-inline is used. It defines a macro + __GNUC_STDC_INLINE__ to indicate this situation or a macro + __GNUC_GNU_INLINE__ to indicate the opposite situation. + GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline + semantics but warns, unless -fgnu89-inline is used: + warning: C99 inline functions are not supported; using GNU89 + warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute + It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. + */ #if (((defined __APPLE__ && defined __MACH__) \ || defined __DragonFly__ || defined __FreeBSD__) \ && (defined __header_inline \ diff -Nru wget-1.19.5/m4/fcntl-o.m4 wget-1.20.1/m4/fcntl-o.m4 --- wget-1.19.5/m4/fcntl-o.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/fcntl-o.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# fcntl-o.m4 serial 5 +# fcntl-o.m4 serial 6 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, @@ -6,17 +6,15 @@ dnl Written by Paul Eggert. +AC_PREREQ([2.60]) + # Test whether the flags O_NOATIME and O_NOFOLLOW actually work. # Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise. # Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise. AC_DEFUN([gl_FCNTL_O_FLAGS], [ dnl Persuade glibc to define O_NOATIME and O_NOFOLLOW. - dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes - dnl AC_GNU_SOURCE. - m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], - [AC_REQUIRE([AC_GNU_SOURCE])]) + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CHECK_HEADERS_ONCE([unistd.h]) diff -Nru wget-1.19.5/m4/fflush.m4 wget-1.20.1/m4/fflush.m4 --- wget-1.19.5/m4/fflush.m4 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/m4/fflush.m4 2018-12-26 20:08:20.000000000 +0000 @@ -0,0 +1,99 @@ +# fflush.m4 serial 17 + +# 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. + +dnl From Eric Blake + +dnl Find out how to obey POSIX semantics of fflush(stdin) discarding +dnl unread input on seekable streams, rather than C99 undefined semantics. + +AC_DEFUN([gl_FUNC_FFLUSH], +[ + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + gl_FUNC_FFLUSH_STDIN + case "$gl_cv_func_fflush_stdin" in + *yes) ;; + *) REPLACE_FFLUSH=1 ;; + esac +]) + +dnl Determine whether fflush works on input streams. +dnl Sets gl_cv_func_fflush_stdin. + +AC_DEFUN([gl_FUNC_FFLUSH_STDIN], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CHECK_HEADERS_ONCE([unistd.h]) + AC_CACHE_CHECK([whether fflush works on input streams], + [gl_cv_func_fflush_stdin], + [echo hello world > conftest.txt + AC_RUN_IFELSE([AC_LANG_PROGRAM( + [[ +#include +#if HAVE_UNISTD_H +# include +#else /* on Windows with MSVC */ +# include +#endif + ]], [[FILE *f = fopen ("conftest.txt", "r"); + char buffer[10]; + int fd; + int c; + if (f == NULL) + return 1; + fd = fileno (f); + if (fd < 0 || fread (buffer, 1, 5, f) != 5) + { fclose (f); return 2; } + /* For deterministic results, ensure f read a bigger buffer. */ + if (lseek (fd, 0, SEEK_CUR) == 5) + { fclose (f); return 3; } + /* POSIX requires fflush-fseek to set file offset of fd. This fails + on BSD systems and on mingw. */ + if (fflush (f) != 0 || fseek (f, 0, SEEK_CUR) != 0) + { fclose (f); return 4; } + if (lseek (fd, 0, SEEK_CUR) != 5) + { fclose (f); return 5; } + /* Verify behaviour of fflush after ungetc. See + */ + /* Verify behaviour of fflush after a backup ungetc. This fails on + mingw. */ + c = fgetc (f); + ungetc (c, f); + fflush (f); + if (fgetc (f) != c) + { fclose (f); return 6; } + /* Verify behaviour of fflush after a non-backup ungetc. This fails + on glibc 2.8 and on BSD systems. */ + c = fgetc (f); + ungetc ('@', f); + fflush (f); + if (fgetc (f) != c) + { fclose (f); return 7; } + fclose (f); + return 0; + ]])], + [gl_cv_func_fflush_stdin=yes], + [gl_cv_func_fflush_stdin=no], + [case "$host_os" in + # Guess no on native Windows. + mingw*) gl_cv_func_fflush_stdin="guessing no" ;; + *) gl_cv_func_fflush_stdin=cross ;; + esac + ]) + rm conftest.txt + ]) + case "$gl_cv_func_fflush_stdin" in + *yes) gl_func_fflush_stdin=1 ;; + *no) gl_func_fflush_stdin=0 ;; + *) gl_func_fflush_stdin='(-1)' ;; + esac + AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin], + [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008, + 0 if fflush is known to not work, -1 if unknown.]) +]) + +# Prerequisites of lib/fflush.c. +AC_DEFUN([gl_PREREQ_FFLUSH], [:]) diff -Nru wget-1.19.5/m4/fnmatch_h.m4 wget-1.20.1/m4/fnmatch_h.m4 --- wget-1.19.5/m4/fnmatch_h.m4 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/m4/fnmatch_h.m4 2018-12-26 20:08:20.000000000 +0000 @@ -0,0 +1,75 @@ +# fnmatch_h.m4 serial 4 +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. + +dnl From Bruno Haible. + +AC_DEFUN_ONCE([gl_FNMATCH_H], +[ + AC_REQUIRE([gl_FNMATCH_H_DEFAULTS]) + m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) + AC_CHECK_HEADERS_ONCE([fnmatch.h]) + gl_CHECK_NEXT_HEADERS([fnmatch.h]) + + dnl Persuade glibc to declare FNM_CASEFOLD etc. + dnl This is only needed if gl_fnmatch_required = GNU. It would be possible + dnl to avoid this dependency for gl_FUNC_FNMATCH_POSIX by putting + dnl gl_FUNC_FNMATCH_GNU into a separate .m4 file. + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + if test $ac_cv_header_fnmatch_h = yes; then + HAVE_FNMATCH_H=1 + else + HAVE_FNMATCH_H=0 + fi + AC_SUBST([HAVE_FNMATCH_H]) + + m4_ifdef([gl_POSIXCHECK], + [FNMATCH_H=fnmatch.h], + [FNMATCH_H='' + if m4_ifdef([gl_ANSI_CXX], [test "$CXX" != no], [false]); then + dnl Override always, to support the C++ GNULIB_NAMESPACE. + FNMATCH_H=fnmatch.h + else + if test $ac_cv_header_fnmatch_h != yes; then + dnl Provide a substitute file. + FNMATCH_H=fnmatch.h + fi + fi + ]) + AC_SUBST([FNMATCH_H]) + AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_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 + ]], + [fnmatch]) +]) + +dnl Unconditionally enables the replacement of . +AC_DEFUN([gl_REPLACE_FNMATCH_H], +[ + AC_REQUIRE([gl_FNMATCH_H_DEFAULTS]) + FNMATCH_H='fnmatch.h' + AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"]) +]) + +AC_DEFUN([gl_FNMATCH_MODULE_INDICATOR], +[ + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_FNMATCH_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_FNMATCH_H_DEFAULTS], +[ + GNULIB_FNMATCH=0; AC_SUBST([GNULIB_FNMATCH]) + dnl Assume POSIX behavior unless another module says otherwise. + HAVE_FNMATCH=1; AC_SUBST([HAVE_FNMATCH]) + REPLACE_FNMATCH=0; AC_SUBST([REPLACE_FNMATCH]) +]) diff -Nru wget-1.19.5/m4/fnmatch.m4 wget-1.20.1/m4/fnmatch.m4 --- wget-1.19.5/m4/fnmatch.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/fnmatch.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# Check for fnmatch - serial 9. -*- coding: utf-8 -*- +# Check for fnmatch - serial 13. -*- coding: utf-8 -*- # Copyright (C) 2000-2007, 2009-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -13,124 +13,120 @@ [ m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX]) - dnl Persuade glibc to declare FNM_CASEFOLD etc. - dnl This is only needed if gl_fnmatch_required = GNU. It would be possible - dnl to avoid this dependency for gl_FUNC_FNMATCH_POSIX by putting - dnl gl_FUNC_FNMATCH_GNU into a separate .m4 file. - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - - FNMATCH_H= + AC_REQUIRE([gl_FNMATCH_H]) gl_fnmatch_required_lowercase=` echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]' ` - gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}" - AC_CACHE_CHECK([for working $gl_fnmatch_required fnmatch], - [$gl_fnmatch_cache_var], - [dnl Some versions of Solaris, SCO, and the GNU C Library - dnl have a broken or incompatible fnmatch. - dnl So we run a test program. If we are cross-compiling, take no chance. - dnl Thanks to John Oleynick, François Pinard, and Paul Eggert for this - dnl test. - if test $gl_fnmatch_required = GNU; then - gl_fnmatch_gnu_start= - gl_fnmatch_gnu_end= - else - gl_fnmatch_gnu_start='#if 0' - gl_fnmatch_gnu_end='#endif' - fi - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include - static int - y (char const *pattern, char const *string, int flags) - { - return fnmatch (pattern, string, flags) == 0; - } - static int - n (char const *pattern, char const *string, int flags) - { - return fnmatch (pattern, string, flags) == FNM_NOMATCH; - } - ]], - [[char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]"; - char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]"; - static char const A_1[] = { 'A' - 1, 0 }; - static char const A01[] = { 'A' + 1, 0 }; - static char const a_1[] = { 'a' - 1, 0 }; - static char const a01[] = { 'a' + 1, 0 }; - static char const bs_1[] = { '\\\\' - 1, 0 }; - static char const bs01[] = { '\\\\' + 1, 0 }; - int result = 0; - if (!n ("a*", "", 0)) - return 1; - if (!y ("a*", "abc", 0)) - return 1; - if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */ - return 1; - if (!n ("d*/*1", "d/s/1", FNM_PATHNAME)) - return 2; - if (!y ("a\\\\bc", "abc", 0)) - return 3; - if (!n ("a\\\\bc", "abc", FNM_NOESCAPE)) - return 3; - if (!y ("*x", ".x", 0)) - return 4; - if (!n ("*x", ".x", FNM_PERIOD)) - return 4; - if (!y (Apat, "\\\\", 0)) - return 5; - if (!y (Apat, "A", 0)) - return 5; - if (!y (apat, "\\\\", 0)) - return 5; - if (!y (apat, "a", 0)) - return 5; - if (!(n (Apat, A_1, 0) == ('A' < '\\\\'))) - return 5; - if (!(n (apat, a_1, 0) == ('a' < '\\\\'))) - return 5; - if (!(y (Apat, A01, 0) == ('A' < '\\\\'))) - return 5; - if (!(y (apat, a01, 0) == ('a' < '\\\\'))) - return 5; - if (!(y (Apat, bs_1, 0) == ('A' < '\\\\'))) - return 5; - if (!(y (apat, bs_1, 0) == ('a' < '\\\\'))) - return 5; - if (!(n (Apat, bs01, 0) == ('A' < '\\\\'))) - return 5; - if (!(n (apat, bs01, 0) == ('a' < '\\\\'))) - return 5; - $gl_fnmatch_gnu_start - if (!y ("xxXX", "xXxX", FNM_CASEFOLD)) - result |= 8; - if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)) - result |= 16; - if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME)) - result |= 32; - if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)) - result |= 64; - if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)) - result |= 64; - if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)) - result |= 64; - $gl_fnmatch_gnu_end - return result; - ]])], - [eval "$gl_fnmatch_cache_var=yes"], - [eval "$gl_fnmatch_cache_var=no"], - [eval "$gl_fnmatch_cache_var=\"guessing no\""]) - ]) - eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\"" - if test "$gl_fnmatch_result" = yes; then - dnl Not strictly necessary. Only to avoid spurious leftover files if people - dnl don't do "make distclean". - rm -f "$gl_source_base/fnmatch.h" + AC_CHECK_FUNCS_ONCE([fnmatch]) + if test $ac_cv_func_fnmatch = no; then + HAVE_FNMATCH=0 else - FNMATCH_H=fnmatch.h + gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}" + AC_CACHE_CHECK([for working $gl_fnmatch_required fnmatch], + [$gl_fnmatch_cache_var], + [dnl Some versions of Solaris, SCO, and the GNU C Library + dnl have a broken or incompatible fnmatch. + dnl So we run a test program. If we are cross-compiling, take no chance. + dnl Thanks to John Oleynick, François Pinard, and Paul Eggert for this + dnl test. + if test $gl_fnmatch_required = GNU; then + gl_fnmatch_gnu_start= + gl_fnmatch_gnu_end= + else + gl_fnmatch_gnu_start='#if 0' + gl_fnmatch_gnu_end='#endif' + fi + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + static int + y (char const *pattern, char const *string, int flags) + { + return fnmatch (pattern, string, flags) == 0; + } + static int + n (char const *pattern, char const *string, int flags) + { + return fnmatch (pattern, string, flags) == FNM_NOMATCH; + } + ]], + [[char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]"; + char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]"; + static char const A_1[] = { 'A' - 1, 0 }; + static char const A01[] = { 'A' + 1, 0 }; + static char const a_1[] = { 'a' - 1, 0 }; + static char const a01[] = { 'a' + 1, 0 }; + static char const bs_1[] = { '\\\\' - 1, 0 }; + static char const bs01[] = { '\\\\' + 1, 0 }; + int result = 0; + if (!n ("a*", "", 0)) + return 1; + if (!y ("a*", "abc", 0)) + return 1; + if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */ + return 1; + if (!n ("d*/*1", "d/s/1", FNM_PATHNAME)) + return 2; + if (!y ("a\\\\bc", "abc", 0)) + return 3; + if (!n ("a\\\\bc", "abc", FNM_NOESCAPE)) + return 3; + if (!y ("*x", ".x", 0)) + return 4; + if (!n ("*x", ".x", FNM_PERIOD)) + return 4; + if (!y (Apat, "\\\\", 0)) + return 5; + if (!y (Apat, "A", 0)) + return 5; + if (!y (apat, "\\\\", 0)) + return 5; + if (!y (apat, "a", 0)) + return 5; + if (!(n (Apat, A_1, 0) == ('A' < '\\\\'))) + return 5; + if (!(n (apat, a_1, 0) == ('a' < '\\\\'))) + return 5; + if (!(y (Apat, A01, 0) == ('A' < '\\\\'))) + return 5; + if (!(y (apat, a01, 0) == ('a' < '\\\\'))) + return 5; + if (!(y (Apat, bs_1, 0) == ('A' < '\\\\'))) + return 5; + if (!(y (apat, bs_1, 0) == ('a' < '\\\\'))) + return 5; + if (!(n (Apat, bs01, 0) == ('A' < '\\\\'))) + return 5; + if (!(n (apat, bs01, 0) == ('a' < '\\\\'))) + return 5; + $gl_fnmatch_gnu_start + if (!y ("xxXX", "xXxX", FNM_CASEFOLD)) + result |= 8; + if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)) + result |= 16; + if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME)) + result |= 32; + if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + $gl_fnmatch_gnu_end + return result; + ]])], + [eval "$gl_fnmatch_cache_var=yes"], + [eval "$gl_fnmatch_cache_var=no"], + [eval "$gl_fnmatch_cache_var=\"guessing no\""]) + ]) + eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\"" + if test "$gl_fnmatch_result" != yes; then + REPLACE_FNMATCH=1 + fi + fi + if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then + gl_REPLACE_FNMATCH_H fi - AC_SUBST([FNMATCH_H]) - AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"]) ]) # Request a POSIX compliant fnmatch function with GNU extensions. @@ -143,11 +139,6 @@ AC_DEFUN([gl_PREREQ_FNMATCH], [ - dnl We must choose a different name for our function, since on ELF systems - dnl a broken fnmatch() in libc.so would override our fnmatch() if it is - dnl compiled into a shared library. - AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch], - [Define to a replacement function name for fnmatch().]) dnl Prerequisites of lib/fnmatch.c. AC_REQUIRE([AC_TYPE_MBSTATE_T]) AC_CHECK_DECLS([isblank], [], [], [[#include ]]) diff -Nru wget-1.19.5/m4/fpurge.m4 wget-1.20.1/m4/fpurge.m4 --- wget-1.19.5/m4/fpurge.m4 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/m4/fpurge.m4 2018-12-26 20:08:20.000000000 +0000 @@ -0,0 +1,62 @@ +# fpurge.m4 serial 8 +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. + +AC_DEFUN([gl_FUNC_FPURGE], +[ + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([fpurge]) + AC_CHECK_FUNCS_ONCE([__fpurge]) + AC_CHECK_DECLS([fpurge], , , [[#include ]]) + if test "x$ac_cv_func_fpurge" = xyes; then + HAVE_FPURGE=1 + # Detect BSD bug. Only cygwin 1.7 is known to be immune. + AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include +]], + [FILE *f = fopen ("conftest.txt", "w+"); + if (!f) + return 1; + if (fputc ('a', f) != 'a') + { fclose (f); return 2; } + rewind (f); + if (fgetc (f) != 'a') + { fclose (f); return 3; } + if (fgetc (f) != EOF) + { fclose (f); return 4; } + if (fpurge (f) != 0) + { fclose (f); return 5; } + if (putc ('b', f) != 'b') + { fclose (f); return 6; } + if (fclose (f) != 0) + return 7; + if ((f = fopen ("conftest.txt", "r")) == NULL) + return 8; + if (fgetc (f) != 'a') + { fclose (f); return 9; } + if (fgetc (f) != 'b') + { fclose (f); return 10; } + if (fgetc (f) != EOF) + { fclose (f); return 11; } + if (fclose (f) != 0) + return 12; + if (remove ("conftest.txt") != 0) + return 13; + return 0; + ])], + [gl_cv_func_fpurge_works=yes], [gl_cv_func_fpurge_works=no], + [gl_cv_func_fpurge_works='guessing no'])]) + if test "x$gl_cv_func_fpurge_works" != xyes; then + REPLACE_FPURGE=1 + fi + else + HAVE_FPURGE=0 + fi + if test "x$ac_cv_have_decl_fpurge" = xno; then + HAVE_DECL_FPURGE=0 + fi +]) diff -Nru wget-1.19.5/m4/freading.m4 wget-1.20.1/m4/freading.m4 --- wget-1.19.5/m4/freading.m4 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/m4/freading.m4 2018-12-26 20:08:20.000000000 +0000 @@ -0,0 +1,10 @@ +# freading.m4 serial 1 +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. + +AC_DEFUN([gl_FUNC_FREADING], +[ + AC_CHECK_FUNCS_ONCE([__freading]) +]) diff -Nru wget-1.19.5/m4/fseeko.m4 wget-1.20.1/m4/fseeko.m4 --- wget-1.19.5/m4/fseeko.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/fseeko.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# fseeko.m4 serial 18 +# fseeko.m4 serial 19 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, @@ -68,7 +68,10 @@ # Prerequisites of lib/fseeko.c. AC_DEFUN([gl_PREREQ_FSEEKO], [ - dnl Native Windows has the function _fseeki64. mingw hides it, but mingw64 - dnl makes it usable again. + dnl Native Windows has the function _fseeki64. mingw hides it in some + dnl circumstances, but mingw64 makes it usable again. AC_CHECK_FUNCS([_fseeki64]) + if test $ac_cv_func__fseeki64 = yes; then + AC_CHECK_DECLS([_fseeki64]) + fi ]) diff -Nru wget-1.19.5/m4/getgroups.m4 wget-1.20.1/m4/getgroups.m4 --- wget-1.19.5/m4/getgroups.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/getgroups.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# serial 20 +# serial 21 dnl From Jim Meyering. dnl A wrapper around AC_FUNC_GETGROUPS. @@ -34,7 +34,7 @@ [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT], - [[/* On Ultrix 4.3, getgroups (0, 0) always fails. */ + [[/* On NeXTstep 3.2, getgroups (0, 0) always fails. */ return getgroups (0, 0) == -1;]]) ], [ac_cv_func_getgroups_works=yes], diff -Nru wget-1.19.5/m4/getpass.m4 wget-1.20.1/m4/getpass.m4 --- wget-1.19.5/m4/getpass.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/getpass.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# getpass.m4 serial 14 +# getpass.m4 serial 16 dnl Copyright (C) 2002-2003, 2005-2006, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -6,16 +6,15 @@ dnl with or without modifications, as long as this notice is preserved. # Provide a getpass() function if the system doesn't have it. -AC_DEFUN([gl_FUNC_GETPASS], +AC_DEFUN_ONCE([gl_FUNC_GETPASS], [ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + dnl Persuade Solaris and to declare getpass(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS([getpass]) - AC_CHECK_DECLS_ONCE([getpass]) - if test $ac_cv_func_getpass = yes; then - HAVE_GETPASS=1 - else + AC_CHECK_FUNCS_ONCE([getpass]) + if test $ac_cv_func_getpass = no; then HAVE_GETPASS=0 fi ]) @@ -24,26 +23,34 @@ # arbitrary length (not just 8 bytes as on HP-UX). AC_DEFUN([gl_FUNC_GETPASS_GNU], [ - dnl Persuade Solaris and to declare getpass(). - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + AC_REQUIRE([gl_FUNC_GETPASS]) - AC_CHECK_DECLS_ONCE([getpass]) - dnl TODO: Detect when GNU getpass() is already found in glibc. - REPLACE_GETPASS=1 - - if test $REPLACE_GETPASS = 1; then - dnl We must choose a different name for our function, since on ELF systems - dnl an unusable getpass() in libc.so would override our getpass() if it is - dnl compiled into a shared library. - AC_DEFINE([getpass], [gnu_getpass], - [Define to a replacement function name for getpass().]) + if test $ac_cv_func_getpass = yes; then + AC_CACHE_CHECK([for getpass without length limitations], + [gl_cv_func_getpass_good], + [AC_EGREP_CPP([Lucky GNU user], + [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ + Lucky GNU user + #endif +#endif + ], + [gl_cv_func_getpass_good=yes], + [gl_cv_func_getpass_good=no]) + ]) + if test $gl_cv_func_getpass_good != yes; then + REPLACE_GETPASS=1 + fi fi ]) # Prerequisites of lib/getpass.c. AC_DEFUN([gl_PREREQ_GETPASS], [ AC_CHECK_HEADERS_ONCE([stdio_ext.h termios.h]) - AC_CHECK_FUNCS_ONCE([__fsetlocking tcgetattr tcsetattr]) + AC_CHECK_FUNCS_ONCE([__fsetlocking]) AC_CHECK_DECLS([__fsetlocking],,, [[#include #if HAVE_STDIO_EXT_H @@ -54,5 +61,46 @@ AC_CHECK_DECLS_ONCE([fputs_unlocked]) AC_CHECK_DECLS_ONCE([funlockfile]) AC_CHECK_DECLS_ONCE([putc_unlocked]) - : + + dnl We can't use AC_CHECK_FUNC here, because tcgetattr() is defined as a + dnl static inline function when compiling for Android 4.4 or older. + AC_CACHE_CHECK([for tcgetattr], [gl_cv_func_tcgetattr], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + struct termios x; + ]], + [[return tcgetattr(0,&x);]]) + ], + [gl_cv_func_tcgetattr=yes], + [gl_cv_func_tcgetattr=no]) + ]) + if test $gl_cv_func_tcgetattr = yes; then + HAVE_TCGETATTR=1 + else + HAVE_TCGETATTR=0 + fi + AC_DEFINE_UNQUOTED([HAVE_TCGETATTR], [$HAVE_TCGETATTR], + [Define to 1 if the system has the 'tcgetattr' function.]) + + dnl We can't use AC_CHECK_FUNC here, because tcsetattr() is defined as a + dnl static inline function when compiling for Android 4.4 or older. + AC_CACHE_CHECK([for tcsetattr], [gl_cv_func_tcsetattr], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + struct termios x; + ]], + [[return tcsetattr(0,0,&x);]]) + ], + [gl_cv_func_tcsetattr=yes], + [gl_cv_func_tcsetattr=no]) + ]) + if test $gl_cv_func_tcsetattr = yes; then + HAVE_TCSETATTR=1 + else + HAVE_TCSETATTR=0 + fi + AC_DEFINE_UNQUOTED([HAVE_TCSETATTR], [$HAVE_TCSETATTR], + [Define to 1 if the system has the 'tcsetattr' function.]) ]) diff -Nru wget-1.19.5/m4/gettime.m4 wget-1.20.1/m4/gettime.m4 --- wget-1.19.5/m4/gettime.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/gettime.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# gettime.m4 serial 8 +# gettime.m4 serial 9 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, @@ -9,5 +9,5 @@ dnl Prerequisites of lib/gettime.c. AC_REQUIRE([gl_CLOCK_TIME]) AC_REQUIRE([gl_TIMESPEC]) - AC_CHECK_FUNCS_ONCE([gettimeofday nanotime]) + AC_CHECK_FUNCS_ONCE([gettimeofday]) ]) diff -Nru wget-1.19.5/m4/gl-openssl.m4 wget-1.20.1/m4/gl-openssl.m4 --- wget-1.19.5/m4/gl-openssl.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/gl-openssl.m4 2018-12-26 20:08:20.000000000 +0000 @@ -23,7 +23,9 @@ [use libcrypto hash routines. Valid ARGs are: 'yes', 'no', 'auto' => use if available, 'optional' => use if available and warn if not available; - default is ']gl_CRYPTO_CHECK_DEFAULT['])], + default is ']gl_CRYPTO_CHECK_DEFAULT['. + Note also --with-linux-crypto, which will enable + use of kernel crypto routines, which have precedence])], [], [with_openssl=$with_openssl_default]) diff -Nru wget-1.19.5/m4/gnulib-common.m4 wget-1.20.1/m4/gnulib-common.m4 --- wget-1.19.5/m4/gnulib-common.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/gnulib-common.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,9 +1,11 @@ -# gnulib-common.m4 serial 38 +# gnulib-common.m4 serial 41 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. +AC_PREREQ([2.62]) + # gl_COMMON # is expanded unconditionally through gnulib-tool magic. AC_DEFUN([gl_COMMON], [ @@ -14,12 +16,15 @@ AC_DEFUN([gl_COMMON_BODY], [ AH_VERBATIM([_Noreturn], [/* The _Noreturn keyword of C11. */ -#if ! (defined _Noreturn \ - || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) -# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ - || 0x5110 <= __SUNPRO_C) +#ifndef _Noreturn +# if 201103 <= (defined __cplusplus ? __cplusplus : 0) +# define _Noreturn [[noreturn]] +# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ + || 4 < __GNUC__ + (7 <= __GNUC_MINOR__)) + /* _Noreturn works as-is. */ +# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C # define _Noreturn __attribute__ ((__noreturn__)) -# elif defined _MSC_VER && 1200 <= _MSC_VER +# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) # define _Noreturn __declspec (noreturn) # else # define _Noreturn @@ -72,6 +77,13 @@ #else # define _GL_ATTRIBUTE_CONST /* empty */ #endif + +/* The __malloc__ attribute was added in gcc 3. */ +#if 3 <= __GNUC__ +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +#else +# define _GL_ATTRIBUTE_MALLOC /* empty */ +#endif ]) dnl Preparation for running test programs: dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not @@ -207,13 +219,6 @@ AC_SUBST([HAVE_FEATURES_H]) ]) -# m4_foreach_w -# is a backport of autoconf-2.59c's m4_foreach_w. -# Remove this macro when we can assume autoconf >= 2.60. -m4_ifndef([m4_foreach_w], - [m4_define([m4_foreach_w], - [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) - # AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH]) # ---------------------------------------------------- # Backport of autoconf-2.63b's macro. @@ -226,7 +231,6 @@ # Modifies the value of the shell variable CC in an attempt to make $CC # understand ISO C99 source code. # 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 @@ -315,25 +319,6 @@ AC_SUBST([RANLIB]) ]) -# AC_PROG_MKDIR_P -# is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix -# for interoperability with automake-1.9.6 from autoconf-2.62. -# Remove this macro when we can assume autoconf >= 2.62 or -# autoconf >= 2.60 && automake >= 1.10. -# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. -m4_ifndef([AC_AUTOCONF_VERSION],[ -m4_ifdef([AC_PROG_MKDIR_P], [ - dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed. - m4_define([AC_PROG_MKDIR_P], - m4_defn([AC_PROG_MKDIR_P])[ - AC_SUBST([MKDIR_P])])], [ - dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P. - AC_DEFUN_ONCE([AC_PROG_MKDIR_P], - [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake - MKDIR_P='$(mkdir_p)' - AC_SUBST([MKDIR_P])])]) -]) - # AC_C_RESTRICT # This definition is copied from post-2.69 Autoconf and overrides the # AC_C_RESTRICT macro from autoconf 2.60..2.69. It can be removed @@ -347,16 +332,16 @@ for ac_kw in __restrict __restrict__ _Restrict restrict; do AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [[typedef int *int_ptr; - int foo (int_ptr $ac_kw ip) { return ip[0]; } - int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ - int bar (int ip[$ac_kw]) { return ip[0]; } - ]], - [[int s[1]; - int *$ac_kw t = s; - t[0] = 0; - return foo (t) + bar (t); - ]])], + [[typedef int *int_ptr; + int foo (int_ptr $ac_kw ip) { return ip[0]; } + int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ + int bar (int ip[$ac_kw]) { return ip[0]; } + ]], + [[int s[1]; + int *$ac_kw t = s; + t[0] = 0; + return foo (t) + bar (t); + ]])], [ac_cv_c_restrict=$ac_kw]) test "$ac_cv_c_restrict" != no && break done @@ -407,61 +392,3 @@ # AS_VAR_COPY was added in autoconf 2.63b m4_define_default([AS_VAR_COPY], [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) - -# AC_PROG_SED was added in autoconf 2.59b -m4_ifndef([AC_PROG_SED], -[AC_DEFUN([AC_PROG_SED], -[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED, - [dnl ac_script should not contain more than 99 commands (for HP-UX sed), - dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed. - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - AS_UNSET([ac_script]) - if test -z "$SED"; then - ac_path_SED_found=false - _AS_PATH_WALK([], [ - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - AS_EXECUTABLE_P(["$ac_path_SED"]) || continue - case `"$ac_path_SED" --version 2>&1` in - *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;; - *) - ac_count=0 - _AS_ECHO_N([0123456789]) >conftest.in - while : - do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >> conftest.nl - "$ac_path_SED" -f conftest.sed conftest.out 2>/dev/null || break - diff conftest.out conftest.nl >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best so far, but keep looking for better - ac_cv_path_SED=$ac_path_SED - ac_path_SED_max=$ac_count - fi - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; - esac - $ac_path_SED_found && break 3 - done - done]) - if test -z "$ac_cv_path_SED"; then - AC_ERROR([no acceptable sed could be found in \$PATH]) - fi - else - ac_cv_path_SED=$SED - fi - ]) - SED="$ac_cv_path_SED" - AC_SUBST([SED])dnl - rm -f conftest.sed -]) -]) diff -Nru wget-1.19.5/m4/gnulib-comp.m4 wget-1.20.1/m4/gnulib-comp.m4 --- wget-1.19.5/m4/gnulib-comp.m4 2018-05-06 10:32:00.000000000 +0000 +++ wget-1.20.1/m4/gnulib-comp.m4 2018-12-26 20:08:40.000000000 +0000 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -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,7 +37,11 @@ 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: @@ -51,21 +55,27 @@ # Code from module bind: # Code from module btowc: # Code from module builtin-expect: + # Code from module byteswap: # Code from module c-ctype: # Code from module c-strcase: # Code from module c-strcaseeq: # Code from module c-strcasestr: + # Code from module c99: # Code from module clock-time: # Code from module cloexec: # Code from module close: - # Code from module configmake: # Code from module connect: + # Code from module crypto/af_alg: # Code from module crypto/md2: # Code from module crypto/md4: # Code from module crypto/md5: + # Code from module crypto/md5-buffer: # Code from module crypto/sha1: + # Code from module crypto/sha1-buffer: # Code from module crypto/sha256: + # Code from module crypto/sha256-buffer: # Code from module crypto/sha512: + # Code from module crypto/sha512-buffer: # Code from module dirname: # Code from module dirname-lgpl: # Code from module dosname: @@ -82,12 +92,17 @@ # Code from module fcntl-h: # Code from module fd-hook: # Code from module fd-safer-flag: + # Code from module fflush: + AC_REQUIRE([AC_FUNC_FSEEKO]) # Code from module filename: # Code from module flexmember: # Code from module float: # Code from module flock: # Code from module fnmatch: + # Code from module fnmatch-h: # Code from module fopen: + # Code from module fpurge: + # Code from module freading: # Code from module fseek: # Code from module fseeko: AC_REQUIRE([AC_FUNC_FSEEKO]) @@ -103,6 +118,7 @@ # Code from module getline: # Code from module getopt-gnu: # Code from module getopt-posix: + # Code from module getpass: # Code from module getpass-gnu: # Code from module getpeername: # Code from module getprogname: @@ -118,7 +134,6 @@ # 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: @@ -133,6 +148,7 @@ # Code from module langinfo: # Code from module largefile: AC_REQUIRE([AC_SYS_LARGEFILE]) + # Code from module libc-config: # Code from module libunistring-optional: # Code from module limits-h: # Code from module link: @@ -199,6 +215,7 @@ # Code from module send: # Code from module servent: # Code from module setsockopt: + # Code from module sh-filename: # Code from module sigaction: # Code from module signal-h: # Code from module sigpipe: @@ -219,6 +236,7 @@ # Code from module ssize_t: # Code from module stat: # Code from module stat-time: + # Code from module std-gnu11: # Code from module stdalign: # Code from module stdbool: # Code from module stddef: @@ -313,7 +331,7 @@ # 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], [ @@ -321,14 +339,14 @@ 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]) @@ -350,6 +368,7 @@ fi gl_WCHAR_MODULE_INDICATOR([btowc]) gl___BUILTIN_EXPECT + gl_BYTESWAP gl_CLOCK_TIME gl_MODULE_INDICATOR_FOR_TESTS([cloexec]) gl_FUNC_CLOSE @@ -357,16 +376,20 @@ AC_LIBOBJ([close]) fi gl_UNISTD_MODULE_INDICATOR([close]) - gl_CONFIGMAKE_PREP AC_REQUIRE([gl_HEADER_SYS_SOCKET]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([connect]) fi gl_SYS_SOCKET_MODULE_INDICATOR([connect]) + gl_AF_ALG gl_MD4 + AC_DEFINE([GL_COMPILE_CRYPTO_STREAM], 1, [Compile Gnulib crypto stream ops.]) gl_MD5 + AC_DEFINE([GL_COMPILE_CRYPTO_STREAM], 1, [Compile Gnulib crypto stream ops.]) gl_SHA1 + AC_DEFINE([GL_COMPILE_CRYPTO_STREAM], 1, [Compile Gnulib crypto stream ops.]) gl_SHA256 + AC_DEFINE([GL_COMPILE_CRYPTO_STREAM], 1, [Compile Gnulib crypto stream ops.]) gl_SHA512 gl_DIRNAME gl_MODULE_INDICATOR([dirname]) @@ -398,6 +421,13 @@ gl_FCNTL_MODULE_INDICATOR([fcntl]) gl_FCNTL_H gl_MODULE_INDICATOR([fd-safer-flag]) + gl_FUNC_FFLUSH + if test $REPLACE_FFLUSH = 1; then + AC_LIBOBJ([fflush]) + gl_PREREQ_FFLUSH + fi + gl_MODULE_INDICATOR([fflush]) + gl_STDIO_MODULE_INDICATOR([fflush]) AC_C_FLEXIBLE_ARRAY_MEMBER gl_FLOAT_H if test $REPLACE_FLOAT_LDBL = 1; then @@ -413,16 +443,24 @@ fi gl_HEADER_SYS_FILE_MODULE_INDICATOR([flock]) gl_FUNC_FNMATCH_POSIX - if test -n "$FNMATCH_H"; then + if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then AC_LIBOBJ([fnmatch]) gl_PREREQ_FNMATCH fi + gl_FNMATCH_MODULE_INDICATOR([fnmatch]) + gl_FNMATCH_H gl_FUNC_FOPEN if test $REPLACE_FOPEN = 1; then AC_LIBOBJ([fopen]) gl_PREREQ_FOPEN fi gl_STDIO_MODULE_INDICATOR([fopen]) + gl_FUNC_FPURGE + if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then + AC_LIBOBJ([fpurge]) + fi + gl_STDIO_MODULE_INDICATOR([fpurge]) + gl_FUNC_FREADING gl_FUNC_FSEEK if test $REPLACE_FSEEK = 1; then AC_LIBOBJ([fseek]) @@ -504,11 +542,18 @@ GNULIB_GL_UNISTD_H_GETOPT=1 fi AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + gl_FUNC_GETPASS + if test $HAVE_GETPASS = 0 || test $REPLACE_GETPASS = 1; then + AC_LIBOBJ([getpass]) + gl_PREREQ_GETPASS + fi + gl_UNISTD_MODULE_INDICATOR([getpass]) gl_FUNC_GETPASS_GNU - if test $REPLACE_GETPASS = 1; then + if test $HAVE_GETPASS = 0 || test $REPLACE_GETPASS = 1; then AC_LIBOBJ([getpass]) gl_PREREQ_GETPASS fi + gl_UNISTD_MODULE_INDICATOR([getpass]) AC_REQUIRE([gl_HEADER_SYS_SOCKET]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([getpeername]) @@ -545,8 +590,6 @@ gl_PREREQ_GROUP_MEMBER 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], @@ -577,6 +620,7 @@ gl_WCTYPE_MODULE_INDICATOR([iswblank]) gl_LANGINFO_H AC_REQUIRE([gl_LARGEFILE]) + gl___INLINE gl_LIBUNISTRING_OPTIONAL gl_LIMITS_H gl_FUNC_LINK @@ -590,7 +634,8 @@ fi gl_SYS_SOCKET_MODULE_INDICATOR([listen]) gl_LOCALCHARSET - LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" + dnl For backward compatibility. Some packages still use this. + LOCALCHARSET_TESTS_ENVIRONMENT= AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) gl_LOCALE_H gl_FUNC_LOCALECONV @@ -738,17 +783,17 @@ fi gl_SPAWN_MODULE_INDICATOR([posix_spawn]) gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE - if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then AC_LIBOBJ([spawn_faction_addclose]) fi gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addclose]) gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 - if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then AC_LIBOBJ([spawn_faction_adddup2]) fi gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_adddup2]) gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN - if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then AC_LIBOBJ([spawn_faction_addopen]) fi gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addopen]) @@ -836,6 +881,7 @@ AC_LIBOBJ([setsockopt]) fi gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt]) + gl_SH_FILENAME gl_SIGACTION if test $HAVE_SIGACTION = 0; then AC_LIBOBJ([sigaction]) @@ -1092,6 +1138,7 @@ gl_FUNC_WCWIDTH if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then AC_LIBOBJ([wcwidth]) + gl_PREREQ_WCWIDTH fi gl_WCHAR_MODULE_INDICATOR([wcwidth]) gl_FUNC_WRITE @@ -1150,7 +1197,6 @@ 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])[ || @@ -1186,8 +1232,6 @@ 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 @@ -1211,7 +1255,7 @@ 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, [ ]) ]) ]) @@ -1257,6 +1301,8 @@ build-aux/vc-list-files lib/_Noreturn.h lib/accept.c + lib/af_alg.c + lib/af_alg.h lib/alloca.c lib/alloca.in.h lib/arg-nonnull.h @@ -1272,6 +1318,7 @@ lib/binary-io.h lib/bind.c lib/btowc.c + lib/byteswap.in.h lib/c++defs.h lib/c-ctype.c lib/c-ctype.h @@ -1281,10 +1328,10 @@ lib/c-strcasestr.c lib/c-strcasestr.h lib/c-strncasecmp.c + lib/cdefs.h lib/cloexec.c lib/cloexec.h lib/close.c - lib/config.charset lib/connect.c lib/dirname-lgpl.c lib/dirname.c @@ -1306,6 +1353,7 @@ lib/fd-hook.h lib/fd-safer-flag.c lib/fd-safer.c + lib/fflush.c lib/filename.h lib/flexmember.h lib/float+.h @@ -1316,6 +1364,9 @@ lib/fnmatch.in.h lib/fnmatch_loop.c lib/fopen.c + lib/fpurge.c + lib/freading.c + lib/freading.h lib/fseek.c lib/fseeko.c lib/fstat.c @@ -1361,6 +1412,7 @@ lib/iswblank.c lib/itold.c lib/langinfo.in.h + lib/libc-config.h lib/libunistring.valgrind lib/limits.in.h lib/link.c @@ -1376,7 +1428,6 @@ lib/malloc.c lib/malloca.c lib/malloca.h - lib/malloca.valgrind lib/mbchar.c lib/mbchar.h lib/mbiter.c @@ -1428,8 +1479,6 @@ lib/rawmemchr.c lib/rawmemchr.valgrind lib/recv.c - lib/ref-add.sin - lib/ref-del.sin lib/regcomp.c lib/regex.c lib/regex.h @@ -1510,6 +1559,7 @@ lib/strtol.c lib/strtoll.c lib/symlink.c + lib/sys-limits.h lib/sys_file.in.h lib/sys_ioctl.in.h lib/sys_select.in.h @@ -1613,17 +1663,19 @@ lib/xstrndup.c lib/xstrndup.h m4/00gnulib.m4 + m4/__inline.m4 m4/absolute-header.m4 + m4/af_alg.m4 m4/alloca.m4 m4/arpa_inet_h.m4 m4/asm-underscore.m4 m4/base32.m4 m4/btowc.m4 m4/builtin-expect.m4 + m4/byteswap.m4 m4/clock_time.m4 m4/close.m4 m4/codeset.m4 - m4/configmake.m4 m4/dirname.m4 m4/double-slash-root.m4 m4/dup2.m4 @@ -1638,11 +1690,15 @@ m4/fcntl-o.m4 m4/fcntl.m4 m4/fcntl_h.m4 + m4/fflush.m4 m4/flexmember.m4 m4/float_h.m4 m4/flock.m4 m4/fnmatch.m4 + m4/fnmatch_h.m4 m4/fopen.m4 + m4/fpurge.m4 + m4/freading.m4 m4/fseek.m4 m4/fseeko.m4 m4/fstat.m4 @@ -1663,7 +1719,6 @@ m4/glibc21.m4 m4/gnulib-common.m4 m4/group-member.m4 - m4/hard-locale.m4 m4/host-cpu-c-abi.m4 m4/hostent.m4 m4/iconv.m4 @@ -1745,6 +1800,7 @@ m4/secure_getenv.m4 m4/select.m4 m4/servent.m4 + m4/sh-filename.m4 m4/sha1.m4 m4/sha256.m4 m4/sha512.m4 @@ -1764,6 +1820,7 @@ m4/ssize_t.m4 m4/stat-time.m4 m4/stat.m4 + m4/std-gnu11.m4 m4/stdalign.m4 m4/stdbool.m4 m4/stddef_h.m4 @@ -1827,12 +1884,6 @@ 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 -Nru wget-1.19.5/m4/hard-locale.m4 wget-1.20.1/m4/hard-locale.m4 --- wget-1.19.5/m4/hard-locale.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/hard-locale.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# hard-locale.m4 serial 8 -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. - -dnl No prerequisites of lib/hard-locale.c. -AC_DEFUN([gl_HARD_LOCALE], -[ - : -]) diff -Nru wget-1.19.5/m4/host-cpu-c-abi.m4 wget-1.20.1/m4/host-cpu-c-abi.m4 --- wget-1.19.5/m4/host-cpu-c-abi.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/host-cpu-c-abi.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# host-cpu-c-abi.m4 serial 8 +# host-cpu-c-abi.m4 serial 11 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, @@ -135,7 +135,7 @@ 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 + if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then gl_cv_host_cpu_c_abi=armhf else gl_cv_host_cpu_c_abi=arm @@ -237,6 +237,60 @@ gl_cv_host_cpu_c_abi=powerpc ;; + riscv32 | riscv64 ) + # There are 2 architectures (with variants): rv32* and rv64*. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if __riscv_xlen == 64 + int ok; + #else + error fail + #endif + ]])], + [cpu=riscv64], + [cpu=riscv32]) + # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. + # Size of 'long' and 'void *': + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ + int ok; + #else + error fail + #endif + ]])], + [main_abi=lp64], + [main_abi=ilp32]) + # Float ABIs: + # __riscv_float_abi_double: + # 'float' and 'double' are passed in floating-point registers. + # __riscv_float_abi_single: + # 'float' are passed in floating-point registers. + # __riscv_float_abi_soft: + # No values are passed in floating-point registers. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __riscv_float_abi_double + int ok; + #else + error fail + #endif + ]])], + [float_abi=d], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __riscv_float_abi_single + int ok; + #else + error fail + #endif + ]])], + [float_abi=f], + [float_abi='']) + ]) + gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}" + ;; + s390* ) # On s390x, the C compiler may be generating 64-bit (= s390x) code # or 31-bit (= s390) code. @@ -349,6 +403,39 @@ #ifndef __powerpc64_elfv2__ #undef __powerpc64_elfv2__ #endif +#ifndef __riscv32__ +#undef __riscv32__ +#endif +#ifndef __riscv64__ +#undef __riscv64__ +#endif +#ifndef __riscv32_ilp32__ +#undef __riscv32_ilp32__ +#endif +#ifndef __riscv32_ilp32f__ +#undef __riscv32_ilp32f__ +#endif +#ifndef __riscv32_ilp32d__ +#undef __riscv32_ilp32d__ +#endif +#ifndef __riscv64_ilp32__ +#undef __riscv64_ilp32__ +#endif +#ifndef __riscv64_ilp32f__ +#undef __riscv64_ilp32f__ +#endif +#ifndef __riscv64_ilp32d__ +#undef __riscv64_ilp32d__ +#endif +#ifndef __riscv64_lp64__ +#undef __riscv64_lp64__ +#endif +#ifndef __riscv64_lp64f__ +#undef __riscv64_lp64f__ +#endif +#ifndef __riscv64_lp64d__ +#undef __riscv64_lp64d__ +#endif #ifndef __s390__ #undef __s390__ #endif @@ -367,3 +454,191 @@ ]) ]) + + +dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI +dnl (application binary interface) is a 32-bit one, or to 'no' otherwise. +dnl This is a simplified variant of gl_HOST_CPU_C_ABI. +AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit], + [if test -n "$gl_cv_host_cpu_c_abi"; then + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; + *) + gl_cv_host_cpu_c_abi_32bit=no ;; + esac + else + case "$host_cpu" in + +changequote(,)dnl + i[4567]86 ) +changequote([,])dnl + gl_cv_host_cpu_c_abi_32bit=yes + ;; + + 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) \ + && !(defined __ILP32__ || defined _ILP32) + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + 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( + [[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32) + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + 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_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + 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_32bit=yes], + [gl_cv_host_cpu_c_abi_32bit=no]) + ;; + + 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_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + 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 + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + rs6000 ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; + + riscv32 | riscv64 ) + # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. + # Size of 'long' and 'void *': + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + 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_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + 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_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + *) + gl_cv_host_cpu_c_abi_32bit=no + ;; + esac + fi + ]) + + HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit" +]) diff -Nru wget-1.19.5/m4/hostent.m4 wget-1.20.1/m4/hostent.m4 --- wget-1.19.5/m4/hostent.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/hostent.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# hostent.m4 serial 2 +# hostent.m4 serial 3 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, @@ -8,7 +8,7 @@ [ dnl Where are gethostent(), sethostent(), endhostent(), gethostbyname(), dnl gethostbyaddr() defined? - dnl - On Solaris, they are in libnsl. Ignore libxnet. + dnl - On Solaris < 11.4, they are in libnsl. Ignore libxnet. dnl - On Haiku, they are in libnetwork. dnl - On BeOS, they are in libnet. dnl - On native Windows, they are in ws2_32.dll. diff -Nru wget-1.19.5/m4/iconv_h.m4 wget-1.20.1/m4/iconv_h.m4 --- wget-1.19.5/m4/iconv_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/iconv_h.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# iconv_h.m4 serial 8 +# iconv_h.m4 serial 11 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, @@ -11,6 +11,12 @@ dnl Execute this unconditionally, because ICONV_H may be set by other dnl modules, after this code is executed. gl_CHECK_NEXT_HEADERS([iconv.h]) + + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use, and which is not + dnl guaranteed by C89. + gl_WARN_ON_USE_PREPARE([[#include + ]], [iconv iconv_open]) ]) dnl Unconditionally enables the replacement of . @@ -30,6 +36,7 @@ AC_DEFUN([gl_ICONV_H_DEFAULTS], [ + m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) GNULIB_ICONV=0; AC_SUBST([GNULIB_ICONV]) dnl Assume proper GNU behavior unless another module says otherwise. ICONV_CONST=; AC_SUBST([ICONV_CONST]) @@ -37,5 +44,12 @@ REPLACE_ICONV_OPEN=0; AC_SUBST([REPLACE_ICONV_OPEN]) REPLACE_ICONV_UTF=0; AC_SUBST([REPLACE_ICONV_UTF]) ICONV_H=''; AC_SUBST([ICONV_H]) + m4_ifdef([gl_POSIXCHECK], + [ICONV_H='iconv.h'], + [if m4_ifdef([gl_ANSI_CXX], [test "$CXX" != no], [false]); then + dnl Override always, to support the C++ GNULIB_NAMESPACE. + ICONV_H='iconv.h' + fi + ]) AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) ]) diff -Nru wget-1.19.5/m4/__inline.m4 wget-1.20.1/m4/__inline.m4 --- wget-1.19.5/m4/__inline.m4 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/m4/__inline.m4 2018-12-26 20:08:20.000000000 +0000 @@ -0,0 +1,22 @@ +# Test for __inline keyword +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___INLINE], +[ + AC_CACHE_CHECK([whether the compiler supports the __inline keyword], + [gl_cv_c___inline], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[typedef int foo_t; + static __inline foo_t foo (void) { return 0; }]], + [[return foo ();]])], + [gl_cv_c___inline=yes], + [gl_cv_c___inline=no])]) + if test $gl_cv_c___inline = yes; then + AC_DEFINE([HAVE___INLINE], [1], + [Define to 1 if the compiler supports the keyword '__inline'.]) + fi +]) diff -Nru wget-1.19.5/m4/inttypes.m4 wget-1.20.1/m4/inttypes.m4 --- wget-1.19.5/m4/inttypes.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/inttypes.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# inttypes.m4 serial 26 +# inttypes.m4 serial 27 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, @@ -147,6 +147,7 @@ HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV]) HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX]) HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX]) + HAVE_IMAXDIV_T=1; AC_SUBST([HAVE_IMAXDIV_T]) REPLACE_STRTOIMAX=0; AC_SUBST([REPLACE_STRTOIMAX]) REPLACE_STRTOUMAX=0; AC_SUBST([REPLACE_STRTOUMAX]) INT32_MAX_LT_INTMAX_MAX=1; AC_SUBST([INT32_MAX_LT_INTMAX_MAX]) diff -Nru wget-1.19.5/m4/langinfo_h.m4 wget-1.20.1/m4/langinfo_h.m4 --- wget-1.19.5/m4/langinfo_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/langinfo_h.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# langinfo_h.m4 serial 7 +# langinfo_h.m4 serial 8 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, @@ -17,6 +17,7 @@ dnl Determine whether exists. It is missing on mingw and BeOS. HAVE_LANGINFO_CODESET=0 HAVE_LANGINFO_T_FMT_AMPM=0 + HAVE_LANGINFO_ALTMON=0 HAVE_LANGINFO_ERA=0 HAVE_LANGINFO_YESEXPR=0 AC_CHECK_HEADERS_ONCE([langinfo.h]) @@ -24,6 +25,7 @@ HAVE_LANGINFO_H=1 dnl Determine what defines. CODESET and ERA etc. are missing dnl on OpenBSD 3.8. T_FMT_AMPM and YESEXPR, NOEXPR are missing on IRIX 5.3. + dnl ALTMON_* are missing on glibc 2.26 and many other systems. AC_CACHE_CHECK([whether langinfo.h defines CODESET], [gl_cv_header_langinfo_codeset], [AC_COMPILE_IFELSE( @@ -48,6 +50,18 @@ if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then HAVE_LANGINFO_T_FMT_AMPM=1 fi + AC_CACHE_CHECK([whether langinfo.h defines ALTMON_1], + [gl_cv_header_langinfo_altmon], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include +int a = ALTMON_1; +]])], + [gl_cv_header_langinfo_altmon=yes], + [gl_cv_header_langinfo_altmon=no]) + ]) + if test $gl_cv_header_langinfo_altmon = yes; then + HAVE_LANGINFO_ALTMON=1 + fi AC_CACHE_CHECK([whether langinfo.h defines ERA], [gl_cv_header_langinfo_era], [AC_COMPILE_IFELSE( @@ -78,6 +92,7 @@ AC_SUBST([HAVE_LANGINFO_H]) AC_SUBST([HAVE_LANGINFO_CODESET]) AC_SUBST([HAVE_LANGINFO_T_FMT_AMPM]) + AC_SUBST([HAVE_LANGINFO_ALTMON]) AC_SUBST([HAVE_LANGINFO_ERA]) AC_SUBST([HAVE_LANGINFO_YESEXPR]) diff -Nru wget-1.19.5/m4/lib-link.m4 wget-1.20.1/m4/lib-link.m4 --- wget-1.19.5/m4/lib-link.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/lib-link.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# lib-link.m4 serial 26 (gettext-0.18.2) +# lib-link.m4 serial 28 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, @@ -6,7 +6,7 @@ dnl From Bruno Haible. -AC_PREREQ([2.54]) +AC_PREREQ([2.61]) dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. @@ -124,8 +124,8 @@ dnl acl_hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], [ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) + dnl Complain if config.rpath is missing. + AC_REQUIRE_AUX_FILE([config.rpath]) AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host @@ -187,17 +187,15 @@ pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) - dnl Autoconf >= 2.61 supports dots in --with options. - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH(P_A_C_K[-prefix], -[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib - --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], + AC_ARG_WITH(PACK[-prefix], +[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -211,7 +209,7 @@ additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then + && test ! -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -670,7 +668,6 @@ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" done fi - popdef([P_A_C_K]) popdef([PACKLIBS]) popdef([PACKUP]) popdef([PACK]) diff -Nru wget-1.19.5/m4/lib-prefix.m4 wget-1.20.1/m4/lib-prefix.m4 --- wget-1.19.5/m4/lib-prefix.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/lib-prefix.m4 2018-12-26 20:08:20.000000000 +0000 @@ -1,4 +1,4 @@ -# lib-prefix.m4 serial 11 +# lib-prefix.m4 serial 14 dnl Copyright (C) 2001-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, @@ -6,13 +6,6 @@ dnl From Bruno Haible. -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed dnl to access previously installed libraries. The basic assumption is that dnl a user will want packages to use other packages he previously installed @@ -32,9 +25,9 @@ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], + AC_ARG_WITH([lib-prefix], +[[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -174,7 +167,24 @@ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_HOST_CPU_C_ABI]) + AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT]) + + case "$host_os" in + solaris*) + 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]) + ]);; + esac + 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], @@ -187,18 +197,6 @@ 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 @@ -210,40 +208,36 @@ *) 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 + if test "$HOST_CPU_C_ABI_32BIT" != yes; then + 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 + fi ;; esac test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" diff -Nru wget-1.19.5/m4/limits-h.m4 wget-1.20.1/m4/limits-h.m4 --- wget-1.19.5/m4/limits-h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/limits-h.m4 2018-12-26 20:08:21.000000000 +0000 @@ -11,14 +11,18 @@ [ gl_CHECK_NEXT_HEADERS([limits.h]) - AC_CACHE_CHECK([whether limits.h has ULLONG_WIDTH etc.], + AC_CACHE_CHECK([whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.], [gl_cv_header_limits_width], [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ - #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 - #endif - #include - int ullw = ULLONG_WIDTH;]])], + [AC_LANG_PROGRAM( + [[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif + #include + long long llm = LLONG_MAX; + int wb = WORD_BIT; + int ullw = ULLONG_WIDTH; + ]])], [gl_cv_header_limits_width=yes], [gl_cv_header_limits_width=no])]) if test "$gl_cv_header_limits_width" = yes; then @@ -29,3 +33,11 @@ AC_SUBST([LIMITS_H]) AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) ]) + +dnl Unconditionally enables the replacement of . +AC_DEFUN([gl_REPLACE_LIMITS_H], +[ + AC_REQUIRE([gl_LIMITS_H]) + LIMITS_H='limits.h' + AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) +]) diff -Nru wget-1.19.5/m4/link.m4 wget-1.20.1/m4/link.m4 --- wget-1.19.5/m4/link.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/link.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# link.m4 serial 9 +# link.m4 serial 10 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, @@ -39,10 +39,12 @@ ]])], [gl_cv_func_link_works=yes], [gl_cv_func_link_works=no], [case "$host_os" in - # 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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_link_works="guessing yes" ;; + # 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 -Nru wget-1.19.5/m4/localcharset.m4 wget-1.20.1/m4/localcharset.m4 --- wget-1.19.5/m4/localcharset.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/localcharset.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# localcharset.m4 serial 7 +# localcharset.m4 serial 8 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, @@ -8,10 +8,4 @@ [ dnl Prerequisites of lib/localcharset.c. AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_REQUIRE([gl_FCNTL_O_FLAGS]) - AC_CHECK_DECLS_ONCE([getc_unlocked]) - - dnl Prerequisites of the lib/Makefile.am snippet. - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_GLIBC21]) ]) diff -Nru wget-1.19.5/m4/locale-fr.m4 wget-1.20.1/m4/locale-fr.m4 --- wget-1.19.5/m4/locale-fr.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/locale-fr.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# locale-fr.m4 serial 18 +# locale-fr.m4 serial 19 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, @@ -31,7 +31,7 @@ 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 __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 @@ -160,7 +160,7 @@ variables, and all locales use the UTF-8 encoding. */ #if !(defined __BEOS__ || defined __HAIKU__) /* Check whether the given locale name is recognized by the system. */ -# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if 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 diff -Nru wget-1.19.5/m4/locale_h.m4 wget-1.20.1/m4/locale_h.m4 --- wget-1.19.5/m4/locale_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/locale_h.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# locale_h.m4 serial 20 +# locale_h.m4 serial 21 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, @@ -96,7 +96,7 @@ # include #endif ]], - [setlocale duplocale]) + [setlocale newlocale duplocale freelocale]) ]) AC_DEFUN([gl_LOCALE_MODULE_INDICATOR], @@ -113,10 +113,15 @@ GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV]) GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE]) GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE]) + GNULIB_LOCALENAME=0; AC_SUBST([GNULIB_LOCALENAME]) dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_NEWLOCALE=1; AC_SUBST([HAVE_NEWLOCALE]) HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE]) + HAVE_FREELOCALE=1; AC_SUBST([HAVE_FREELOCALE]) REPLACE_LOCALECONV=0; AC_SUBST([REPLACE_LOCALECONV]) REPLACE_SETLOCALE=0; AC_SUBST([REPLACE_SETLOCALE]) + REPLACE_NEWLOCALE=0; AC_SUBST([REPLACE_NEWLOCALE]) REPLACE_DUPLOCALE=0; AC_SUBST([REPLACE_DUPLOCALE]) + REPLACE_FREELOCALE=0; AC_SUBST([REPLACE_FREELOCALE]) REPLACE_STRUCT_LCONV=0; AC_SUBST([REPLACE_STRUCT_LCONV]) ]) diff -Nru wget-1.19.5/m4/locale-ja.m4 wget-1.20.1/m4/locale-ja.m4 --- wget-1.19.5/m4/locale-ja.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/locale-ja.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# locale-ja.m4 serial 13 +# locale-ja.m4 serial 14 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, @@ -32,7 +32,7 @@ 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 __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 diff -Nru wget-1.19.5/m4/locale-zh.m4 wget-1.20.1/m4/locale-zh.m4 --- wget-1.19.5/m4/locale-zh.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/locale-zh.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# locale-zh.m4 serial 13 +# locale-zh.m4 serial 14 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, @@ -33,7 +33,7 @@ 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 __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 diff -Nru wget-1.19.5/m4/longlong.m4 wget-1.20.1/m4/longlong.m4 --- wget-1.19.5/m4/longlong.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/longlong.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# longlong.m4 serial 17 +# longlong.m4 serial 18 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, @@ -6,9 +6,10 @@ dnl From Paul Eggert. +AC_PREREQ([2.62]) + # Define HAVE_LONG_LONG_INT if 'long long int' works. -# This fixes a bug in Autoconf 2.61, and can be faster -# than what's in Autoconf 2.62 through 2.68. +# This can be faster than what's in Autoconf 2.62 through 2.68. # Note: If the type 'long long int' exists but is only 32 bits large # (as on some very old compilers), HAVE_LONG_LONG_INT will not be @@ -56,8 +57,7 @@ ]) # Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. -# This fixes a bug in Autoconf 2.61, and can be faster -# than what's in Autoconf 2.62 through 2.68. +# This fixes can be faster than what's in Autoconf 2.62 through 2.68. # Note: If the type 'unsigned long long int' exists but is only 32 bits # large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT diff -Nru wget-1.19.5/m4/lstat.m4 wget-1.20.1/m4/lstat.m4 --- wget-1.19.5/m4/lstat.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/lstat.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# serial 31 +# serial 32 # Copyright (C) 1997-2001, 2003-2018 Free Software Foundation, Inc. # @@ -53,6 +53,9 @@ [gl_cv_func_lstat_dereferences_slashed_symlink=yes], [gl_cv_func_lstat_dereferences_slashed_symlink=no], [case "$host_os" in + linux-* | linux) + # Guess yes on Linux systems. + gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; *-gnu* | gnu*) # Guess yes on glibc systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; diff -Nru wget-1.19.5/m4/malloc.m4 wget-1.20.1/m4/malloc.m4 --- wget-1.19.5/m4/malloc.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/malloc.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# malloc.m4 serial 16 +# malloc.m4 serial 17 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, @@ -91,7 +91,7 @@ AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[]], - [[#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + [[#if defined _WIN32 && ! defined __CYGWIN__ choke me #endif ]])], diff -Nru wget-1.19.5/m4/mbrtowc.m4 wget-1.20.1/m4/mbrtowc.m4 --- wget-1.19.5/m4/mbrtowc.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/mbrtowc.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# mbrtowc.m4 serial 30 -*- coding: utf-8 -*- +# mbrtowc.m4 serial 31 -*- 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 @@ -634,6 +634,7 @@ # Prerequisites of lib/mbrtowc.c. AC_DEFUN([gl_PREREQ_MBRTOWC], [ + AC_REQUIRE([AC_C_INLINE]) : ]) diff -Nru wget-1.19.5/m4/mkdir.m4 wget-1.20.1/m4/mkdir.m4 --- wget-1.19.5/m4/mkdir.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/mkdir.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# serial 13 +# serial 14 # Copyright (C) 2001, 2003-2004, 2006, 2008-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -23,19 +23,21 @@ [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* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on MSVC, no on mingw. - mingw*) AC_EGREP_CPP([Known], [ + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # 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" ;; + ], + [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 diff -Nru wget-1.19.5/m4/nanosleep.m4 wget-1.20.1/m4/nanosleep.m4 --- wget-1.19.5/m4/nanosleep.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/nanosleep.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# serial 37 +# serial 38 dnl From Jim Meyering. dnl Check for the nanosleep function. @@ -22,6 +22,8 @@ AC_CHECK_HEADERS_ONCE([sys/time.h]) AC_REQUIRE([gl_FUNC_SELECT]) + AC_CHECK_DECLS_ONCE([alarm]) + nanosleep_save_libs=$LIBS # Solaris 2.5.1 needs -lposix4 to get the nanosleep function. @@ -62,40 +64,49 @@ ? (t) -1 \ : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) + #if HAVE_DECL_ALARM static void check_for_SIGALRM (int sig) { if (sig != SIGALRM) _exit (1); } + #endif int main () { static struct timespec ts_sleep; static struct timespec ts_remaining; - static struct sigaction act; /* Test for major problems first. */ if (! nanosleep) return 2; - act.sa_handler = check_for_SIGALRM; - sigemptyset (&act.sa_mask); - sigaction (SIGALRM, &act, NULL); ts_sleep.tv_sec = 0; ts_sleep.tv_nsec = 1; - alarm (1); - if (nanosleep (&ts_sleep, NULL) != 0) + #if HAVE_DECL_ALARM + { + static struct sigaction act; + act.sa_handler = check_for_SIGALRM; + sigemptyset (&act.sa_mask); + sigaction (SIGALRM, &act, NULL); + alarm (1); + if (nanosleep (&ts_sleep, NULL) != 0) + return 3; + /* Test for a minor problem: the handling of large arguments. */ + ts_sleep.tv_sec = TYPE_MAXIMUM (time_t); + ts_sleep.tv_nsec = 999999999; + alarm (1); + if (nanosleep (&ts_sleep, &ts_remaining) != -1) + return 4; + if (errno != EINTR) + return 5; + if (ts_remaining.tv_sec <= TYPE_MAXIMUM (time_t) - 10) + return 6; + } + #else /* A simpler test for native Windows. */ + if (nanosleep (&ts_sleep, &ts_remaining) < 0) return 3; - /* Test for a minor problem: the handling of large arguments. */ - ts_sleep.tv_sec = TYPE_MAXIMUM (time_t); - ts_sleep.tv_nsec = 999999999; - alarm (1); - if (nanosleep (&ts_sleep, &ts_remaining) != -1) - return 4; - if (errno != EINTR) - return 5; - if (ts_remaining.tv_sec <= TYPE_MAXIMUM (time_t) - 10) - return 6; + #endif return 0; }]])], [gl_cv_func_nanosleep=yes], diff -Nru wget-1.19.5/m4/nl_langinfo.m4 wget-1.20.1/m4/nl_langinfo.m4 --- wget-1.19.5/m4/nl_langinfo.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/nl_langinfo.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# nl_langinfo.m4 serial 5 +# nl_langinfo.m4 serial 6 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, @@ -36,8 +36,11 @@ AC_DEFINE_UNQUOTED([FUNC_NL_LANGINFO_YESEXPR_WORKS], [$FUNC_NL_LANGINFO_YESEXPR_WORKS], [Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string.]) - if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \ - && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then + if test $HAVE_LANGINFO_CODESET = 1 \ + && test $HAVE_LANGINFO_T_FMT_AMPM = 1 \ + && test $HAVE_LANGINFO_ALTMON = 1 \ + && test $HAVE_LANGINFO_ERA = 1 \ + && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then : else REPLACE_NL_LANGINFO=1 diff -Nru wget-1.19.5/m4/nocrash.m4 wget-1.20.1/m4/nocrash.m4 --- wget-1.19.5/m4/nocrash.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/nocrash.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# nocrash.m4 serial 4 +# nocrash.m4 serial 5 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, @@ -79,7 +79,7 @@ } } } -#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#elif defined _WIN32 && ! defined __CYGWIN__ /* Avoid a crash on native Windows. */ #define WIN32_LEAN_AND_MEAN #include diff -Nru wget-1.19.5/m4/pathmax.m4 wget-1.20.1/m4/pathmax.m4 --- wget-1.19.5/m4/pathmax.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/pathmax.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# pathmax.m4 serial 10 +# pathmax.m4 serial 11 dnl Copyright (C) 2002-2003, 2005-2006, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -29,7 +29,7 @@ # undef PATH_MAX # define PATH_MAX 1024 #endif -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # undef PATH_MAX # define PATH_MAX 260 #endif diff -Nru wget-1.19.5/m4/posix_spawn.m4 wget-1.20.1/m4/posix_spawn.m4 --- wget-1.19.5/m4/posix_spawn.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/posix_spawn.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# posix_spawn.m4 serial 14 +# posix_spawn.m4 serial 15 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, @@ -33,45 +33,57 @@ dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setsigmask]) dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_destroy]) if test $ac_cv_func_posix_spawn = yes; then - gl_POSIX_SPAWN_WORKS - case "$gl_cv_func_posix_spawn_works" in - *yes) - AC_DEFINE([HAVE_WORKING_POSIX_SPAWN], [1], - [Define if you have the posix_spawn and posix_spawnp functions and - they work.]) - dnl Assume that these functions are available if POSIX_SPAWN_SETSCHEDULER - dnl evaluates to nonzero. - dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedpolicy]) - dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setschedpolicy]) - AC_CACHE_CHECK([whether posix_spawnattr_setschedpolicy is supported], - [gl_cv_func_spawnattr_setschedpolicy], - [AC_EGREP_CPP([POSIX scheduling supported], [ + m4_ifdef([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR], + [dnl Module 'posix_spawn_file_actions_addchdir' is present. + AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_addchdir_np]) + if test $ac_cv_func_posix_spawn_file_actions_addchdir_np = no; then + dnl In order to implement the posix_spawn_file_actions_addchdir + dnl function, we need to replace the entire posix_spawn facility. + REPLACE_POSIX_SPAWN=1 + fi + ]) + if test $REPLACE_POSIX_SPAWN = 0; then + gl_POSIX_SPAWN_WORKS + case "$gl_cv_func_posix_spawn_works" in + *yes) + dnl Assume that these functions are available if POSIX_SPAWN_SETSCHEDULER + dnl evaluates to nonzero. + dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedpolicy]) + dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setschedpolicy]) + AC_CACHE_CHECK([whether posix_spawnattr_setschedpolicy is supported], + [gl_cv_func_spawnattr_setschedpolicy], + [AC_EGREP_CPP([POSIX scheduling supported], [ #include #if POSIX_SPAWN_SETSCHEDULER POSIX scheduling supported #endif ], - [gl_cv_func_spawnattr_setschedpolicy=yes], - [gl_cv_func_spawnattr_setschedpolicy=no]) - ]) - dnl Assume that these functions are available if POSIX_SPAWN_SETSCHEDPARAM - dnl evaluates to nonzero. - dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedparam]) - dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setschedparam]) - AC_CACHE_CHECK([whether posix_spawnattr_setschedparam is supported], - [gl_cv_func_spawnattr_setschedparam], - [AC_EGREP_CPP([POSIX scheduling supported], [ + [gl_cv_func_spawnattr_setschedpolicy=yes], + [gl_cv_func_spawnattr_setschedpolicy=no]) + ]) + dnl Assume that these functions are available if POSIX_SPAWN_SETSCHEDPARAM + dnl evaluates to nonzero. + dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedparam]) + dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setschedparam]) + AC_CACHE_CHECK([whether posix_spawnattr_setschedparam is supported], + [gl_cv_func_spawnattr_setschedparam], + [AC_EGREP_CPP([POSIX scheduling supported], [ #include #if POSIX_SPAWN_SETSCHEDPARAM POSIX scheduling supported #endif ], - [gl_cv_func_spawnattr_setschedparam=yes], - [gl_cv_func_spawnattr_setschedparam=no]) - ]) - ;; - *) REPLACE_POSIX_SPAWN=1 ;; - esac + [gl_cv_func_spawnattr_setschedparam=yes], + [gl_cv_func_spawnattr_setschedparam=no]) + ]) + ;; + *) REPLACE_POSIX_SPAWN=1 ;; + esac + fi + fi + if test $ac_cv_func_posix_spawn != yes || test $REPLACE_POSIX_SPAWN = 1; then + AC_DEFINE([REPLACE_POSIX_SPAWN], [1], + [Define if gnulib uses its own posix_spawn and posix_spawnp functions.]) fi ]) diff -Nru wget-1.19.5/m4/printf.m4 wget-1.20.1/m4/printf.m4 --- wget-1.19.5/m4/printf.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/printf.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# printf.m4 serial 58 +# printf.m4 serial 59 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, @@ -1606,6 +1606,7 @@ dnl Cygwin 1.7.0 (2009) . . . # . . . ? . . . . . ? . . . . . . dnl Cygwin 1.5.25 (2008) . . . # # . . # . . . . . # . . . . . . dnl Cygwin 1.5.19 (2006) # . . # # # . # . # . # # # . . . . . . +dnl Solaris 11.4 . . # # # . . # . . . # . . . . . . . . dnl Solaris 11.3 . . . . # . . # . . . . . . . . . . . . dnl Solaris 11.0 . . # # # . . # . . . # . . . . . . . . dnl Solaris 10 . . # # # . . # . . . # # . . . . . . . diff -Nru wget-1.19.5/m4/pthread_rwlock_rdlock.m4 wget-1.20.1/m4/pthread_rwlock_rdlock.m4 --- wget-1.19.5/m4/pthread_rwlock_rdlock.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/pthread_rwlock_rdlock.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# pthread_rwlock_rdlock.m4 serial 1 +# pthread_rwlock_rdlock.m4 serial 2 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, @@ -23,12 +23,14 @@ dnl Without such a guarantee, applications have a hard time avoiding writer dnl starvation. dnl -dnl POSIX:2008 makes this requirement only for implementations that support TPS +dnl POSIX:2017 makes this requirement only for implementations that support TPS dnl (Thread Priority Scheduling) and only for the scheduling policies SCHED_FIFO dnl and SCHED_RR, see dnl http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_rwlock_rdlock.html -dnl but test verifies the guarantee regardless of TPS and regardless of +dnl but this test verifies the guarantee regardless of TPS and regardless of dnl scheduling policy. +dnl Glibc currently does not provide this guarantee, see +dnl https://sourceware.org/bugzilla/show_bug.cgi?id=13701 AC_DEFUN([gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER], [ AC_REQUIRE([gl_THREADLIB_EARLY]) diff -Nru wget-1.19.5/m4/select.m4 wget-1.20.1/m4/select.m4 --- wget-1.19.5/m4/select.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/select.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# select.m4 serial 9 +# select.m4 serial 10 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, @@ -74,10 +74,12 @@ [gl_cv_func_select_detects_ebadf=no], [ case "$host_os" in - # 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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_select_detects_ebadf="guessing yes" ;; + # 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 -Nru wget-1.19.5/m4/servent.m4 wget-1.20.1/m4/servent.m4 --- wget-1.19.5/m4/servent.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/servent.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# servent.m4 serial 2 +# servent.m4 serial 3 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, @@ -10,7 +10,7 @@ dnl getservbyport() defined? dnl Where are getprotoent(), setprotoent(), endprotoent(), getprotobyname(), dnl getprotobynumber() defined? - dnl - On Solaris, they are in libsocket. Ignore libxnet. + dnl - On Solaris < 11.4, they are in libsocket. Ignore libxnet. dnl - On Haiku, they are in libnetwork. dnl - On BeOS, they are in libnet. dnl - On native Windows, they are in ws2_32.dll. diff -Nru wget-1.19.5/m4/sh-filename.m4 wget-1.20.1/m4/sh-filename.m4 --- wget-1.19.5/m4/sh-filename.m4 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/m4/sh-filename.m4 2018-12-26 20:08:21.000000000 +0000 @@ -0,0 +1,20 @@ +# sh-filename.m4 serial 1 +dnl Copyright (C) 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_SH_FILENAME], +[ + AH_VERBATIM([SH_FILENAME], +[/* File name of the Bourne shell. */ +#if defined __CYGWIN__ +/* Omit the directory part because for 32-bit Cygwin programs in a + 64-bit Cygwin environment, the Cygwin mounts are not visible. */ +# define BOURNE_SHELL "sh" +#else +# define BOURNE_SHELL "/bin/sh" +#endif]) +]) diff -Nru wget-1.19.5/m4/size_max.m4 wget-1.20.1/m4/size_max.m4 --- wget-1.19.5/m4/size_max.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/size_max.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# size_max.m4 serial 10 +# size_max.m4 serial 11 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, @@ -6,6 +6,8 @@ dnl From Bruno Haible. +AC_PREREQ([2.61]) + AC_DEFUN([gl_SIZE_MAX], [ AC_CHECK_HEADERS([stdint.h]) @@ -71,9 +73,3 @@ # undef SIZE_MAX #endif]) ]) - -dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. -dnl Remove this when we can assume autoconf >= 2.61. -m4_ifdef([AC_COMPUTE_INT], [], [ - AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) -]) diff -Nru wget-1.19.5/m4/socketlib.m4 wget-1.20.1/m4/socketlib.m4 --- wget-1.19.5/m4/socketlib.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/socketlib.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# socketlib.m4 serial 1 +# socketlib.m4 serial 2 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, @@ -38,6 +38,10 @@ dnl Solaris has most socket functions in libsocket. dnl Haiku has most socket functions in libnetwork. dnl BeOS has most socket functions in libnet. + dnl On HP-UX, do NOT link with libxnet, because in 64-bit mode this would + dnl break code (e.g. in libraries) that invokes accept(), getpeername(), + dnl getsockname(), getsockopt(), or recvfrom() with a 32-bit addrlen. See + dnl "man xopen_networking" for details. AC_CACHE_CHECK([for library containing setsockopt], [gl_cv_lib_socket], [ gl_cv_lib_socket= AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern diff -Nru wget-1.19.5/m4/socklen.m4 wget-1.20.1/m4/socklen.m4 --- wget-1.19.5/m4/socklen.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/socklen.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# socklen.m4 serial 10 +# socklen.m4 serial 11 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, @@ -15,8 +15,8 @@ AC_DEFUN([gl_TYPE_SOCKLEN_T], [AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])dnl AC_CHECK_TYPE([socklen_t], , - [AC_MSG_CHECKING([for socklen_t equivalent]) - AC_CACHE_VAL([gl_cv_socklen_t_equiv], + [AC_CACHE_CHECK([for socklen_t equivalent], + [gl_cv_socklen_t_equiv], [# Systems have either "struct sockaddr *" or # "void *" as the second argument to getpeername gl_cv_socklen_t_equiv= @@ -34,11 +34,10 @@ done test "$gl_cv_socklen_t_equiv" != "" && break done - ]) - if test "$gl_cv_socklen_t_equiv" = ""; then - AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) - fi - AC_MSG_RESULT([$gl_cv_socklen_t_equiv]) + if test "$gl_cv_socklen_t_equiv" = ""; then + AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) + fi + ]) AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv], [type to use in place of socklen_t if not defined])], [gl_SOCKET_HEADERS])]) diff -Nru wget-1.19.5/m4/sockpfaf.m4 wget-1.20.1/m4/sockpfaf.m4 --- wget-1.19.5/m4/sockpfaf.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/sockpfaf.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# sockpfaf.m4 serial 8 +# sockpfaf.m4 serial 9 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, @@ -16,8 +16,8 @@ AC_REQUIRE([gl_HEADER_SYS_SOCKET]) AC_CHECK_HEADERS_ONCE([netinet/in.h]) - AC_MSG_CHECKING([for IPv4 sockets]) - AC_CACHE_VAL([gl_cv_socket_ipv4], + AC_CACHE_CHECK([for IPv4 sockets], + [gl_cv_socket_ipv4], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #ifdef HAVE_SYS_SOCKET_H #include @@ -31,13 +31,12 @@ [[int x = AF_INET; struct in_addr y; struct sockaddr_in z; if (&x && &y && &z) return 0;]])], gl_cv_socket_ipv4=yes, gl_cv_socket_ipv4=no)]) - AC_MSG_RESULT([$gl_cv_socket_ipv4]) if test $gl_cv_socket_ipv4 = yes; then AC_DEFINE([HAVE_IPV4], [1], [Define to 1 if defines AF_INET.]) fi - AC_MSG_CHECKING([for IPv6 sockets]) - AC_CACHE_VAL([gl_cv_socket_ipv6], + AC_CACHE_CHECK([for IPv6 sockets], + [gl_cv_socket_ipv6], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #ifdef HAVE_SYS_SOCKET_H #include @@ -54,7 +53,6 @@ [[int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z; if (&x && &y && &z) return 0;]])], gl_cv_socket_ipv6=yes, gl_cv_socket_ipv6=no)]) - AC_MSG_RESULT([$gl_cv_socket_ipv6]) if test $gl_cv_socket_ipv6 = yes; then AC_DEFINE([HAVE_IPV6], [1], [Define to 1 if defines AF_INET6.]) fi @@ -65,8 +63,8 @@ AC_REQUIRE([gl_HEADER_SYS_SOCKET]) AC_CHECK_HEADERS_ONCE([sys/un.h]) - AC_MSG_CHECKING([for UNIX domain sockets]) - AC_CACHE_VAL([gl_cv_socket_unix], + AC_CACHE_CHECK([for UNIX domain sockets], + [gl_cv_socket_unix], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #ifdef HAVE_SYS_SOCKET_H #include @@ -80,7 +78,6 @@ [[int x = AF_UNIX; struct sockaddr_un y; if (&x && &y) return 0;]])], gl_cv_socket_unix=yes, gl_cv_socket_unix=no)]) - AC_MSG_RESULT([$gl_cv_socket_unix]) if test $gl_cv_socket_unix = yes; then AC_DEFINE([HAVE_UNIXSOCKET], [1], [Define to 1 if defines AF_UNIX.]) fi diff -Nru wget-1.19.5/m4/spawn_h.m4 wget-1.20.1/m4/spawn_h.m4 --- wget-1.19.5/m4/spawn_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/spawn_h.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# spawn_h.m4 serial 16 +# spawn_h.m4 serial 17 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, @@ -53,7 +53,7 @@ posix_spawnattr_getschedparam posix_spawnattr_setschedparam posix_spawn_file_actions_init posix_spawn_file_actions_destroy posix_spawn_file_actions_addopen posix_spawn_file_actions_addclose - posix_spawn_file_actions_adddup2]) + posix_spawn_file_actions_adddup2 posix_spawn_file_actions_addchdir]) ]) dnl Checks whether the system has the functions posix_spawn. @@ -92,6 +92,7 @@ GNULIB_POSIX_SPAWN=0; AC_SUBST([GNULIB_POSIX_SPAWN]) GNULIB_POSIX_SPAWNP=0; AC_SUBST([GNULIB_POSIX_SPAWNP]) GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT=0; AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT]) + GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR=0; AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR]) GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0; AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE]) GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0; AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2]) GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0; AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN]) @@ -115,7 +116,11 @@ HAVE_POSIX_SPAWNATTR_T=1; AC_SUBST([HAVE_POSIX_SPAWNATTR_T]) HAVE_POSIX_SPAWN_FILE_ACTIONS_T=1; AC_SUBST([HAVE_POSIX_SPAWN_FILE_ACTIONS_T]) + HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR=1; + AC_SUBST([HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR]) REPLACE_POSIX_SPAWN=0; AC_SUBST([REPLACE_POSIX_SPAWN]) + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR=0; + AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR]) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0; AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE]) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0; diff -Nru wget-1.19.5/m4/stat.m4 wget-1.20.1/m4/stat.m4 --- wget-1.19.5/m4/stat.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/stat.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# serial 14 +# serial 15 # Copyright (C) 2009-2018 Free Software Foundation, Inc. # @@ -43,10 +43,12 @@ ]])], [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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;; + # 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]) diff -Nru wget-1.19.5/m4/stddef_h.m4 wget-1.20.1/m4/stddef_h.m4 --- wget-1.19.5/m4/stddef_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/stddef_h.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,5 +1,5 @@ dnl A placeholder for , for platforms that have issues. -# stddef_h.m4 serial 5 +# stddef_h.m4 serial 6 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, @@ -10,13 +10,33 @@ AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) AC_REQUIRE([gt_TYPE_WCHAR_T]) STDDEF_H= - AC_CHECK_TYPE([max_align_t], [], [HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h], - [[#include - ]]) + + dnl Test whether the type max_align_t exists and whether its alignment + dnl "is as great as is supported by the implementation in all contexts". + AC_CACHE_CHECK([for good max_align_t], + [gl_cv_type_max_align_t], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + unsigned int s = sizeof (max_align_t); + #if defined __GNUC__ || defined __IBM__ALIGNOF__ + int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; + int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1]; + #endif + ]])], + [gl_cv_type_max_align_t=yes], + [gl_cv_type_max_align_t=no]) + ]) + if test $gl_cv_type_max_align_t = no; then + HAVE_MAX_ALIGN_T=0 + STDDEF_H=stddef.h + fi + if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 STDDEF_H=stddef.h fi + AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions], [gl_cv_decl_null_works], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include @@ -28,6 +48,7 @@ REPLACE_NULL=1 STDDEF_H=stddef.h fi + AC_SUBST([STDDEF_H]) AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"]) if test -n "$STDDEF_H"; then diff -Nru wget-1.19.5/m4/std-gnu11.m4 wget-1.20.1/m4/std-gnu11.m4 --- wget-1.19.5/m4/std-gnu11.m4 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/m4/std-gnu11.m4 2018-12-26 20:08:21.000000000 +0000 @@ -0,0 +1,824 @@ +# Prefer GNU C11 and C++11 to earlier versions. -*- coding: utf-8 -*- + +# This implementation is taken from GNU Autoconf lib/autoconf/c.m4 +# commit 017d5ddd82854911f0119691d91ea8a1438824d6 +# dated Sun Apr 3 13:57:17 2016 -0700 +# This implementation will be obsolete once we can assume Autoconf 2.70 +# or later is installed everywhere a Gnulib program might be developed. + + +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Written by David MacKenzie, with help from +# Akim Demaille, Paul Eggert, +# François Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, +# Roland McGrath, Noah Friedman, david d zuhn, and many others. + + +# AC_PROG_CC([COMPILER ...]) +# -------------------------- +# COMPILER ... is a space separated list of C compilers to search for. +# This just gives the user an opportunity to specify an alternative +# search list for the C compiler. +AC_DEFUN_ONCE([AC_PROG_CC], +[AC_LANG_PUSH(C)dnl +AC_ARG_VAR([CC], [C compiler command])dnl +AC_ARG_VAR([CFLAGS], [C compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +_AC_ARG_VAR_LIBS()dnl +_AC_ARG_VAR_CPPFLAGS()dnl +m4_ifval([$1], + [AC_CHECK_TOOLS(CC, [$1])], +[AC_CHECK_TOOL(CC, gcc) +if test -z "$CC"; then + dnl Here we want: + dnl AC_CHECK_TOOL(CC, cc) + dnl but without the check for a tool without the prefix. + dnl Until the check is removed from there, copy the code: + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(CC, [${ac_tool_prefix}cc], [${ac_tool_prefix}cc]) + fi +fi +if test -z "$CC"; then + AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) +fi +if test -z "$CC"; then + AC_CHECK_TOOLS(CC, cl.exe) +fi +if test -z "$CC"; then + AC_CHECK_TOOL(CC, clang) +fi +]) + +test -z "$CC" && AC_MSG_FAILURE([no acceptable C compiler found in \$PATH]) + +# Provide some information about the compiler. +_AS_ECHO_LOG([checking for _AC_LANG compiler version]) +set X $ac_compile +ac_compiler=$[2] +for ac_option in --version -v -V -qversion -version; do + m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) +done + +m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl +m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl +_AC_LANG_COMPILER_GNU +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +_AC_PROG_CC_G +dnl +dnl Set ac_prog_cc_stdc to the supported C version. +dnl Also set the documented variable ac_cv_prog_cc_stdc; +dnl its name was chosen when it was cached, but it is no longer cached. +_AC_PROG_CC_C11([ac_prog_cc_stdc=c11 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11], + [_AC_PROG_CC_C99([ac_prog_cc_stdc=c99 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99], + [_AC_PROG_CC_C89([ac_prog_cc_stdc=c89 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89], + [ac_prog_cc_stdc=no + ac_cv_prog_cc_stdc=no])])]) +dnl +AC_LANG_POP(C)dnl +])# AC_PROG_CC + + + +# AC_PROG_CXX([LIST-OF-COMPILERS]) +# -------------------------------- +# LIST-OF-COMPILERS is a space separated list of C++ compilers to search +# for (if not specified, a default list is used). This just gives the +# user an opportunity to specify an alternative search list for the C++ +# compiler. +# aCC HP-UX C++ compiler much better than `CC', so test before. +# FCC Fujitsu C++ compiler +# KCC KAI C++ compiler +# RCC Rational C++ +# xlC_r AIX C Set++ (with support for reentrant code) +# xlC AIX C Set++ +AC_DEFUN([AC_PROG_CXX], +[AC_LANG_PUSH(C++)dnl +AC_ARG_VAR([CXX], [C++ compiler command])dnl +AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +_AC_ARG_VAR_LIBS()dnl +_AC_ARG_VAR_CPPFLAGS()dnl +_AC_ARG_VAR_PRECIOUS([CCC])dnl +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + AC_CHECK_TOOLS(CXX, + [m4_default([$1], + [g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++])], + g++) + fi +fi +# Provide some information about the compiler. +_AS_ECHO_LOG([checking for _AC_LANG compiler version]) +set X $ac_compile +ac_compiler=$[2] +for ac_option in --version -v -V -qversion; do + m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) +done + +m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl +m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl +_AC_LANG_COMPILER_GNU +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +_AC_PROG_CXX_G +_AC_PROG_CXX_CXX11([ac_prog_cxx_stdcxx=cxx11 + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_cv_prog_cxx_cxx98=$ac_cv_prog_cxx_cxx11], + [_AC_PROG_CXX_CXX98([ac_prog_cxx_stdcxx=cxx98 + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98], + [ac_prog_cxx_stdcxx=no + ac_cv_prog_cxx_stdcxx=no])]) +AC_LANG_POP(C++)dnl +])# AC_PROG_CXX + + +# _AC_C_STD_TRY(STANDARD, TEST-PROLOGUE, TEST-BODY, OPTION-LIST, +# ACTION-IF-AVAILABLE, ACTION-IF-UNAVAILABLE) +# -------------------------------------------------------------- +# Check whether the C compiler accepts features of STANDARD (e.g `c89', `c99') +# by trying to compile a program of TEST-PROLOGUE and TEST-BODY. If this fails, +# try again with each compiler option in the space-separated OPTION-LIST; if one +# helps, append it to CC. If eventually successful, run ACTION-IF-AVAILABLE, +# else ACTION-IF-UNAVAILABLE. +AC_DEFUN([_AC_C_STD_TRY], +[AC_MSG_CHECKING([for $CC option to enable ]m4_translit($1, [c], [C])[ features]) +AC_CACHE_VAL(ac_cv_prog_cc_$1, +[ac_cv_prog_cc_$1=no +ac_save_CC=$CC +AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])]) +for ac_arg in '' $4 +do + CC="$ac_save_CC $ac_arg" + _AC_COMPILE_IFELSE([], [ac_cv_prog_cc_$1=$ac_arg]) + test "x$ac_cv_prog_cc_$1" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +])# AC_CACHE_VAL +ac_prog_cc_stdc_options= +case "x$ac_cv_prog_cc_$1" in + x) + AC_MSG_RESULT([none needed]) ;; + xno) + AC_MSG_RESULT([unsupported]) ;; + *) + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_$1" + CC=$CC$ac_prog_cc_stdc_options + AC_MSG_RESULT([$ac_cv_prog_cc_$1]) ;; +esac +AS_IF([test "x$ac_cv_prog_cc_$1" != xno], [$5], [$6]) +])# _AC_C_STD_TRY + +# _AC_C_C99_TEST_HEADER +# --------------------- +# A C header suitable for testing for C99. +AC_DEFUN([_AC_C_C99_TEST_HEADER], +[[#include +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +}]])# _AC_C_C99_TEST_HEADER + +# _AC_C_C99_TEST_BODY +# ------------------- +# A C body suitable for testing for C99, assuming the corresponding header. +AC_DEFUN([_AC_C_C99_TEST_BODY], +[[ + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); +]]) + +# _AC_PROG_CC_C99 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ---------------------------------------------------------------- +# If the C compiler is not in ISO C99 mode by default, try to add an +# option to output variable CC to make it so. This macro tries +# various options that select ISO C99 on some system or another. It +# considers the compiler to be in ISO C99 mode if it handles _Bool, +# // comments, flexible array members, inline, long long int, mixed +# code and declarations, named initialization of structs, restrict, +# va_copy, varargs macros, variable declarations in for loops and +# variable length arrays. +AC_DEFUN([_AC_PROG_CC_C99], +[_AC_C_STD_TRY([c99], +[_AC_C_C99_TEST_HEADER], +[_AC_C_C99_TEST_BODY], +dnl Try +dnl GCC -std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999) +dnl IBM XL C -qlanglvl=extc1x (V12.1; does not pass C11 test) +dnl IBM XL C -qlanglvl=extc99 +dnl (pre-V12.1; unused restrictive mode: -qlanglvl=stdc99) +dnl HP cc -AC99 +dnl Intel ICC -std=c99, -c99 (deprecated) +dnl IRIX -c99 +dnl Solaris -D_STDC_C99= +dnl cc's -xc99 option uses linker magic to define the external +dnl symbol __xpg4 as if by "int __xpg4 = 1;", which enables C99 +dnl behavior for C library functions. This is not wanted here, +dnl because it means that a single module compiled with -xc99 +dnl alters C runtime behavior for the entire program, not for +dnl just the module. Instead, define the (private) symbol +dnl _STDC_C99, which suppresses a bogus failure in . +dnl The resulting compiler passes the test case here, and that's +dnl good enough. For more, please see the thread starting at: +dnl https://lists.gnu.org/r/autoconf/2010-12/msg00059.html +dnl Tru64 -c99 +dnl with extended modes being tried first. +[[-std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99]], [$1], [$2])[]dnl +])# _AC_PROG_CC_C99 + + +# _AC_PROG_CC_C11 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ---------------------------------------------------------------- +# If the C compiler is not in ISO C11 mode by default, try to add an +# option to output variable CC to make it so. This macro tries +# various options that select ISO C11 on some system or another. It +# considers the compiler to be in ISO C11 mode if it handles _Alignas, +# _Alignof, _Noreturn, _Static_assert, UTF-8 string literals, +# duplicate typedefs, and anonymous structures and unions. +AC_DEFUN([_AC_PROG_CC_C11], +[_AC_C_STD_TRY([c11], +[_AC_C_C99_TEST_HEADER[ +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +]], +[_AC_C_C99_TEST_BODY[ + v1.i = 2; + v1.w.k = 5; + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); +]], +dnl Try +dnl GCC -std=gnu11 (unused restrictive mode: -std=c11) +dnl with extended modes being tried first. +dnl +dnl Do not try -qlanglvl=extc1x, because IBM XL C V12.1 (the latest version as +dnl of September 2012) does not pass the C11 test. For now, try extc1x when +dnl compiling the C99 test instead, since it enables _Static_assert and +dnl _Noreturn, which is a win. If -qlanglvl=extc11 or -qlanglvl=extc1x passes +dnl the C11 test in some future version of IBM XL C, we'll add it here, +dnl preferably extc11. +[[-std=gnu11]], [$1], [$2])[]dnl +])# _AC_PROG_CC_C11 + + +# AC_PROG_CC_C89 +# -------------- +# Do not use AU_ALIAS here and in AC_PROG_CC_C99 and AC_PROG_CC_STDC, +# as that'd be incompatible with how Automake redefines AC_PROG_CC. See +# . +AU_DEFUN([AC_PROG_CC_C89], + [AC_REQUIRE([AC_PROG_CC])], + [$0 is obsolete; use AC_PROG_CC] +) + +# AC_PROG_CC_C99 +# -------------- +AU_DEFUN([AC_PROG_CC_C99], + [AC_REQUIRE([AC_PROG_CC])], + [$0 is obsolete; use AC_PROG_CC] +) + +# AC_PROG_CC_STDC +# --------------- +AU_DEFUN([AC_PROG_CC_STDC], + [AC_REQUIRE([AC_PROG_CC])], + [$0 is obsolete; use AC_PROG_CC] +) + + +# AC_C_PROTOTYPES +# --------------- +# Check if the C compiler supports prototypes, included if it needs +# options. +AC_DEFUN([AC_C_PROTOTYPES], +[AC_REQUIRE([AC_PROG_CC])dnl +if test "$ac_prog_cc_stdc" != no; then + AC_DEFINE(PROTOTYPES, 1, + [Define to 1 if the C compiler supports function prototypes.]) + AC_DEFINE(__PROTOTYPES, 1, + [Define like PROTOTYPES; this can be used by system headers.]) +fi +])# AC_C_PROTOTYPES + + +# _AC_CXX_STD_TRY(STANDARD, TEST-PROLOGUE, TEST-BODY, OPTION-LIST, +# ACTION-IF-AVAILABLE, ACTION-IF-UNAVAILABLE) +# ---------------------------------------------------------------- +# Check whether the C++ compiler accepts features of STANDARD (e.g +# `cxx98', `cxx11') by trying to compile a program of TEST-PROLOGUE +# and TEST-BODY. If this fails, try again with each compiler option +# in the space-separated OPTION-LIST; if one helps, append it to CXX. +# If eventually successful, run ACTION-IF-AVAILABLE, else +# ACTION-IF-UNAVAILABLE. +AC_DEFUN([_AC_CXX_STD_TRY], +[AC_MSG_CHECKING([for $CXX option to enable ]m4_translit(m4_translit($1, [x], [+]), [a-z], [A-Z])[ features]) +AC_LANG_PUSH(C++)dnl +AC_CACHE_VAL(ac_cv_prog_cxx_$1, +[ac_cv_prog_cxx_$1=no +ac_save_CXX=$CXX +AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])]) +for ac_arg in '' $4 +do + CXX="$ac_save_CXX $ac_arg" + _AC_COMPILE_IFELSE([], [ac_cv_prog_cxx_$1=$ac_arg]) + test "x$ac_cv_prog_cxx_$1" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +])# AC_CACHE_VAL +ac_prog_cxx_stdcxx_options= +case "x$ac_cv_prog_cxx_$1" in + x) + AC_MSG_RESULT([none needed]) ;; + xno) + AC_MSG_RESULT([unsupported]) ;; + *) + ac_prog_cxx_stdcxx_options=" $ac_cv_prog_cxx_$1" + CXX=$CXX$ac_prog_cxx_stdcxx_options + AC_MSG_RESULT([$ac_cv_prog_cxx_$1]) ;; +esac +AC_LANG_POP(C++)dnl +AS_IF([test "x$ac_cv_prog_cxx_$1" != xno], [$5], [$6]) +])# _AC_CXX_STD_TRY + +# _AC_CXX_CXX98_TEST_HEADER +# ------------------------- +# A C++ header suitable for testing for CXX98. +AC_DEFUN([_AC_CXX_CXX98_TEST_HEADER], +[[ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace test { + typedef std::vector string_vec; + typedef std::pair map_value; + typedef std::map map_type; + typedef std::set set_type; + + template + class printer { + public: + printer(std::ostringstream& os): os(os) {} + void operator() (T elem) { os << elem << std::endl; } + private: + std::ostringstream& os; + }; +} +]])# _AC_CXX_CXX98_TEST_HEADER + +# _AC_CXX_CXX98_TEST_BODY +# ----------------------- +# A C++ body suitable for testing for CXX98, assuming the corresponding header. +AC_DEFUN([_AC_CXX_CXX98_TEST_BODY], +[[ + +try { + // Basic string. + std::string teststr("ASCII text"); + teststr += " string"; + + // Simple vector. + test::string_vec testvec; + testvec.push_back(teststr); + testvec.push_back("foo"); + testvec.push_back("bar"); + if (testvec.size() != 3) { + throw std::runtime_error("vector size is not 1"); + } + + // Dump vector into stringstream and obtain string. + std::ostringstream os; + for (test::string_vec::const_iterator i = testvec.begin(); + i != testvec.end(); ++i) { + if (i + 1 != testvec.end()) { + os << teststr << '\n'; + } + } + // Check algorithms work. + std::for_each(testvec.begin(), testvec.end(), test::printer(os)); + std::string os_out = os.str(); + + // Test pair and map. + test::map_type testmap; + testmap.insert(std::make_pair(std::string("key"), + std::make_pair(53,false))); + + // Test set. + int values[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + test::set_type testset(values, values + sizeof(values)/sizeof(values[0])); + std::list testlist(testset.begin(), testset.end()); + std::copy(testset.begin(), testset.end(), std::back_inserter(testlist)); +} catch (const std::exception& e) { + std::cerr << "Caught exception: " << e.what() << std::endl; + + // Test fstream + std::ofstream of("test.txt"); + of << "Test ASCII text\n" << std::flush; + of << "N= " << std::hex << std::setw(8) << std::left << 534 << std::endl; + of.close(); +} +std::exit(0); +]]) + +# _AC_CXX_CXX11_TEST_HEADER +# ------------------------- +# A C++ header suitable for testing for CXX11. +AC_DEFUN([_AC_CXX_CXX11_TEST_HEADER], +[[ +#include +#include +#include +#include +#include +#include +#include + +namespace cxx11test +{ + typedef std::shared_ptr sptr; + typedef std::weak_ptr wptr; + + typedef std::tuple tp; + typedef std::array int_array; + + constexpr int get_val() { return 20; } + + struct testinit + { + int i; + double d; + }; + + class delegate { + public: + delegate(int n) : n(n) {} + delegate(): delegate(2354) {} + + virtual int getval() { return this->n; }; + protected: + int n; + }; + + class overridden : public delegate { + public: + overridden(int n): delegate(n) {} + virtual int getval() override final { return this->n * 2; } + }; + + class nocopy { + public: + nocopy(int i): i(i) {} + nocopy() = default; + nocopy(const nocopy&) = delete; + nocopy & operator=(const nocopy&) = delete; + private: + int i; + }; +} +]])# _AC_CXX_CXX11_TEST_HEADER + +# _AC_CXX_CXX11_TEST_BODY +# ----------------------- +# A C++ body suitable for testing for CXX11, assuming the corresponding header. +AC_DEFUN([_AC_CXX_CXX11_TEST_BODY], +[[ +{ + // Test auto and decltype + std::deque d; + d.push_front(43); + d.push_front(484); + d.push_front(3); + d.push_front(844); + int total = 0; + for (auto i = d.begin(); i != d.end(); ++i) { total += *i; } + + auto a1 = 6538; + auto a2 = 48573953.4; + auto a3 = "String literal"; + + decltype(a2) a4 = 34895.034; +} +{ + // Test constexpr + short sa[cxx11test::get_val()] = { 0 }; +} +{ + // Test initializer lists + cxx11test::testinit il = { 4323, 435234.23544 }; +} +{ + // Test range-based for and lambda + cxx11test::int_array array = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + for (int &x : array) { x += 23; } + std::for_each(array.begin(), array.end(), [](int v1){ std::cout << v1; }); +} +{ + using cxx11test::sptr; + using cxx11test::wptr; + + sptr sp(new std::string("ASCII string")); + wptr wp(sp); + sptr sp2(wp); +} +{ + cxx11test::tp tuple("test", 54, 45.53434); + double d = std::get<2>(tuple); + std::string s; + int i; + std::tie(s,i,d) = tuple; +} +{ + static std::regex filename_regex("^_?([a-z0-9_.]+-)+[a-z0-9]+$"); + std::string testmatch("Test if this string matches"); + bool match = std::regex_search(testmatch, filename_regex); +} +{ + cxx11test::int_array array = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + cxx11test::int_array::size_type size = array.size(); +} +{ + // Test constructor delegation + cxx11test::delegate d1; + cxx11test::delegate d2(); + cxx11test::delegate d3(45); +} +{ + // Test override and final + cxx11test::overridden o1(55464); +} +{ + // Test nullptr + char *c = nullptr; +} +{ + // Test template brackets + std::vector> v1; +} +{ + // Unicode literals + char const *utf8 = u8"UTF-8 string \u2500"; + char16_t const *utf16 = u"UTF-8 string \u2500"; + char32_t const *utf32 = U"UTF-32 string \u2500"; +} +]]) + +# _AC_PROG_CXX_CXX98 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ------------------------------------------------------------------- + +# If the C++ compiler is not in ISO C++98 mode by default, try to add +# an option to output variable CXX to make it so. This macro tries +# various options that select ISO C++98 on some system or another. It +# considers the compiler to be in ISO C++98 mode if it handles basic +# features of the std namespace including: string, containers (list, +# map, set, vector), streams (fstreams, iostreams, stringstreams, +# iomanip), pair, exceptions and algorithms. + + +AC_DEFUN([_AC_PROG_CXX_CXX98], +[_AC_CXX_STD_TRY([cxx98], +[_AC_CXX_CXX98_TEST_HEADER], +[_AC_CXX_CXX98_TEST_BODY], +dnl Try +dnl GCC -std=gnu++98 (unused restrictive mode: -std=c++98) +dnl IBM XL C -qlanglvl=extended +dnl HP aC++ -AA +dnl Intel ICC -std=gnu++98 +dnl Solaris N/A (default) +dnl Tru64 N/A (default, but -std gnu could be used) +dnl with extended modes being tried first. +[[-std=gnu++98 -std=c++98 -qlanglvl=extended -AA]], [$1], [$2])[]dnl +])# _AC_PROG_CXX_CXX98 + +# _AC_PROG_CXX_CXX11 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ------------------------------------------------------------------- +# If the C++ compiler is not in ISO CXX11 mode by default, try to add +# an option to output variable CXX to make it so. This macro tries +# various options that select ISO C++11 on some system or another. It +# considers the compiler to be in ISO C++11 mode if it handles all the +# tests from the C++98 checks, plus the following: Language features +# (auto, constexpr, decltype, default/deleted constructors, delegate +# constructors, final, initializer lists, lambda functions, nullptr, +# override, range-based for loops, template brackets without spaces, +# unicode literals) and library features (array, memory (shared_ptr, +# weak_ptr), regex and tuple types). +AC_DEFUN([_AC_PROG_CXX_CXX11], +[_AC_CXX_STD_TRY([cxx11], +[_AC_CXX_CXX11_TEST_HEADER +_AC_CXX_CXX98_TEST_HEADER], +[_AC_CXX_CXX11_TEST_BODY +_AC_CXX_CXX98_TEST_BODY], +dnl Try +dnl GCC -std=gnu++11 (unused restrictive mode: -std=c++11) [and 0x variants] +dnl IBM XL C -qlanglvl=extended0x +dnl (pre-V12.1; unused restrictive mode: -qlanglvl=stdcxx11) +dnl HP aC++ -AA +dnl Intel ICC -std=c++11 -std=c++0x +dnl Solaris N/A (no support) +dnl Tru64 N/A (no support) +dnl with extended modes being tried first. +[[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl +])# _AC_PROG_CXX_CXX11 diff -Nru wget-1.19.5/m4/stdint.m4 wget-1.20.1/m4/stdint.m4 --- wget-1.19.5/m4/stdint.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/stdint.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# stdint.m4 serial 51 +# stdint.m4 serial 53 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, @@ -7,6 +7,8 @@ dnl From Paul Eggert and Bruno Haible. dnl Test whether is supported or must be substituted. +AC_PREREQ([2.61]) + AC_DEFUN_ONCE([gl_STDINT_H], [ AC_PREREQ([2.59])dnl @@ -364,8 +366,7 @@ esac dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. - LIMITS_H=limits.h - AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) + gl_REPLACE_LIMITS_H AC_SUBST([HAVE_C99_STDINT_H]) AC_SUBST([HAVE_SYS_BITYPES_H]) @@ -541,9 +542,3 @@ BITSIZEOF_WINT_T=32 fi ]) - -dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. -dnl Remove this when we can assume autoconf >= 2.61. -m4_ifdef([AC_COMPUTE_INT], [], [ - AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) -]) diff -Nru wget-1.19.5/m4/stdio_h.m4 wget-1.20.1/m4/stdio_h.m4 --- wget-1.19.5/m4/stdio_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/stdio_h.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# stdio_h.m4 serial 48 +# stdio_h.m4 serial 49 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, @@ -28,7 +28,7 @@ /* For non-mingw systems, compilation will trivially succeed. For mingw, compilation will succeed for older mingw (system printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ - #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \ + #if (defined _WIN32 && ! defined __CYGWIN__) && \ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; #endif diff -Nru wget-1.19.5/m4/stdlib_h.m4 wget-1.20.1/m4/stdlib_h.m4 --- wget-1.19.5/m4/stdlib_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/stdlib_h.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# stdlib_h.m4 serial 44 +# stdlib_h.m4 serial 45 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, @@ -14,6 +14,9 @@ dnl guaranteed by C89. gl_WARN_ON_USE_PREPARE([[#include #if HAVE_SYS_LOADAVG_H +/* OpenIndiana has a bug: must be included before + . */ +# include # include #endif #if HAVE_RANDOM_H diff -Nru wget-1.19.5/m4/symlink.m4 wget-1.20.1/m4/symlink.m4 --- wget-1.19.5/m4/symlink.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/symlink.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# serial 7 +# serial 8 # See if we need to provide symlink replacement. dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. @@ -36,10 +36,12 @@ ]])], [gl_cv_func_symlink_works=yes], [gl_cv_func_symlink_works=no], [case "$host_os" in - # 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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_symlink_works="guessing yes" ;; + # 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 -Nru wget-1.19.5/m4/threadlib.m4 wget-1.20.1/m4/threadlib.m4 --- wget-1.19.5/m4/threadlib.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/threadlib.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# threadlib.m4 serial 13 +# threadlib.m4 serial 15 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, @@ -6,6 +6,8 @@ dnl From Bruno Haible. +AC_PREREQ([2.60]) + dnl gl_THREADLIB dnl ------------ dnl Tests for a multithreading library to be used. @@ -43,11 +45,7 @@ AC_REQUIRE([AC_CANONICAL_HOST]) dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems. - dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes - dnl AC_GNU_SOURCE. - m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], - [AC_REQUIRE([AC_GNU_SOURCE])]) + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl Check for multithreading. m4_ifdef([gl_THREADLIB_DEFAULT_NO], [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])], @@ -153,6 +151,36 @@ *" -static "*) gl_cv_have_weak=no ;; esac ]) + dnl Check whether the linker supports the --as-needed/--no-as-needed options. + dnl Assume GCC, so that we can use the -Wl option. + AC_CACHE_CHECK([whether the linker supports --as-needed], + [gl_cv_linker_have_as_needed], + [if test -n "$GCC"; then + gl_saved_ldflags="$LDFLAGS" + LDFLAGS="$gl_saved_ldflags -Wl,--as-needed -Wl,--no-as-needed" + AC_LINK_IFELSE([AC_LANG_PROGRAM()], + [gl_cv_linker_have_as_needed=yes], + [gl_cv_linker_have_as_needed=no]) + LDFLAGS="$gl_saved_ldflags" + else + gl_cv_linker_have_as_needed=no + fi + ]) + dnl Check whether the linker supports the --push-state/--pop-state options. + dnl Assume GCC, so that we can use the -Wl option. + AC_CACHE_CHECK([whether the linker supports --push-state], + [gl_cv_linker_have_push_state], + [if test -n "$GCC"; then + gl_saved_ldflags="$LDFLAGS" + LDFLAGS="$gl_saved_ldflags -Wl,--push-state -Wl,--pop-state" + AC_LINK_IFELSE([AC_LANG_PROGRAM()], + [gl_cv_linker_have_push_state=yes], + [gl_cv_linker_have_push_state=no]) + LDFLAGS="$gl_saved_ldflags" + else + gl_cv_linker_have_push_state=no + fi + ]) 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 # it groks . It's added above, in gl_THREADLIB_EARLY_BODY. @@ -231,6 +259,32 @@ [Define if references to the POSIX multithreading library should be made weak.]) LIBTHREAD= LTLIBTHREAD= + dnl On platforms where GCC enables --as-needed by default, attempt + dnl to make sure that LIBMULTITHREAD really links with -lpthread. + dnl Otherwise linking with LIBMULTITHREAD has no effect; then + dnl the weak symbols are not defined and thus evaluate to NULL. + case "$LIBMULTITHREAD" in + "") ;; + -pthread) + if test $gl_cv_linker_have_as_needed = yes; then + if test $gl_cv_linker_have_push_state = yes; then + LIBMULTITHREAD="$LIBMULTITHREAD -Wl,--push-state -Wl,--no-as-needed -lpthread -Wl,--pop-state" + else + LIBMULTITHREAD="$LIBMULTITHREAD -Wl,--no-as-needed -lpthread" + fi + fi + ;; + *) + if test $gl_cv_linker_have_as_needed = yes; then + if test $gl_cv_linker_have_push_state = yes; then + LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state" + else + LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD" + fi + fi + ;; + esac + # TODO: May need to modify LTLIBMULTITHREAD similarly. fi fi fi @@ -263,6 +317,18 @@ [Define if references to the old Solaris multithreading library should be made weak.]) LIBTHREAD= LTLIBTHREAD= + dnl On platforms where GCC enables --as-needed by default, attempt + dnl to make sure that LIBMULTITHREAD really links with -lthread. + dnl Otherwise linking with LIBMULTITHREAD has no effect; then + dnl the weak symbols are not defined and thus evaluate to NULL. + if test $gl_cv_linker_have_as_needed = yes; then + if test $gl_cv_linker_have_push_state = yes; then + LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state" + else + LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD" + fi + fi + # TODO: May need to modify LTLIBMULTITHREAD similarly. fi fi fi @@ -291,6 +357,18 @@ [Define if references to the GNU Pth multithreading library should be made weak.]) LIBTHREAD= LTLIBTHREAD= + dnl On platforms where GCC enables --as-needed by default, attempt + dnl to make sure that LIBMULTITHREAD really links with -lpth. + dnl Otherwise linking with LIBMULTITHREAD has no effect; then + dnl the weak symbols are not defined and thus evaluate to NULL. + if test $gl_cv_linker_have_as_needed = yes; then + if test $gl_cv_linker_have_push_state = yes; then + LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state" + else + LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD" + fi + fi + # TODO: May need to modify LTLIBMULTITHREAD similarly. fi fi else diff -Nru wget-1.19.5/m4/unistd_h.m4 wget-1.20.1/m4/unistd_h.m4 --- wget-1.19.5/m4/unistd_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/unistd_h.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 71 +# unistd_h.m4 serial 74 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, @@ -37,13 +37,13 @@ # include # include # include -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if defined _WIN32 && ! defined __CYGWIN__ # include # endif #endif ]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups - gethostname getlogin getlogin_r getpagesize + gethostname getlogin getlogin_r getpagesize getpass getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat @@ -83,6 +83,7 @@ GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) + GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS]) GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER]) GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY]) @@ -126,6 +127,7 @@ HAVE_GETHOSTNAME=1; AC_SUBST([HAVE_GETHOSTNAME]) HAVE_GETLOGIN=1; AC_SUBST([HAVE_GETLOGIN]) HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE]) + HAVE_GETPASS=1; AC_SUBST([HAVE_GETPASS]) HAVE_GROUP_MEMBER=1; AC_SUBST([HAVE_GROUP_MEMBER]) HAVE_LCHOWN=1; AC_SUBST([HAVE_LCHOWN]) HAVE_LINK=1; AC_SUBST([HAVE_LINK]) @@ -140,7 +142,6 @@ 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]) @@ -152,6 +153,7 @@ HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE]) HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL]) HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME]) + HAVE_DECL_TRUNCATE=1; AC_SUBST([HAVE_DECL_TRUNCATE]) HAVE_DECL_TTYNAME_R=1; AC_SUBST([HAVE_DECL_TTYNAME_R]) HAVE_OS_H=0; AC_SUBST([HAVE_OS_H]) HAVE_SYS_PARAM_H=0; AC_SUBST([HAVE_SYS_PARAM_H]) @@ -168,6 +170,7 @@ REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R]) REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS]) REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) + REPLACE_GETPASS=0; AC_SUBST([REPLACE_GETPASS]) REPLACE_ISATTY=0; AC_SUBST([REPLACE_ISATTY]) REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN]) REPLACE_LINK=0; AC_SUBST([REPLACE_LINK]) diff -Nru wget-1.19.5/m4/unlink.m4 wget-1.20.1/m4/unlink.m4 --- wget-1.19.5/m4/unlink.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/unlink.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# unlink.m4 serial 12 +# unlink.m4 serial 13 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, @@ -43,12 +43,14 @@ [gl_cv_func_unlink_honors_slashes=yes], [gl_cv_func_unlink_honors_slashes=no], [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" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # 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 ]) rm -f conftest.file conftest.lnk]) diff -Nru wget-1.19.5/m4/utime_h.m4 wget-1.20.1/m4/utime_h.m4 --- wget-1.19.5/m4/utime_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/utime_h.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# utime_h.m4 serial 1 +# utime_h.m4 serial 3 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, @@ -10,6 +10,7 @@ [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_UTIME_H_DEFAULTS]) + m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) AC_CHECK_HEADERS_ONCE([utime.h]) gl_CHECK_NEXT_HEADERS([utime.h]) @@ -20,17 +21,25 @@ 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 + m4_ifdef([gl_POSIXCHECK], + [UTIME_H=utime.h], + [UTIME_H='' + if m4_ifdef([gl_ANSI_CXX], [test "$CXX" != no], [false]); then + dnl Override always, to support the C++ GNULIB_NAMESPACE. + UTIME_H=utime.h + else + 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 + fi + ]) AC_SUBST([UTIME_H]) AM_CONDITIONAL([GL_GENERATE_UTIME_H], [test -n "$UTIME_H"]) diff -Nru wget-1.19.5/m4/utimens.m4 wget-1.20.1/m4/utimens.m4 --- wget-1.19.5/m4/utimens.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/utimens.m4 2018-12-26 20:08:21.000000000 +0000 @@ -3,7 +3,7 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl serial 8 +dnl serial 9 AC_DEFUN([gl_UTIMENS], [ @@ -31,10 +31,12 @@ [gl_cv_func_futimesat_works=yes], [gl_cv_func_futimesat_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_futimesat_works="guessing no" ;; + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_futimesat_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_futimesat_works="guessing no" ;; esac ]) rm -f conftest.file]) diff -Nru wget-1.19.5/m4/warn-on-use.m4 wget-1.20.1/m4/warn-on-use.m4 --- wget-1.19.5/m4/warn-on-use.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/warn-on-use.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# warn-on-use.m4 serial 5 +# warn-on-use.m4 serial 6 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, @@ -6,6 +6,8 @@ # gl_WARN_ON_USE_PREPARE(INCLUDES, NAMES) # --------------------------------------- +# If the module 'posixcheck' is in use: +# # For each whitespace-separated element in the list of NAMES, define # HAVE_RAW_DECL_name if the function has a declaration among INCLUDES # even after being undefined as a macro. @@ -23,25 +25,27 @@ # needing gl_WARN_ON_USE_PREPARE. AC_DEFUN([gl_WARN_ON_USE_PREPARE], [ - m4_foreach_w([gl_decl], [$2], - [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])), - [Define to 1 if ]m4_defn([gl_decl])[ is declared even after - undefining macros.])])dnl + m4_ifdef([gl_POSIXCHECK], + [m4_foreach_w([gl_decl], [$2], + [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])), + [Define to 1 if ]m4_defn([gl_decl])[ is declared even after + undefining macros.])])dnl dnl FIXME: gl_Symbol must be used unquoted until we can assume dnl autoconf 2.64 or newer. - for gl_func in m4_flatten([$2]); do - AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl - AC_CACHE_CHECK([whether $gl_func is declared without a macro], - gl_Symbol, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1], + for gl_func in m4_flatten([$2]); do + AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl + AC_CACHE_CHECK([whether $gl_func is declared without a macro], + gl_Symbol, + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1], [@%:@undef $gl_func (void) $gl_func;])], - [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])]) - AS_VAR_IF(gl_Symbol, [yes], - [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) - dnl shortcut - if the raw declaration exists, then set a cache - dnl variable to allow skipping any later AC_CHECK_DECL efforts - eval ac_cv_have_decl_$gl_func=yes]) - AS_VAR_POPDEF([gl_Symbol])dnl - done + [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])]) + AS_VAR_IF(gl_Symbol, [yes], + [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) + dnl shortcut - if the raw declaration exists, then set a cache + dnl variable to allow skipping any later AC_CHECK_DECL efforts + eval ac_cv_have_decl_$gl_func=yes]) + AS_VAR_POPDEF([gl_Symbol])dnl + done + ]) ]) diff -Nru wget-1.19.5/m4/wchar_h.m4 wget-1.20.1/m4/wchar_h.m4 --- wget-1.19.5/m4/wchar_h.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/wchar_h.m4 2018-12-26 20:08:21.000000000 +0000 @@ -7,7 +7,7 @@ dnl Written by Eric Blake. -# wchar_h.m4 serial 42 +# wchar_h.m4 serial 43 AC_DEFUN([gl_WCHAR_H], [ @@ -90,7 +90,8 @@ dnl that the object file has the latter name from the start. save_ac_compile="$ac_compile" ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` - if AC_TRY_EVAL([ac_compile]); then + if echo '#include "conftest.c"' >conftest1.c && + AC_TRY_EVAL([ac_compile]); then AC_LANG_CONFTEST([ AC_LANG_SOURCE([[#define wcstod renamed_wcstod /* Tru64 with Desktop Toolkit C has a bug: must be included before @@ -105,7 +106,8 @@ ]])]) dnl See note above about renaming object files. ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` - if AC_TRY_EVAL([ac_compile]); then + if echo '#include "conftest.c"' >conftest2.c && + AC_TRY_EVAL([ac_compile]); then if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then : else @@ -114,7 +116,7 @@ fi fi ac_compile="$save_ac_compile" - rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext + rm -f conftest[12].c conftest[12].$ac_objext conftest$ac_exeext ]) if test $gl_cv_header_wchar_h_correct_inline = no; then AC_MSG_ERROR([ cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS). diff -Nru wget-1.19.5/m4/wcrtomb.m4 wget-1.20.1/m4/wcrtomb.m4 --- wget-1.19.5/m4/wcrtomb.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/wcrtomb.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# wcrtomb.m4 serial 12 +# wcrtomb.m4 serial 13 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, @@ -34,8 +34,8 @@ if test $REPLACE_MBSTATE_T = 1; then REPLACE_WCRTOMB=1 else - dnl On AIX 4.3, OSF/1 5.1 and Solaris 10, wcrtomb (NULL, 0, NULL) sometimes - dnl returns 0 instead of 1. + dnl On AIX 4.3, OSF/1 5.1 and Solaris <= 11.3, wcrtomb (NULL, 0, NULL) + dnl sometimes returns 0 instead of 1. AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([gt_LOCALE_FR]) AC_REQUIRE([gt_LOCALE_FR_UTF8]) diff -Nru wget-1.19.5/m4/wcwidth.m4 wget-1.20.1/m4/wcwidth.m4 --- wget-1.19.5/m4/wcwidth.m4 2018-04-14 11:46:38.000000000 +0000 +++ wget-1.20.1/m4/wcwidth.m4 2018-12-26 20:08:21.000000000 +0000 @@ -1,4 +1,4 @@ -# wcwidth.m4 serial 26 +# wcwidth.m4 serial 27 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, @@ -115,3 +115,9 @@ dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not dnl have the wcwidth function, then it does not declare it. ]) + +# Prerequisites of lib/wcwidth.c. +AC_DEFUN([gl_PREREQ_WCWIDTH], [ + AC_REQUIRE([AC_C_INLINE]) + : +]) diff -Nru wget-1.19.5/maint.mk wget-1.20.1/maint.mk --- wget-1.19.5/maint.mk 2018-01-19 21:19:18.000000000 +0000 +++ wget-1.20.1/maint.mk 2018-12-26 20:08:21.000000000 +0000 @@ -421,6 +421,7 @@ sc_file_system: @prohibit=file''system \ + exclude='/proc/filesystems' \ ignore_case=1 \ halt='found use of "file''system"; spell it "file system"' \ $(_sc_search_regexp) @@ -571,7 +572,7 @@ @h='posixver.h' re='\. +* Changes in Wget 1.20.1 + +** --xattr is no longer default since it introduces privacy issues. + +** --xattr saves the Referer as scheme/host/port, user/pw/path/query/fragment + are no longer saved to prevent privacy issues. + +** --xattr saves the Original URL without user/password to prevent + privacy issues. + + +* Changes in Wget 1.20 + +** Add new option `--retry-on-host-error` to treat local errors as transient +and hence Wget will retry to download the file after a brief waiting period. + +** Fixed multiple potential resource leaks as found by static analysis + +** Wget will now not create an empty wget-log file when running with -q and -b +switches together + +** When compiled using the GnuTLS >= 3.6.3, Wget now has support for TLSv1.3 + +** Now there is support for using libpcre2 for regex pattern matching + +** When downloading over FTP recursively, one can now use the +--{accept,reject}-regex switches to fine-tune the downloaded files + +** Building Wget from the git sources now requires autoconf 2.63 or above. +Building from the Tarballs works as it used to. + + * Changes in Wget 1.19.5 * Fix cookie injection (CVE-2018-0494) diff -Nru wget-1.19.5/po/be.po wget-1.20.1/po/be.po --- wget-1.19.5/po/be.po 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/po/be.po 2018-12-26 20:10:49.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: wget 1.12-pre6\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2010-04-13 02:23+0300\n" "Last-Translator: Alexander Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -240,17 +240,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -314,7 +314,7 @@ msgid "failed: %s.\n" msgstr "збой: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: немагчыма вызначыць назву вузла %s\n" @@ -439,12 +439,12 @@ msgid "Length: %s" msgstr "ДаўжынÑ: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) заÑталоÑÑ" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s заÑталоÑÑ" @@ -611,7 +611,7 @@ "ÐдÑутнічае файл ці дырÑÐºÑ‚Ð¾Ñ€Ñ‹Ñ %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "" @@ -634,17 +634,17 @@ msgid "Data transfer aborted.\n" msgstr "ÐÐ±Ð°Ñ€Ð²Ð°Ð½Ð°Ñ Ð¿ÐµÑ€Ð°Ð´Ð°Ñ‡Ð° даньнÑÑž.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Файл %s ужо тут; абмінаем.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(Ñпроба: %2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -653,7 +653,7 @@ "%s (%s) - запіÑаны Ñž stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -662,8 +662,8 @@ "%s (%s) - %s захаваны [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Выдаленьне %s.\n" @@ -759,162 +759,176 @@ msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "ÐдхілÑем %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "ÐдхілÑем %s.\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Памылка ÑÑƒÐ¿Ð°Ð´Ð·ÐµÐ½ÑŒÐ½Ñ %s Ñупраць %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "ÐдÑутнічаюць Ñупадзенні з узорам %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Ð—Ð°Ð¿Ñ–Ñ HTML-ізаваны індÑÐºÑ Ñƒ %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Ð—Ð°Ð¿Ñ–Ñ HTML-ізаваны індÑÐºÑ Ñƒ %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, fuzzy, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" "ÐдÑутнічае дырÑÐºÑ‚Ð¾Ñ€Ñ‹Ñ %s.\n" "\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Ðемагчыма загрузіць паÑьведчаньні з %s\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "ЛіÑтуйце Ñправаздачы аб памылках Ñ– пытанні на .\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ПÐМЫЛКÐ" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "УВÐГÐ" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "ПаÑведчанне Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ð°\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Памылка разбору паÑведчаннÑ: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -954,11 +968,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Памылка запіÑу HTTP зварота: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "ÐдÑутнічаюць загалоўкі; верагодна, HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -967,133 +981,133 @@ "Файл %s ужо тут; абмінаем.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "ÐдÑутнічае файл %s з POST-данымі: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Паўторнае выкарыÑтаньне Ñ–Ñнуючага далучÑÐ½ÑŒÐ½Ñ Ð´Ð° %s:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Паўторнае выкарыÑтаньне Ñ–Ñнуючага далучÑÐ½ÑŒÐ½Ñ Ð´Ð° %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ð°Ð´ÐºÐ°Ð·Ñƒ прокÑÑ–: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ПÐМЫЛКР%d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "ДрÑннаÑкладзены радок Ñтану" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Збой прокÑÑ–-тунÑлю: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "ÐевÑÐ´Ð¾Ð¼Ð°Ñ Ñхема аўтарызаваньнÑ.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "ÐевÑÐ´Ð¾Ð¼Ð°Ñ Ñхема аўтарызаваньнÑ.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Ð—Ð°Ð¿Ñ–Ñ Ñƒ %s.\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL адключаны з-за пералічаных памылак.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s зварот даÑланы, чакаецца адказ... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Ð”Ð°Ð½Ñ‹Ñ Ð½Ðµ атрыманы.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ (%s) у загалоўках.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(апіÑаньне адÑутнічае)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Знаходжаньне: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "невÑдома" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [крочым]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1101,7 +1115,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1111,83 +1125,83 @@ " Файл ужо цалкам атрыманы; рабіць нічога Ð½Ñ Ñ‚Ñ€Ñба.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "ДаўжынÑ: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "праігнаравана" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Увага! Узоры не падтрымліваюцца Ñž HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Уключаны Ñ€Ñжым павука. Праверка наÑўнаÑьці аддаленага файла.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðемагчыма запіÑаць у %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Ðемагчыма запіÑаць у %s (%s).\n" -#: src/http.c:4415 +#: src/http.c:4421 #, fuzzy msgid "Cannot write to temporary WARC file.\n" msgstr "Ðемагчыма запіÑаць у %s (%s).\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Ðемагчыма ÑžÑталÑваць SSL злучÑньне.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðемагчыма запіÑаць у %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ПÐМЫЛКÐ: перанакіраваньне (%d) без знаходжаньнÑ.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Ðддалены файл не Ñ–Ñнуе -- Ð·Ð»Ð°Ð¼Ð°Ð½Ð°Ñ ÑпаÑылка!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Загаловак Last-Modified адÑутнічае -- адбіткі чаÑу адключаны.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Загаловак Last-Modified нерÑчаіÑны -- адбітак чаÑу будзе ігнаравацца.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1196,36 +1210,36 @@ "Ðддалены файл не навейшы за мÑÑцовы %s -- абмінаем.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Памеры не Ñупадаюць (мÑÑцовы %s) -- выцÑгваем.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Ðддалены файл навейшы, загружаю.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" "\n" msgstr "" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1233,12 +1247,12 @@ "Ðддалены файл Ñ–Ñнуе.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1247,7 +1261,7 @@ "%s (%s) - запіÑаны Ñž stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1256,58 +1270,58 @@ "%s (%s) - %s захаваны [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - злучÑньне закрыта на байце %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ð½Ð° байце %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ð½Ð° байце %s/%s (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Схема %s не падтрымліваецца" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðемагчыма прачытаць %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Памылка Ñž %s, радок %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: СінтакÑÑ–Ñ‡Ð°Ð½Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ° Ñž %s, радок %d.\n" -#: src/init.c:713 +#: src/init.c:706 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: невÑдомы загад %s у %s; радок %d.\n" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1315,7 +1329,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1323,77 +1337,77 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: УВÐГÐ! СіÑÑ‚Ñмны Ñ– карыÑтальніцкі wgetrc ÑпаÑылаюцца на %s.\n" -#: src/init.c:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: ÐÑдзейÑны загад --execute %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" "%s: %s: ÐÑдзейÑнае булева значÑнне %s; выкарыÑтоўвайце «on» ці «off».\n" -#: src/init.c:1076 +#: src/init.c:1070 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" "%s: %s: ÐÑдзейÑнае булева значÑнне %s; выкарыÑтоўвайце «on» ці «off».\n" -#: src/init.c:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: ÐÑдзейÑны нумар %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: ÐÑдзейÑнае значÑнне байта %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: ÐÑдзейÑны адрÑзак чаÑу %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: ÐÑдзейÑнае значÑнне %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: ÐÑдзейÑны загаловак %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: ÐÑдзейÑны загаловак %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: ÐÑдзейÑны тып прагрÑÑбару %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1405,16 +1419,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Кадоўка %s не з'ÑўлÑецца дзейÑнай\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Ðеапрацаваны код памылкі %d\n" @@ -1447,12 +1461,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; Ð·Ð°Ð¿Ñ–Ñ Ñ…Ñ€Ð°Ð½Ð°Ð»Ð¾Ð³Ñ–Ñ– адключаны.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "ВыкарыÑтанне: %s [OPTION]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1460,121 +1474,121 @@ "ÐргумÑнты, абавÑÐ·ÐºÐ¾ÑžÐ²Ñ‹Ñ Ð´Ð»Ñ Ð´Ð¾ÑžÐ³Ñ–Ñ… опцыÑÑž, абавÑÐ·ÐºÐ¾Ð²Ñ‹Ñ Ð¹ Ð´Ð»Ñ ÐºÐ°Ñ€Ð¾Ñ‚ÐºÑ–Ñ….\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "ЗапуÑк:\n" -#: src/main.c:596 +#: src/main.c:597 #, fuzzy msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version адлюÑтроўвае верÑÑ–ÑŽ Wget.\n" -#: src/main.c:598 +#: src/main.c:599 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help друкую гÑтую даведку.\n" -#: src/main.c:600 +#: src/main.c:601 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background Ñ„Ð¾Ð½Ð°Ð²Ð°Ñ Ð¿Ñ€Ð°Ñ†Ð° паÑÐ»Ñ Ð·Ð°Ð¿ÑƒÑку.\n" -#: src/main.c:602 +#: src/main.c:603 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=COMMAND выконвае загад у Ñтылі \".wgetrc\".\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Ð¥Ñ€Ð°Ð½Ð°Ð»Ð¾Ð³Ñ–Ñ Ñ– ÑžÐ²Ð°Ñ…Ð¾Ð´Ð½Ñ‹Ñ Ñ„Ð°Ð¹Ð»Ñ‹:\n" -#: src/main.c:608 +#: src/main.c:609 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FILE запіÑваць паведамленні Ñž FILE.\n" -#: src/main.c:610 +#: src/main.c:611 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FILE дадаць паведамленні Ñž FILE.\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:617 +#: src/main.c:618 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:620 +#: src/main.c:621 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:622 +#: src/main.c:623 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose быць шматÑлоўным (прадвызначана).\n" -#: src/main.c:624 +#: src/main.c:625 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -v, --verbose быць шматÑлоўным (прадвызначана).\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:634 +#: src/main.c:635 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html лічыць уваходны файл за HTML.\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:639 +#: src/main.c:640 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --certificate=FILE файл кліенцкага паÑведчаннÑ.\n" -#: src/main.c:641 +#: src/main.c:642 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Запампоўка:\n" -#: src/main.c:649 +#: src/main.c:650 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1583,23 +1597,23 @@ " -t, --tries=NUMBER задае колькаÑць Ñпроб NUMBER (0 - " "неабмежавана).\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:653 +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -#: src/main.c:655 +#: src/main.c:656 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FILE запіÑвае дакумент у FILE.\n" -#: src/main.c:657 +#: src/main.c:658 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1607,14 +1621,15 @@ msgstr "" " -nc, --no-clobber абмінаць запампоўкі Ñ–Ñнуючых файлаў.\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --spider не запампоўваць уÑÑ‘.\n" +msgstr "" +" -np, --no-parent не ўваходзіць у бацькоўÑкую дырÑкторыю.\n" -#: src/main.c:662 +#: src/main.c:663 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " @@ -1623,136 +1638,136 @@ " -c, --continue працÑг запампоўкі чаÑткова-атрыманага " "файла.\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:668 +#: src/main.c:669 #, fuzzy msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 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:679 +#: src/main.c:680 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response друкаваць адказ ÑÑрвера.\n" -#: src/main.c:681 +#: src/main.c:682 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:691 +#: src/main.c:692 #, fuzzy msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr " --no-dns-cache адключыць кÑш вынікаў DNS пошуку.\n" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:703 +#: src/main.c:704 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:705 +#: src/main.c:706 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -t, --tries=NUMBER задае колькаÑць Ñпроб NUMBER (0 - " "неабмежавана).\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:709 +#: src/main.c:710 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=RATE абмежаваць хуткаÑць запампоўкі ўзроўнем " "RATE.\n" -#: src/main.c:711 +#: src/main.c:712 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache адключыць кÑш вынікаў DNS пошуку.\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:715 +#: src/main.c:716 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1761,37 +1776,37 @@ " --ignore-case ігнараваць Ñ€ÑгіÑтар у назвах файлаў/" "дырÑкторыÑÑž.\n" -#: src/main.c:718 +#: src/main.c:719 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only далучацца толькі да IPv4 адраÑоў.\n" -#: src/main.c:720 +#: src/main.c:721 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only далучацца толькі да IPv6 адраÑоў.\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1802,224 +1817,222 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:743 +#: src/main.c:744 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 -#, fuzzy +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" -msgstr " --no-iri адключыць падтрымку IRI.\n" +msgstr "" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "ДырÑкторыі:\n" -#: src/main.c:763 +#: src/main.c:764 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories не Ñтвараць дырÑкторыі.\n" -#: src/main.c:765 +#: src/main.c:766 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories прымуÑіць Ñтвараць дырÑкторыі.\n" -#: src/main.c:767 +#: src/main.c:768 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nd, --no-directories не Ñтвараць дырÑкторыі.\n" -#: src/main.c:769 +#: src/main.c:770 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr " -x, --force-directories прымуÑіць Ñтвараць дырÑкторыі.\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Опцыі HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:783 +#: src/main.c:784 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --no-dns-cache адключыць кÑш вынікаў DNS пошуку.\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:790 +#: src/main.c:791 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ігнараваць загаловак «Content-Length».\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:800 +#: src/main.c:801 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:812 +#: src/main.c:813 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " -nd, --no-directories не Ñтвараць дырÑкторыі.\n" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2027,13 +2040,13 @@ "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2041,65 +2054,65 @@ " challenge\n" msgstr "" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Опцыі HTTPS (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 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:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:849 +#: src/main.c:850 #, fuzzy msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --certificate=FILE файл кліенцкага паÑведчаннÑ.\n" -#: src/main.c:851 +#: src/main.c:852 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FILE файл кліенцкага паÑведчаннÑ.\n" -#: src/main.c:853 +#: src/main.c:854 #, fuzzy msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr " --certificate=FILE файл кліенцкага паÑведчаннÑ.\n" -#: src/main.c:855 +#: src/main.c:856 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FILE файл ÑакрÑтнага ключа.\n" -#: src/main.c:857 +#: src/main.c:858 #, fuzzy msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key=FILE файл ÑакрÑтнага ключа.\n" -#: src/main.c:859 +#: src/main.c:860 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --certificate=FILE файл кліенцкага паÑведчаннÑ.\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:863 +#: src/main.c:864 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2109,19 +2122,19 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2131,114 +2144,114 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 #, fuzzy msgid "HSTS options:\n" msgstr "Опцыі HTTP:\n" -#: src/main.c:888 +#: src/main.c:889 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Опцыі FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:905 +#: src/main.c:906 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " -nd, --no-directories не Ñтвараць дырÑкторыі.\n" -#: src/main.c:907 +#: src/main.c:908 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:909 +#: src/main.c:910 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-dns-cache адключыць кÑш вынікаў DNS пошуку.\n" -#: src/main.c:911 +#: src/main.c:912 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " -S, --server-response друкаваць адказ ÑÑрвера.\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:918 +#: src/main.c:919 #, fuzzy msgid "FTPS options:\n" msgstr "Опцыі FTP:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 #, fuzzy msgid "WARC options:\n" msgstr "Опцыі FTP:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:937 +#: src/main.c:938 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" @@ -2246,28 +2259,28 @@ " -t, --tries=NUMBER задае колькаÑць Ñпроб NUMBER (0 - " "неабмежавана).\n" -#: src/main.c:939 +#: src/main.c:940 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " -nd, --no-directories не Ñтвараць дырÑкторыі.\n" -#: src/main.c:949 +#: src/main.c:950 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2276,23 +2289,23 @@ " --ignore-case ігнараваць Ñ€ÑгіÑтар у назвах файлаў/" "дырÑкторыÑÑž.\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "РÑкурÑÑ–ÑžÐ½Ð°Ñ Ð·Ð°Ð¿Ð°Ð¼Ð¿Ð¾ÑžÐºÐ°:\n" -#: src/main.c:958 +#: src/main.c:959 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:960 +#: src/main.c:961 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2301,14 +2314,14 @@ " -t, --tries=NUMBER задае колькаÑць Ñпроб NUMBER (0 - " "неабмежавана).\n" -#: src/main.c:962 +#: src/main.c:963 #, fuzzy msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:964 +#: src/main.c:965 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2317,217 +2330,217 @@ msgstr "" " -nc, --no-clobber абмінаць запампоўкі Ñ–Ñнуючых файлаў.\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "РÑкурÑÑ–ÑžÐ½Ñ‹Ñ Ð´Ð°Ð·Ð²Ð¾Ð»Ñ‹/забароны:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:1001 +#: src/main.c:1002 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:1014 +#: src/main.c:1015 #, fuzzy msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -np, --no-parent не ўваходзіць у бацькоўÑкую дырÑкторыю.\n" -#: src/main.c:1016 +#: src/main.c:1017 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -h, --help друкую гÑтую даведку.\n" -#: src/main.c:1018 +#: src/main.c:1019 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -x, --force-directories прымуÑіць Ñтвараць дырÑкторыі.\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:1023 +#: src/main.c:1024 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -x, --force-directories прымуÑіць Ñтвараць дырÑкторыі.\n" -#: src/main.c:1025 +#: src/main.c:1026 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent не ўваходзіць у бацькоўÑкую дырÑкторыю.\n" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "ЛіÑтуйце Ñправаздачы аб памылках Ñ– пажаданні на .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "ÐеінтÑрактыўны Ñеткавы запампоўнік GNU Wget %s.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Пароль карыÑтальіка %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Пароль:" -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Пароль карыÑтальіка %s: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Лакаль: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "КампілÑтар: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "СпаÑылка: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2536,29 +2549,29 @@ "GNU Wget %s ÑкампілÑваны на %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (user)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2009 Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2572,7 +2585,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2580,65 +2593,65 @@ "\n" "ПершаÑтваральнік - Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "ЛіÑтуйце Ñправаздачы аб памылках Ñ– пытанні на .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "ПаÑпрабуйце \"%s --help\", каб пабачыць больш опцыÑÑž.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ -- \"-n%c\"\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ðемагчыма адначаÑова быць шматÑлоўным Ñ– маўклівым.\n" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2646,152 +2659,152 @@ "\n" msgstr "" -#: src/main.c:1666 +#: src/main.c:1667 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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Ðельга адначаÑова выбіраць --ask-password Ñ– --password.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: прапушчаны URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, fuzzy, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Ðельга адначаÑова выбіраць --ask-password Ñ– --password.\n" -#: src/main.c:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, fuzzy, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Ðельга адначаÑова выбіраць --ask-password Ñ– --password.\n" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "ГÑÑ‚Ð°Ñ Ð²ÐµÑ€ÑÑ–Ñ Ð½Ñ Ð¼Ð°Ðµ падтрымкі IRIs\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Ðемагчыма выдаліць ÑпаÑылку %s: %s\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: немагчыма вызначыць назву вузла %s\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "ÐÑ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹ URL у %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ðемагчыма выдаліць %s: %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "Ðемагчыма загрузіць паÑьведчаньні з %s\n" -#: src/main.c:2257 +#: src/main.c:2264 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2801,7 +2814,7 @@ "ЗÐВЕРШÐÐÐ --%s--\n" "Запампавана: %d файлаў, %s у %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Квота запампоўкі (%s) перавышана!\n" @@ -2968,7 +2981,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Праца працÑгнецца Ñž фоне, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Вывад будзе запіÑаны Ñž %s.\n" @@ -3013,75 +3026,75 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: немагчыма выканаць stat %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: нерÑчаіÑны URL %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Ðапаткана ÑамападпіÑанае паÑведчанне.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3089,7 +3102,7 @@ " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3139,22 +3152,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Загружаецца robots.txt; калі лаÑка, не зьвÑртайце ўвагі на памылкі.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Памылка разбору URL паўнамоцнага паÑлужніка %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Памылка Ñž URL паўнамоцнага паÑлужніка %s: муÑіць быць HTTP.\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "перавышÑньне колькаÑьці перанакіраваньнÑÑž (%d).\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3162,7 +3175,7 @@ "ЗдаемÑÑ.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3237,121 +3250,130 @@ msgid "HTTPS support not compiled in" msgstr "Падтрымка HTTPS не ўбудаванаÑ" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: немагчыма размеркаваць даÑтаткова памÑці; памÑць вычÑрпанаÑ.\n" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: немагчыма размеркаваць %ld байтаў; памÑць вычÑрпанаÑ.\n" -#: src/utils.c:351 +#: src/utils.c:354 #, fuzzy, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: Ñ‚ÑкÑтавы буфер завÑлікі (%ld байтаў); аварыйнае завÑршÑнне.\n" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Праца працÑгваецца Ñž тле, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ðемагчыма выдаліць ÑпаÑылку %s: %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Ðемагчыма выдаліць ÑпаÑылку %s: %s\n" +msgstr "Ðемагчыма загрузіць паÑьведчаньні з %s\n" -#: src/utils.c:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Ðемагчыма атрымаць ключ паÑÑŒÐ²ÐµÐ´Ñ‡Ð°Ð½ÑŒÐ½Ñ Ð· %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Ðемагчыма атрымаць ключ паÑÑŒÐ²ÐµÐ´Ñ‡Ð°Ð½ÑŒÐ½Ñ Ð· %s\n" +msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: немагчыма вызначыць назву вузла %s\n" +msgstr "Ðемагчыма загрузіць паÑьведчаньні з %s\n" -#: src/utils.c:923 +#: src/utils.c:929 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Ðемагчыма атрымаць ключ паÑÑŒÐ²ÐµÐ´Ñ‡Ð°Ð½ÑŒÐ½Ñ Ð· %s\n" +msgstr "Ðемагчыма загрузіць паÑьведчаньні з %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Памылка запіÑу Ñž %s: %s\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, fuzzy, c-format msgid "Error opening WARC file %s.\n" msgstr "Памылка разбору паÑведчаннÑ: %s\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3363,62 +3385,51 @@ msgstr[1] "" msgstr[2] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 #, fuzzy msgid "Could not open CDX file for output.\n" msgstr "Ðемагчыма адшукаць вузел паўнамоцнага паÑлужніка.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgid "%s: option `--%s' doesn't allow an argument\n" #~ msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"--%s\" не дазвалÑе довады\n" -#, fuzzy -#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgid "%s: unrecognized option `--%s'\n" #~ msgstr "%s: нераÑÐ¿Ð°Ð·Ð½Ð°Ð½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ \"--%s\"\n" -#, fuzzy -#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ -- %c\n" + +#~ msgid "%s: option `-W %s' is ambiguous\n" #~ msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"-W %s\" зьÑўлÑецца неадназначнай\n" -#, fuzzy -#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgid "%s: option `-W %s' doesn't allow an argument\n" #~ msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"-W %s\" не дазвалÑе аргумÑнты\n" -#, fuzzy -#~ 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 "%s: illegal option -- %c\n" -#~ msgstr "%s: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ -- %c\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Збой аўтарызаваньнÑ.\n" @@ -3442,6 +3453,9 @@ #~ 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" diff -Nru wget-1.19.5/po/bg.po wget-1.20.1/po/bg.po --- wget-1.19.5/po/bg.po 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/po/bg.po 2018-12-26 20:10:49.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: wget 1.8.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2002-03-18 03:11\n" "Last-Translator: Yassen Roussev \n" "Language-Team: Bulgarian \n" @@ -231,17 +231,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -305,7 +305,7 @@ msgid "failed: %s.\n" msgstr "неуÑпÑ: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" @@ -429,12 +429,12 @@ msgid "Length: %s" msgstr "Дължина: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr "" @@ -603,7 +603,7 @@ "ÐÑма такъв файл или Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ `%s'.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "" @@ -626,24 +626,24 @@ msgid "Data transfer aborted.\n" msgstr "ТранÑферът бе прекъÑнат.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "Файлът `%s' е вече тук, нÑма да го теглÑ.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(опит:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -652,8 +652,8 @@ "%s (%s) - `%s' запиÑан [%ld]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Премахвам %s.\n" @@ -745,160 +745,174 @@ msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ðе влизам в `%s', тъй като Ñ‚Ñ Ðµ изключенa/не е включенa.\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "Отказвам `%s'.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Отказвам `%s'.\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" + +#: src/ftp.c:2645 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "Грешка при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° `%s': %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "ÐÑма ÑÑŠÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð·Ð° пример `%s'.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "ЗапиÑах HTML-изиран Ð¸Ð½Ð´ÐµÐºÑ Ð² `%s' [%ld].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "ЗапиÑах HTML-изиран Ð¸Ð½Ð´ÐµÐºÑ Ð² `%s'.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "ÐеуÑпех при зареждане на Ñертификати от %s\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Изпращайте ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð° грешки и Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾ .\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Грешка при транÑлирането на прокÑи УРЛ %s: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -940,145 +954,145 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "ÐеуÑпех при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° HTTP иÑкане: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1620 +#: src/http.c:1623 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "Файлът `%s' е вече тук, нÑма да го теглÑ.\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2087 +#: src/http.c:2090 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Използване на вече уÑтановена връзка към %s:%hu.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Използване на вече уÑтановена връзка към %s:%hu.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr "ÐеуÑпех при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° HTTP иÑкане: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ГРЕШКÐ: %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Деформиран ÑтатуÑ" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Ðепознат начин на удоÑтоверение.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Ðепознат начин на удоÑтоверение.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s изпратено иÑкане, чакам отговор... " -#: src/http.c:3392 +#: src/http.c:3395 #, fuzzy msgid "No data received.\n" msgstr "Ðе Ñе получават данни" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Грешка при четене (%s) в заглавките.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(без опиÑание)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "ÐдреÑ: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "неопределен" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [Ñледва]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1086,7 +1100,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1096,101 +1110,101 @@ " Файлът е вече изтеглен; нÑма друга задача.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Дължина: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "игнориран" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Внимание: ÑƒÐ°Ð¹Ð»Ð´ÐºÐ°Ñ€Ð´Ñ Ð½Ðµ Ñе поддържат в HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4387 +#: src/http.c:4380 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðемога да запиша върху `%s' (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Ðемога да запиша върху `%s' (%s).\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Ðемога да уÑÑ‚Ð°Ð½Ð¾Ð²Ñ SSL връзка.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðемога да запиша върху `%s' (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ГРЕШКÐ: Пре-адреÑÐ°Ñ†Ð¸Ñ (%d) без уÑтановен адреÑ.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Заглавката Ñъдържаща Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñно поÑледна промÑна липÑва -- полето за " "дата Ñе изключва.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Заглавката Ñъдържаща Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñно поÑледна промÑна е невалиднa -- " "полето за дата Ñе игнорира.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "Файлът на Ñървъра не е по-нов от този на диÑка `%s' -- Ñпирам.\n" -#: src/http.c:4580 +#: src/http.c:4588 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Големините не Ñъвпадат (меÑтен %ld) -- продължавам.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Файлът на Ñървъра е по-нов, продължавам.\n" -#: src/http.c:4607 +#: src/http.c:4615 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1198,40 +1212,40 @@ "\n" msgstr "Файлът на Ñървъра е по-нов от меÑÑ‚Ð½Ð¸Ñ `%s' -- започвам да Ñ‚eглÑ.\n" -#: src/http.c:4613 +#: src/http.c:4621 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "Файлът от Ñървъра не е по-нов от меÑÑ‚Ð½Ð¸Ñ `%s' -- не продължавам.\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4628 +#: src/http.c:4636 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "Файлът на Ñървъра е по-нов, продължавам.\n" -#: src/http.c:4637 +#: src/http.c:4645 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ГРЕШКÐ: %d: %s.\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4688 +#: src/http.c:4696 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1240,58 +1254,58 @@ "%s (%s) - `%s' запиÑан [%ld/%ld]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Връзката бе преуÑтановена при байт %ld. " -#: src/http.c:4772 +#: src/http.c:4780 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Грешка при четене, байт %ld (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Грешка при четене, байт %ld/%ld (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" -#: src/init.c:585 +#: src/init.c:579 #, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðемога да прочета %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Грешка при %s в ред %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, fuzzy, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Грешка при %s в ред %d.\n" -#: src/init.c:713 +#: src/init.c:706 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: БЪГ: непозната команда `%s', ÑтойноÑÑ‚ `%s'.\n" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1299,7 +1313,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1307,75 +1321,75 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Внимание: СиÑтемниÑÑ‚ wgetrc и личниÑÑ‚ Ñочат към `%s'.\n" -#: src/init.c:983 +#: src/init.c:977 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: %s: невалидна команда\n" -#: src/init.c:1043 +#: src/init.c:1037 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: ÐœÐ¾Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÑ‚Ðµ on или off.\n" -#: src/init.c:1076 +#: src/init.c:1070 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" -#: src/init.c:1096 +#: src/init.c:1090 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ðевалиден вид напредък `%s'.\n" -#: src/init.c:1379 +#: src/init.c:1373 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'.\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ðевалиден вид напредък `%s'.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1387,16 +1401,16 @@ msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "" @@ -1429,12 +1443,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; Ñпирам запиÑването.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Употреба: %s [ОПЦИЯ]... [УРЛ]...\n" -#: src/main.c:592 +#: src/main.c:593 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1445,297 +1459,297 @@ "опроÑтен вид.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:653 +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:660 +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 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:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1746,212 +1760,212 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:761 +#: src/main.c:762 #, fuzzy msgid "Directories:\n" msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ " -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:795 +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1959,13 +1973,13 @@ "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1973,58 +1987,58 @@ " challenge\n" msgstr "" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:844 +#: src/main.c:845 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:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2034,19 +2048,19 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2056,400 +2070,400 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Изпращайте ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð° грешки и Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾ .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, не-интерактивен мрежов Ñофтуеър за транÑфер.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "" -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "" -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "" -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Запазени авторÑки права (C) 1995-2001 Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2459,7 +2473,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 #, fuzzy msgid "" "\n" @@ -2468,66 +2482,66 @@ "\n" "ПървонапиÑана от Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Изпращайте ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð° грешки и Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾ .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Опитайте `%s --help' за повече опции.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: невалидна Ð¾Ð¿Ñ†Ð¸Ñ -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, fuzzy, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "%s: поддръжката на \"debug\" не е компилирана.\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ðе може да бъде \"многоÑловен\" и \"тих\" едновременно.\n" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Ðе мога да Ñложа дата, но и да не презапиша едновременно\n" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2535,152 +2549,152 @@ "\n" msgstr "" -#: src/main.c:1666 +#: src/main.c:1667 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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: УРЛ не е указан\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "УРЛ не е открит в %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ðемога да Ð¸Ð·Ñ‚Ñ€Ð¸Ñ `%s': %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "ÐеуÑпех при зареждане на Ñертификати от %s\n" -#: src/main.c:2257 +#: src/main.c:2264 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2691,7 +2705,7 @@ "ГОТОВО --%s--\n" "Изтеглени: %s байта в %d файла\n" -#: src/main.c:2271 +#: src/main.c:2278 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Квотата от (%s байта) бе ПРЕВИШЕÐÐ!\n" @@ -2857,7 +2871,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Продължавам на заден план, pid %d.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Резултатът ще бъде запиÑван в `%s'.\n" @@ -2902,77 +2916,76 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: непълен формат %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:190 +#: src/openssl.c:192 #, fuzzy msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Ðе мога да Ð½Ð°Ð¼ÐµÑ€Ñ OpenSSL PRNG; продължавам без SSL.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'\n" +msgstr "" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "Ðе мога да Ð½Ð°Ð¼ÐµÑ€Ñ OpenSSL PRNG; продължавам без SSL.\n" +msgstr "" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2980,7 +2993,7 @@ " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3029,22 +3042,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Зареждам robots.txt; Ð¼Ð¾Ð»Ñ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð°Ð¹Ñ‚Ðµ грешките.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Грешка при транÑлирането на прокÑи УРЛ %s: %s\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Грешка при прокÑи УРЛ %s: ТрÑбва да е HTTP.\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d пре-адреÑациите бÑха твърде много.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3052,7 +3065,7 @@ "Отказвам Ñе.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3120,120 +3133,129 @@ msgid "HTTPS support not compiled in" msgstr "%s: поддръжката на \"debug\" не е компилирана.\n" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Продължавам на заден план, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Грешка при изтриване на Ñимволична връзка `%s': %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" +msgstr "ÐеуÑпех при зареждане на Ñертификати от %s\n" -#: src/utils.c:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" +msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" +msgstr "ÐеуÑпех при зареждане на Ñертификати от %s\n" -#: src/utils.c:923 +#: src/utils.c:929 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" +msgstr "ÐеуÑпех при зареждане на Ñертификати от %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Грешка при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° `%s': %s\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, fuzzy, c-format msgid "Error opening WARC file %s.\n" msgstr "Грешка при транÑлирането на прокÑи УРЛ %s: %s\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3244,60 +3266,36 @@ msgstr[0] "" msgstr[1] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 #, fuzzy msgid "Could not open CDX file for output.\n" msgstr "Ðемога да Ð½Ð°Ð¼ÐµÑ€Ñ Ð¿Ñ€Ð¾ÐºÑи хоÑта.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: опциÑта `--%s' не позволÑва аргумент\n" - -#, fuzzy -#~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s: неразпозната Ð¾Ð¿Ñ†Ð¸Ñ `--%s'\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" - -#, fuzzy -#~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: опциÑта `%s' изиÑква аргумент\n" - -#, fuzzy -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "Файлът `%s' е вече тук, нÑма да го теглÑ.\n" - #~ msgid "Error in Set-Cookie, field `%s'" #~ msgstr "Грешка в Set-Cookie, поле `%s'" @@ -3314,6 +3312,12 @@ #~ 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 "ХоÑÑ‚ÑŠÑ‚ не бе открит" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/ca.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/ca.gmo differ diff -Nru wget-1.19.5/po/ca.po wget-1.20.1/po/ca.po --- wget-1.19.5/po/ca.po 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/po/ca.po 2018-12-26 20:10:49.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: wget 1.16.1.46\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2015-08-04 09:23+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -236,17 +236,17 @@ msgid "Unmatched ) or \\)" msgstr ") o \\) desaparellat" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "No hi ha una expressió regular %s prèvia" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "no es pot crear una canonada" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -313,7 +313,7 @@ msgid "failed: %s.\n" msgstr "error: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, 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" @@ -439,12 +439,12 @@ msgid "Length: %s" msgstr "Mida: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) restant" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s restant" @@ -618,7 +618,7 @@ "El fitxer o directori %s no existeix.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s ha començat a existir.\n" @@ -641,17 +641,17 @@ msgid "Data transfer aborted.\n" msgstr "S'ha avortat la transferència de dades.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "El fitxer %s ja existeix, no es baixa.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(intent:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -660,7 +660,7 @@ "%s (%s) - imprimit per la sortida estàndard %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -669,8 +669,8 @@ "%s (%s) - s'ha desat %s [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "S'està suprimint %s.\n" @@ -766,162 +766,177 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "S'està rebutjant %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "S'està rebutjant %s.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "No es descendeix a %s ja que està exclòs, o no inclòs.\n" + +#: src/ftp.c:2645 #, 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:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Cap coincidència amb el patró %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, 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:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "S'ha escrit un índex HTMLitzat a %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERROR: No es pot obrir el directori %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, 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:169 +#: src/gnutls.c:174 #, 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:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "S'ha carregat el fitxer CRL «%s»\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "La vostra versió d'OpenSSL és massa antiga per suportar TLSv1.1\n" + +#: src/gnutls.c:676 #, 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:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ERROR" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "AVÃS" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s no ha presentat cap certificat.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: El certificat de %s no té un emissor conegut.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, 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:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, 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:825 +#: src/gnutls.c:949 #, 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:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "No s'ha trobat cap certificat\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "S'ha produït un error en analitzar el certificat: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "El certificat encara no s'ha activat\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "El certificat ha caducat\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "El certificat ha de ser X.509\n" @@ -961,11 +976,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "S'ha produït un error en escriure la petició HTTP: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "No hi ha capçaleres, s'assumeix HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -974,135 +989,135 @@ "El fitxer %s ja existeix, no es baixa.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "Manca el fitxer de dades POST %s: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "S'està reutilitzant la connexió a [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "S'està reutilitzant la connexió a %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, 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:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR: %d %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "La línia d'estat és malformada" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Ha fallat la tunelització del servidor intermediari: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "L'esquema d'autenticació és desconegut.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "L'esquema d'autenticació és desconegut.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "S'està desant a: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "S'està inhabilitant SSL a causa dels errors trobats.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s: s'ha enviat la petició, s'està esperant una resposta… " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "No s'ha rebut cap dada\n" -#: src/http.c:3398 +#: src/http.c:3401 #, 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:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(sense descripció)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Ubicació: %s%s\n" # és femení: ubicació/mida. eac -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "no especificada" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [es segueix]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1110,7 +1125,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1120,81 +1135,81 @@ " El fitxer ja s'ha baixat totalment; res a fer.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Mida: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "s'ignora" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Avís: En HTTP no es suporten patrons.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Mode aranya habilitat. Comprova si el fitxer remot existeix.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "No s'ha pogut escriure a %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "S'ha rebut l'atribut requerit que mancava a Header.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "L'autenticació amb nom d'usuari/contrasenya ha fallat.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "No s'ha pogut escriure al fitxer WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "No s'ha pogut escriure al fitxer temporal WARC.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "No s'ha pogut establir la connexió SSL.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "No s'ha pogut desenllaçar %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redirecció (%d) sense ubicació.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "El fitxer remot no existeix -- enllaç trencat!\n" -#: src/http.c:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 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:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1203,16 +1218,16 @@ "El fitxer remot no és més nou que el local %s -- no es baixa.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "El fitxer remot és més nou, s'està baixant.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1222,7 +1237,7 @@ "obtenint.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1230,7 +1245,7 @@ "El fitxer remot existeix però no conté cap enllaç -- no s'obté.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1240,7 +1255,7 @@ "però la recursió és inhabilitada -- no es baixa.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1248,12 +1263,12 @@ "El fitxer remot existeix.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1262,7 +1277,7 @@ "%s (%s) - escrit a la sortida estàndard %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1271,58 +1286,58 @@ "%s (%s) - s'ha desat %s [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, 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:4772 +#: src/http.c:4780 #, 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:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "La qualitat de la protecció «%s» no és implementada.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "La qualitat de la protecció «%s» no és implementada.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: No s'ha pogut llegir %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, 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:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1334,7 +1349,7 @@ "«%s»,\n" "o especifiqueu un fitxer diferent emprant --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1347,75 +1362,75 @@ # es refereix a variables d'entorn o què? eac # es refereix als dotfiles .wgetrc, etc. jm -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: L'ordre --execute %s no és vàlida.\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: El número %s no és vàlid.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, 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:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, 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:1379 +#: src/init.c:1373 #, 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:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: El valor %s no és vàlid.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: La capçalera %s no és vàlida.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, 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:1602 +#: src/init.c:1596 #, 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:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1429,16 +1444,16 @@ msgid "Encoding %s isn't valid\n" msgstr "La codificació %s no és vàlida\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "S'ha trobat una seqüència multioctet incompleta o invàlida\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Número d'error no gestionat %d\n" @@ -1471,12 +1486,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; s'està inhabilitant el registre.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Forma d'ús: %s [OPCIÓ]… [URL]…\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1485,69 +1500,69 @@ "curtes.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Inici:\n" -#: src/main.c:596 +#: src/main.c:597 #, 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:598 +#: src/main.c:599 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help mostra aquesta ajuda.\n" -#: src/main.c:600 +#: src/main.c:601 #, 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:602 +#: src/main.c:603 #, 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Registres i fitxer d'entrada:\n" -#: src/main.c:608 +#: src/main.c:609 #, 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:610 +#: src/main.c:611 #, 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:613 +#: src/main.c:614 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug mostra molta informació de depuració.\n" -#: src/main.c:617 +#: src/main.c:618 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug mostra informació de depuració de Watt-32.\n" -#: src/main.c:620 +#: src/main.c:621 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet mode silenciós (cap sortida).\n" -#: src/main.c:622 +#: src/main.c:623 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose mode detallat (per defecte).\n" -#: src/main.c:624 +#: src/main.c:625 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " @@ -1556,7 +1571,7 @@ " -nv, --no-verbose mode no detallat, però tampoc del tot " "silenciós.\n" -#: src/main.c:626 +#: src/main.c:627 #, fuzzy msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " @@ -1565,7 +1580,7 @@ " --report-speed=TIPUS Mostra l'ample de banda com a TIPUS.\n" " TIPUS pot ser bits.\n" -#: src/main.c:628 +#: src/main.c:629 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " @@ -1574,7 +1589,7 @@ " -i, --input-file=FITXER baixa les URL que es troben al FITXER local\n" " o extern.\n" -#: src/main.c:631 +#: src/main.c:632 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1583,12 +1598,12 @@ " -i, --input-file=FITXER baixa les URL que es troben al FITXER local\n" " o extern.\n" -#: src/main.c:634 +#: src/main.c:635 #, 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:636 +#: src/main.c:637 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1597,29 +1612,29 @@ " -B, --base=URL resol els enllaços de fitxers d'entrada HTML\n" " (-i -F) relatius a URL.\n" -#: src/main.c:639 +#: src/main.c:640 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FITXER Especifica el fitxer de configuració a emprar.\n" -#: src/main.c:641 +#: src/main.c:642 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies no utilitzes galetes.\n" -#: src/main.c:643 +#: src/main.c:644 #, 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Baixada:\n" -#: src/main.c:649 +#: src/main.c:650 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1628,7 +1643,7 @@ " -t, --tries=NOMBRE estableix el nombre de reintents (0=sense " "limit).\n" -#: src/main.c:651 +#: src/main.c:652 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" @@ -1636,7 +1651,7 @@ " --retry-connrefused reintenta encara que es rebutje la " "connexió.\n" -#: src/main.c:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1646,12 +1661,12 @@ "HTML\n" " ignorades.\n" -#: src/main.c:655 +#: src/main.c:656 #, 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:657 +#: src/main.c:658 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1660,14 +1675,14 @@ " -nc, --no-clobber omet baixades de fitxers ja existents\n" " (sobreescrivint-los).\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-cookies no utilitzes galetes.\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1675,7 +1690,7 @@ " -c, -­continue continua obtenint un fitxer baixat " "parcialment\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1683,13 +1698,13 @@ " --start-pos=Ã’FSET comença a baixar des de la posició basada " "en zero Ã’FSET\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TIPUS selecciona el tipus d'indicador de " "progrés\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1697,7 +1712,7 @@ " --show-progress mostra la barra de progrés en qualsevol " "mode de detall\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1707,7 +1722,7 @@ "els\n" " locals\n" -#: src/main.c:673 +#: src/main.c:674 #, fuzzy msgid "" " --no-if-modified-since don't use conditional if-modified-since " @@ -1719,7 +1734,7 @@ " fitxer local basada en la del " "servidor.\n" -#: src/main.c:676 +#: src/main.c:677 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1730,30 +1745,30 @@ " fitxer local basada en la del " "servidor.\n" -#: src/main.c:679 +#: src/main.c:680 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response mostra les respostes del servidor.\n" -#: src/main.c:681 +#: src/main.c:682 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider no baixes res.\n" -#: src/main.c:683 +#: src/main.c:684 #, 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1763,34 +1778,34 @@ "a\n" " localhost.\n" -#: src/main.c:691 +#: src/main.c:692 #, 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:693 +#: src/main.c:694 #, 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:695 +#: src/main.c:696 #, 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:697 +#: src/main.c:698 #, 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:699 +#: src/main.c:700 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1799,7 +1814,7 @@ " --waitretry=SEGONS fes una pausa entre intents de baixada de\n" " 1…SEGONS.\n" -#: src/main.c:701 +#: src/main.c:702 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1809,20 +1824,20 @@ "segons\n" " entre baixades.\n" -#: src/main.c:703 +#: src/main.c:704 #, 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:705 +#: src/main.c:706 #, 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:707 +#: src/main.c:708 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1832,13 +1847,13 @@ "a\n" " localhost.\n" -#: src/main.c:709 +#: src/main.c:710 #, 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:711 +#: src/main.c:712 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" @@ -1846,7 +1861,7 @@ "noms\n" " de domini.\n" -#: src/main.c:713 +#: src/main.c:714 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1857,7 +1872,7 @@ "operatiu)\n" " permeta.\n" -#: src/main.c:715 +#: src/main.c:716 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1867,17 +1882,17 @@ "quan\n" " es busquen fitxers/directoris coincidents.\n" -#: src/main.c:718 +#: src/main.c:719 #, 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:720 +#: src/main.c:721 #, 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:722 +#: src/main.c:723 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1888,14 +1903,14 @@ "especificada,\n" " IPv6, IPv4 o cap.\n" -#: src/main.c:726 +#: src/main.c:727 #, 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:728 +#: src/main.c:729 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" @@ -1903,12 +1918,12 @@ " --password=CONTRASENYA estableix la contrasenya de ftp i http a\n" " CONTRASENYA.\n" -#: src/main.c:730 +#: src/main.c:731 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --ask-password demana la contrasenya.\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1919,12 +1934,12 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri inhabilita el suport per a IRI.\n" -#: src/main.c:739 +#: src/main.c:740 #, fuzzy msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" @@ -1932,7 +1947,7 @@ " --local-encoding=COD empra COD com a codificació local pels " "IRI.\n" -#: src/main.c:741 +#: src/main.c:742 #, fuzzy msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" @@ -1940,77 +1955,75 @@ " --remote-encoding=COD empra COD com a codificació remota per " "defecte.\n" -#: src/main.c:743 +#: src/main.c:744 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr "" " --unlink suprimeix el fitxer abans de sobreescriure'l\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 #, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" -msgstr "" -" --no-glob inhabilita l'ús de comodins de fitxers per a " -"FTP.\n" +msgstr " --warc-cdx escriu fitxers d'índex CDX.\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Directoris:\n" -#: src/main.c:763 +#: src/main.c:764 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories no crees directoris.\n" -#: src/main.c:765 +#: src/main.c:766 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories força la creació de directoris.\n" -#: src/main.c:767 +#: src/main.c:768 #, 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:769 +#: src/main.c:770 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories usa el nom del protocol als directoris.\n" -#: src/main.c:771 +#: src/main.c:772 #, 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:773 +#: src/main.c:774 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -2019,29 +2032,29 @@ " --cut-dirs=NOMBRE omet NOMBRE components de l'estructura de\n" " directoris remota.\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Opcions d'HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 #, 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:781 +#: src/main.c:782 #, 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:783 +#: src/main.c:784 #, 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:785 +#: src/main.c:786 #, fuzzy msgid "" " --default-page=NAME change the default page name (normally\n" @@ -2050,7 +2063,7 @@ " --default-page=NOM Canvia el nom per defecte de la pàgina\n" " (normalment aquest és «index.html».).\n" -#: src/main.c:788 +#: src/main.c:789 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -2059,47 +2072,44 @@ " -E, --adjust-extension desa els documents HTML/S amb extensions\n" " correctes.\n" -#: src/main.c:790 +#: src/main.c:791 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length descarta la capçalera «Content-Length».\n" -#: src/main.c:792 +#: src/main.c:793 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=CADENA insereix CADENA entre les capçaleres.\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=TIPUS selecciona el tipus d'indicador de " -"progrés\n" -#: src/main.c:798 +#: src/main.c:799 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect redireccions màximes permeses per pàgina.\n" -#: src/main.c:800 +#: src/main.c:801 #, 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:802 +#: src/main.c:803 #, 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:804 +#: src/main.c:805 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2108,13 +2118,13 @@ " --referer=URL inclou una capçalera «Referer» a la petició " "HTTP.\n" -#: src/main.c:806 +#: src/main.c:807 #, 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:808 +#: src/main.c:809 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2123,7 +2133,7 @@ " -U, --user-agent=AGENT identifica't com a AGENT en lloc de Wget/" "VERSIÓ.\n" -#: src/main.c:810 +#: src/main.c:811 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2132,12 +2142,12 @@ " --no-http-keep-alive inhabilita el «keep-alive» d'HTTP\n" " (connexions persistents)\n" -#: src/main.c:812 +#: src/main.c:813 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies no utilitzes galetes.\n" -#: src/main.c:814 +#: src/main.c:815 #, fuzzy msgid "" " --load-cookies=FILE load cookies from FILE before session\n" @@ -2145,14 +2155,14 @@ " --load-cookies=FITXER carrega les galetes de FITXER abans de\n" " la sessió.\n" -#: src/main.c:816 +#: src/main.c:817 #, 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:818 +#: src/main.c:819 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " @@ -2161,7 +2171,7 @@ " --keep-session-cookies carrega i desa les galetes de la sessió\n" " (no permanents)\n" -#: src/main.c:820 +#: src/main.c:821 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2170,7 +2180,7 @@ " --post-data=CADENA usa el mètode POST, envia CADENA com a " "dades.\n" -#: src/main.c:822 +#: src/main.c:823 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2179,14 +2189,14 @@ " --post-file=FITXER usa el mètode POST, envia els continguts de\n" " FITXER.\n" -#: src/main.c:824 +#: src/main.c:825 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:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2194,7 +2204,7 @@ " --body-data=CADENA envia CADENA com a dades. --method HA " "D'ESTAR establert.\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2202,7 +2212,7 @@ " --body-file=FITXER envia el contingut de FITXER.\n" " --method HA D'ESTAR establert\n" -#: src/main.c:830 +#: src/main.c:831 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2215,7 +2225,7 @@ " es seleccionen noms de fitxers locals\n" " (EXPERIMENTAL)\n" -#: src/main.c:833 +#: src/main.c:834 #, fuzzy msgid "" " --content-on-error output the received content on server " @@ -2224,7 +2234,7 @@ " --content-on-error mostra el contingut rebut als errors del\n" " servidor.\n" -#: src/main.c:835 +#: src/main.c:836 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2236,11 +2246,11 @@ " sense primer esperar la negociació del\n" " servidor.\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opcions d'HTTPS (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2250,46 +2260,46 @@ " --secure-protocol=PR selecciona el protocol segur, d'entre auto,\n" " SSLv2, SSLv3, TLSv1.\n" -#: src/main.c:847 +#: src/main.c:848 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr " -L, --relative només segueix enllaços relatius.\n" -#: src/main.c:849 +#: src/main.c:850 #, 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:851 +#: src/main.c:852 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificat=FITXER fitxer del certificat del client.\n" -#: src/main.c:853 +#: src/main.c:854 #, 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:855 +#: src/main.c:856 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FITXER fitxer de clau privada.\n" -#: src/main.c:857 +#: src/main.c:858 #, 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:859 +#: src/main.c:860 #, 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:861 +#: src/main.c:862 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " @@ -2298,12 +2308,12 @@ " --ca-directory=DIR directori on s'emmagatzema una llista de\n" " dispersió de CA.\n" -#: src/main.c:863 +#: src/main.c:864 #, 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:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2313,7 +2323,7 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2322,7 +2332,7 @@ " --random-file=FITXER fitxer amb dades aleatòries per a fer de\n" " llavor per al SSL PRNG.\n" -#: src/main.c:875 +#: src/main.c:876 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " @@ -2332,7 +2342,7 @@ "aleatòries.\n" "\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2342,30 +2352,30 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 #, fuzzy msgid "HSTS options:\n" msgstr "Opcions d'HTTP:\n" -#: src/main.c:888 +#: src/main.c:889 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr "" " --no-cache no admetes dades de la memòria cau del " "servidor.\n" -#: src/main.c:890 +#: src/main.c:891 #, fuzzy msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr " -v, --verbose mode detallat (per defecte).\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Opcions d'FTP:\n" -#: src/main.c:898 +#: src/main.c:899 #, fuzzy msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " @@ -2375,31 +2385,31 @@ "fitxers\n" " d'FTP binaris.\n" -#: src/main.c:901 +#: src/main.c:902 #, 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:903 +#: src/main.c:904 #, 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:905 +#: src/main.c:906 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing no suprimeixes els fitxers «.listing».\n" -#: src/main.c:907 +#: src/main.c:908 #, 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:909 +#: src/main.c:910 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" @@ -2407,13 +2417,13 @@ " --no-passive-ftp inhabilita el mode de transferència " "«passiu».\n" -#: src/main.c:911 +#: src/main.c:912 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions preserva els permisos dels fitxers remots.\n" -#: src/main.c:913 +#: src/main.c:914 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2424,12 +2434,12 @@ "siguen\n" " directoris\n" -#: src/main.c:918 +#: src/main.c:919 #, fuzzy msgid "FTPS options:\n" msgstr "Opcions d'FTP:\n" -#: src/main.c:920 +#: src/main.c:921 #, fuzzy msgid "" " --ftps-implicit use implicit FTPS (default port is " @@ -2439,7 +2449,7 @@ "fitxers\n" " d'FTP binaris.\n" -#: src/main.c:922 +#: src/main.c:923 #, fuzzy msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " @@ -2449,23 +2459,23 @@ " --trust-server-names empra el nom especificat per l'últim\n" " component de l'URL de la redirecció.\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Opcions de WARC:\n" -#: src/main.c:933 +#: src/main.c:934 #, fuzzy msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " @@ -2475,14 +2485,14 @@ "fitxer\n" " .warc.gz.\n" -#: src/main.c:935 +#: src/main.c:936 #, 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:937 +#: src/main.c:938 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" @@ -2490,12 +2500,12 @@ " --warc-max-size=NÚMERO estableix la mida màxima dels fitxers WARC\n" " a NÚMERO.\n" -#: src/main.c:939 +#: src/main.c:940 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx escriu fitxers d'índex CDX.\n" -#: src/main.c:941 +#: src/main.c:942 #, fuzzy msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " @@ -2505,19 +2515,19 @@ "aquest\n" " fitxer CDX.\n" -#: src/main.c:944 +#: src/main.c:945 #, 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:947 +#: src/main.c:948 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests no calcules els resums SHA1.\n" -#: src/main.c:949 +#: src/main.c:950 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2526,7 +2536,7 @@ " --no-warc-keep-log no emmagatzemes el fitxer de registre en un " "registre WARC.\n" -#: src/main.c:951 +#: src/main.c:952 #, fuzzy msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " @@ -2536,16 +2546,16 @@ " --warc-tempdir=DIRECTORI ubicació per als fitxers temporals creats\n" " per l'escriptor WARC.\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Baixada recursiva:\n" -#: src/main.c:958 +#: src/main.c:959 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive baixa de forma recursiva.\n" -#: src/main.c:960 +#: src/main.c:961 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2553,7 +2563,7 @@ msgstr "" " -l, --level=NOMBRE nivell màxim de recursió (inf o 0 per infinit).\n" -#: src/main.c:962 +#: src/main.c:963 #, fuzzy msgid "" " --delete-after delete files locally after downloading " @@ -2561,7 +2571,7 @@ msgstr "" " --delete-after suprimeix els fitxers locals un cop baixats.\n" -#: src/main.c:964 +#: src/main.c:965 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2572,20 +2582,20 @@ "apunten\n" " als fitxers locals.\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 #, 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:973 +#: src/main.c:974 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2594,7 +2604,7 @@ " -K, --backup-converted fes una còpia dels fitxers com a X_orig abans\n" " de convertir-los.\n" -#: src/main.c:976 +#: src/main.c:977 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2603,7 +2613,7 @@ " -K, --backup-converted fes una còpia dels fitxers com a X.orig abans\n" " de convertir-los.\n" -#: src/main.c:979 +#: src/main.c:980 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2612,7 +2622,7 @@ " -m, --mirror opció equivalent -N -r -l inf -no-remove-" "listings.\n" -#: src/main.c:981 +#: src/main.c:982 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2621,7 +2631,7 @@ " -p, --page-requisites baixa totes les imatges, etc. necessàries per\n" " veure el document HTML.\n" -#: src/main.c:983 +#: src/main.c:984 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2630,11 +2640,11 @@ " --strict-comments activa la gestió estricta (SGML) de comentaris " "HTML.\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Inclusió/exclusió en mode recursiu:\n" -#: src/main.c:989 +#: src/main.c:990 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2643,7 +2653,7 @@ " -A, --accept=LLISTA llista separada per comes d'extensions\n" " acceptades.\n" -#: src/main.c:991 +#: src/main.c:992 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2652,32 +2662,32 @@ " -R, --reject=LLISTA llista separada per comes d'extensions\n" " rebutjades.\n" -#: src/main.c:993 +#: src/main.c:994 #, 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:995 +#: src/main.c:996 #, 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:998 +#: src/main.c:999 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TIPUS tipus d'expressió regular (posix|pcre).\n" -#: src/main.c:1001 +#: src/main.c:1002 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYPE regex type (posix).\n" -#: src/main.c:1004 +#: src/main.c:1005 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2685,7 +2695,7 @@ " -D, --domains=LLISTA llista separada per comes de dominis\n" " acceptats.\n" -#: src/main.c:1006 +#: src/main.c:1007 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" @@ -2693,14 +2703,14 @@ " --exclude-domains=LLISTA llista separada per comes de dominis\n" " rebutjats.\n" -#: src/main.c:1008 +#: src/main.c:1009 #, 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:1010 +#: src/main.c:1011 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2710,7 +2720,7 @@ "HTML\n" " que es segueixen.\n" -#: src/main.c:1012 +#: src/main.c:1013 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2720,24 +2730,24 @@ "HTML\n" " ignorades.\n" -#: src/main.c:1014 +#: src/main.c:1015 #, 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:1016 +#: src/main.c:1017 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative només segueix enllaços relatius.\n" -#: src/main.c:1018 +#: src/main.c:1019 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LLISTA llista de directoris acceptats.\n" -#: src/main.c:1020 +#: src/main.c:1021 #, fuzzy msgid "" " --trust-server-names use the name specified by the " @@ -2747,90 +2757,90 @@ " --trust-server-names empra el nom especificat per l'últim\n" " component de l'URL de la redirecció.\n" -#: src/main.c:1023 +#: src/main.c:1024 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LLISTA llista de directoris rebutjats.\n" -#: src/main.c:1025 +#: src/main.c:1026 #, 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Envieu informes d'error i suggeriments a .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Contrasenya per a l'usuari %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Contrasenya: " -#: src/main.c:1103 +#: src/main.c:1104 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "no es pot crear una canonada" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Contrasenya per a l'usuari %s: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Locale: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Construcció: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Enllaç: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2839,29 +2849,29 @@ "GNU Wget %s construït el %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (entorn)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (usuari)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © 2011 Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2875,7 +2885,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2883,38 +2893,38 @@ "\n" "Escrit originàriament per Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "Envieu informes d'error i preguntes a .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "S'ha produït un problema d'assignació de memòria\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "S'està eixint degut a un error en %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Proveu «%s --help» per a veure més opcions.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: l'opció «-n%c» és il·legal\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2923,7 +2933,7 @@ "S'ha especificat --no-clober i --convert-links, només s'emprarà --convert-" "links.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, fuzzy, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2932,24 +2942,24 @@ "S'ha especificat --no-clober i --convert-links, només s'emprarà --convert-" "links.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2961,7 +2971,7 @@ "combinació amb -p o -r. Vegeu el manual per a més detalls.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2971,7 +2981,7 @@ "posarà a l'únic fitxer que especifiqueu.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2981,14 +2991,14 @@ "per a més detalls.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2996,12 +3006,12 @@ "L'eixida WARC no funciona amb marques de temps, s'inhabilitarà la impressió " "de marques de temps.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "L'eixida WARC no funciona amb --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, fuzzy, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -3009,7 +3019,7 @@ msgstr "" "L'eixida WARC no funciona amb --continue o --start-pos, s'inhabilitaran." -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -3017,7 +3027,7 @@ "Els resums són inhabilitats; la deduplicació WARC no trobarà registres " "duplicats.\n" -#: src/main.c:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -3025,12 +3035,12 @@ msgstr "" "L'eixida WARC no funciona amb --continue o --start-pos, s'inhabilitaran." -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3039,17 +3049,17 @@ "No és recomanat emprar tant --start-pos i --continue; s'inhabilitarà --" "continue.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: falta l'URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3058,7 +3068,7 @@ "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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3067,24 +3077,24 @@ "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:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Aquesta versió no implementa IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, 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:2005 +#: src/main.c:2012 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3092,42 +3102,42 @@ msgstr "" "-k només es pot emprar amb -O si es desa la sortida a un fitxer normal.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, 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:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, 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:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "No s'ha trobat cap URL a %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "No s'ha pogut suprimir %s: %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3138,7 +3148,7 @@ "Temps total real: %s\n" "Baixat: %d fitxers, %s en %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "S'ha EXCEDIT la quota de baixada de %s.\n" @@ -3307,7 +3317,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "S'està continuant en segon terme, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "La sortida s'escriurà a %s.\n" @@ -3353,67 +3363,67 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: no s'ha pogut determinar l'estat de %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "AVÃS: s'està utilitzant una llavor aleatòria febla.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "La vostra versió d'OpenSSL és massa antiga per suportar TLSv1.1\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: L'URL %s no és vàlid: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: 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:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 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:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " S'ha trobat un certificat autosignat.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " El certificat encara no és vàlid.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " El certificat ha caducat.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3422,7 +3432,7 @@ "%s: cap nom comú alternatiu del certificat concorda\n" "\tamb el nom del servidor demanat %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3430,7 +3440,7 @@ "%s: el nom comú «%s» del certificat no concorda amb el nom del servidor " "demanat %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3441,7 +3451,7 @@ " 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:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3492,24 +3502,24 @@ 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:912 +#: src/retr.c:928 #, 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:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "S'ha excedit el màxim de redireccions (%d).\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3517,7 +3527,7 @@ "S'està abandonant.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3589,100 +3599,110 @@ msgid "HTTPS support not compiled in" msgstr "La implementació d'HTTPS no s'ha inclòs a la construcció" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "S'ha trobat una seqüència multioctet incompleta o invàlida\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Es continua en segon terme, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, 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:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, 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:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "L'expressió regular %s no és vàlida, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "L'expressió regular %s no és vàlida, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, 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:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "S'ha produït un error en obrir el fitxer WARC %s.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "S'ha produït un error en obrir el flux GZIP al fitxer WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "No s'ha pogut escriure el registre warcinfo al fitxer WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3691,26 +3711,26 @@ "S'està obrint el fitxer WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "S'ha produït un error en obrir el fitxer WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "El fitxer CDX no llista les url originals. (Manca la columna «a».)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" "El fitxer CDX no llista les sumes de comprovació. (Manca la columna «k».)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" "El fitxer CDX no llista les id dels registres. (Manca la columna «u».)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3721,35 +3741,35 @@ msgstr[0] "S'ha carregat %d registre de CDX.\n" msgstr[1] "S'han carregat %d registres de CDX.\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "No s'ha pogut llegir el fitxer CDX %s per a deduplicar.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 #, fuzzy msgid "Could not open temporary WARC manifest file.\n" msgstr "No s'ha pogut escriure al fitxer temporal WARC.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 #, fuzzy msgid "Could not open temporary WARC log file.\n" msgstr "No s'ha pogut escriure al fitxer temporal WARC.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 #, fuzzy msgid "Could not open WARC file.\n" msgstr "No s'ha pogut escriure al fitxer WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "No s'ha pogut obrir el fitxer CDX per escriure l'eixida.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "No s'ha pogut obrir el fitxer temporal WARC.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "S'ha trobat la coincidència exacta al fitxer CDX. S'està desant el registre " @@ -3761,18 +3781,12 @@ #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: l'opció «--%s» no és reconeguda\n" -#~ msgid "%s: option '-W %s' is ambiguous\n" -#~ msgstr "%s: l'opció «-W %s» és ambigua\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 "File `%s' already there; not retrieving.\n" -#~ msgstr "El fitxer «%s» ja existeix, no es baixa.\n" - #~ msgid "idn_decode failed (%d): %s\n" #~ msgstr "Ha fallat «idn_decode» (%d): %s\n" @@ -3783,6 +3797,9 @@ #~ "\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 "Authorization failed.\n" #~ msgstr "Ha fallat l'autorització.\n" diff -Nru wget-1.19.5/po/ChangeLog wget-1.20.1/po/ChangeLog --- wget-1.19.5/po/ChangeLog 2018-02-08 20:21:55.000000000 +0000 +++ wget-1.20.1/po/ChangeLog 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -2018-02-08 gettextize - - * Makefile.in.in: Upgrade to gettext-0.19.8.1. - * Rules-quot: Upgrade to gettext-0.19.8.1. - Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/cs.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/cs.gmo differ diff -Nru wget-1.19.5/po/cs.po wget-1.20.1/po/cs.po --- wget-1.19.5/po/cs.po 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/po/cs.po 2018-12-26 20:10:49.000000000 +0000 @@ -3,7 +3,7 @@ # This file is distributed under the same license as the wget package. # Jan Prikryl , 1998, 2000, 2001 # Petr Pisar , 2007, 2008, 2009, 2010, 2012, 2013, 2015. -# Petr Pisar , 2016, 2017. +# Petr Pisar , 2016, 2017, 2018. # # Translations from bundled gnulib: # @@ -14,10 +14,10 @@ # msgid "" msgstr "" -"Project-Id-Version: wget 1.18.109\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-01-17 20:29+01:00\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-13 20:36+01:00\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" "Language: cs\n" @@ -108,29 +108,29 @@ msgstr "Neznámá chyba" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: pÅ™epínaÄ â€ž%s“ není jednoznaÄný\n" +msgstr "%s: pÅ™epínaÄ â€ž%s%s“ není jednoznaÄný\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: pÅ™epínaÄ â€ž%s“ není jednoznaÄný, možnosti:" +msgstr "%s: pÅ™epínaÄ â€ž%s%s“ není jednoznaÄný, možnosti:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: neznámý pÅ™epínaÄ â€ž%c%s“\n" +msgstr "%s: nerozpoznaný pÅ™epínaÄ â€ž%s%s“\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: pÅ™epínaÄ â€ž%c%s“ nedovoluje argument\n" +msgstr "%s: pÅ™epínaÄ â€ž%s%s“ nepÅ™ipouÅ¡tí argument\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: pÅ™epínaÄ â€ž--%s“ vyžaduje argument\n" +msgstr "%s: pÅ™epínaÄ â€ž%s%s“ vyžaduje argument\n" #: lib/getopt.c:621 #, c-format @@ -239,17 +239,17 @@ msgid "Unmatched ) or \\)" msgstr "Chybí odpovídající závorka k ) nebo \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Žádný pÅ™edchozí regulární výraz" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "nelze vytvoÅ™it rouru" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -315,7 +315,7 @@ msgid "failed: %s.\n" msgstr "nezdaÅ™ilo se: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: adresu poÄítaÄe %s nelze pÅ™eložit\n" @@ -441,12 +441,12 @@ msgid "Length: %s" msgstr "Délka: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) zbývá" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s zbývá" @@ -620,7 +620,7 @@ "Soubor Äi adresář %s neexistuje.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s se objevil.\n" @@ -643,17 +643,17 @@ msgid "Data transfer aborted.\n" msgstr "PÅ™enos dat byl pÅ™edÄasnÄ› ukonÄen.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, 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:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(pokus:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -662,7 +662,7 @@ "%s (%s) – zapsáno na standardní výstup %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -671,8 +671,8 @@ "%s (%s) – %s uložen [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Maže se %s.\n" @@ -775,160 +775,176 @@ "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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "%s se zamítá.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "%s se zamítá (neplatný záznam).\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s je vynechán/nezahrnut kvůli regulárnímu výrazu.\n" + +#: src/ftp.c:2645 #, 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:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Vzorku %s nic neodpovídá.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, 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:2760 +#: src/ftp.c:2762 #, 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:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "CHYBA: Adresář %s nelze otevřít.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "CHYBA: Certifikát %s nelze otevřít: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Certifikát certifikaÄní autority „%s“ zaveden\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Soubor s CRL „%s“ byl zaveden\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "VaÅ¡e verze GnuTLS je příliÅ¡ stará, aby podporovala TLSv1.3\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: neimplementovaná hodnota %d volby „secure-protocol“\n" +msgstr "GnuTLS: neimplementovaná hodnota %u volby „secure-protocol“\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: neimplementovaná hodnota %d volby „secure-protocol“\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: ŘetÄ›zec s prioritami nelze přímo nastavit. Návrat k výchozí " +"prioritÄ›.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "CHYBA" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "VAROVÃNÃ" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s nepÅ™edložil žádný certifikát.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Certifikát %s nemá známého vydavatele.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certifikát %s byl odvolán.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Certifikátu pro %s vyprÅ¡ela platnost.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Chyba pÅ™i inicializaci X509 certifikátu: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Žádný certifikát nenalezen\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Chyba pÅ™i rozebírání certifikátu: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Certifikát jeÅ¡tÄ› nenabyl platnosti.\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Certifikátu uplynula doba platnosti\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Certifikát musí být typu X.509\n" @@ -968,11 +984,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Nebylo možné odeslat HTTP požadavek: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Chybí hlaviÄky, pÅ™edpokládám HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -981,11 +997,11 @@ "Soubor %s je již přítomen, nebude pÅ™enášen.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "Funkce gmtime() selhala. Jedná se asi o chybu.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -993,55 +1009,55 @@ "ÄŒasový údaj nelze pÅ™evést na formát HTTP. Jako Äas poslední úpravy se požije " "0.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Soubor %s s daty pro BODY chybí: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Využije se existující spojení s [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Využije se existující spojení s %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Chyba pÅ™i Ätení odpovÄ›di od proxy: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s CHYBA %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "OdpovÄ›Ä serveru má zkomolený stavový řádek" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tunelování skrz proxy se nezdaÅ™ilo: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Server požaduje neznámý způsob autentizace.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Vybraná autentizace: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Ukládám do: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1050,20 +1066,20 @@ "PÅ™i stahování podpisu:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Neplatná hodnota pri. PÅ™edpokládá se %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1071,42 +1087,42 @@ "Nebylo možné nalézt algoritmus otisku pÅ™ijatelný pro metalinkové zdroje.\n" "Ignorují se.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Vypínám SSL kvůli chybám, které se vyskytly.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s požadavek odeslán, program Äeká na odpověą " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "NepÅ™iÅ¡la žádná data.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Chyba (%s) pÅ™i Ätení hlaviÄek.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(žádný popis)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "PÅ™esmÄ›rováno na: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "neudáno" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [následuji]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1115,7 +1131,7 @@ "Soubor %s nebyl na serveru zmÄ›nÄ›n. Stažení se vynechává.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1126,7 +1142,7 @@ "Možná byste chtÄ›li pÅ™idat pÅ™epínaÄ --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1136,59 +1152,59 @@ " Soubor je již plnÄ› pÅ™enesen, nebude se nic dÄ›lat.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Délka: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "je ignorována" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Varování: HTTP nepodporuje žolíkové znaky.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nelze zapsat do %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "V pÅ™ijaté hlaviÄce chybí požadovaný atribut.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Autentizace jménem a heslem se nezdaÅ™ila.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Nelze zapsat do souboru WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Nelze zapsat do doÄasného souboru WARC.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Nebylo možné navázat SSL spojení.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s nelze smazat (%s).\n" # , c-format -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "CHYBA: PÅ™esmÄ›rování (%d) bez udané nové adresy.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1196,27 +1212,27 @@ "V odpovÄ›di HTTP nebylo možné najít metalinková data. Soubor se stahuje\n" "pomocí HTTP GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 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:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Vzdálený soubor neexistuje – slepý odkaz!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 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:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1225,16 +1241,16 @@ "Soubor na serveru není novÄ›jší než lokální soubor %s – nebude pÅ™enášen.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Velikosti se neshodují (lokální %s), stahuji.\n" -#: src/http.c:4589 +#: src/http.c:4597 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:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1244,7 +1260,7 @@ "stahuji.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1252,7 +1268,7 @@ "Vzdálený soubor existuje, ale neobsahuje žádné odkazy – nestahuji.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1261,7 +1277,7 @@ "Vzdálený soubor existuje a možná obsahuje další odkazy,\n" "avÅ¡ak rekurze je vypnuta – nestahuji.\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1269,12 +1285,12 @@ "Vzdálený soubor existuje.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1283,7 +1299,7 @@ "%s (%s) – zapsáno na standardní výstup %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1292,58 +1308,59 @@ "%s (%s) – %s uloženo [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) – Spojení ukonÄeno na bajtu %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, 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:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nepodporovaná kvalita ochrany „%s“.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepodporovaný algoritmus „%s“.\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, 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" +msgstr "" +"%s: WGETRC ukazuje na %s, kam nebylo možné pÅ™istoupit kvůli chybÄ›: %s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nelze pÅ™eÄíst %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Chyba v %s na řádku %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1355,7 +1372,7 @@ "Prosím, prověřte „%s“\n" "nebo urÄete jiný soubor pomocí --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1366,52 +1383,52 @@ "„%s“\n" "nebo urÄete jiný soubor pomocí --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Neplatný příkaz --execute %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Neplatné Äíslo %s\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s lze použít jen jednou\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Neplatná hodnota bajtu %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Neplatná Äasová perioda %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1420,28 +1437,28 @@ "use-askpass vyžaduje Å™etÄ›zec nebo buÄ nastavenou promÄ›nnou prostÅ™edí\n" "WGET_ASKPASS, nebo SSH_ASKPASS.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Neplatná hodnota %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Neplatná hlaviÄka %s\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Neplatná hlaviÄka WARC %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Neplatný druh indikace postupu %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1456,16 +1473,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Kódování %s není platné\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Zaznamenána neúplná nebo neplatná vícebajtová posloupnost\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Neobsloužená chyba Ä. %d\n" @@ -1498,12 +1515,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s: vypínám protokolování\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Použití: %s [PŘEPÃNAÄŒ]… [URL]…\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1512,57 +1529,57 @@ "verze.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Rozjezd:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version zobrazí verzi Wgetu a skonÄí\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help vytiskne tuto nápovÄ›du\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background po spuÅ¡tÄ›ní pÅ™ejde do pozadí\n" -#: src/main.c:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Protokolový a vstupní soubor:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=SOUBOR protokol zapisuje do SOUBORU\n" -#: src/main.c:610 +#: src/main.c:611 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:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug tiskne mnoho ladicích informací\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug tiskne ladicí informace z Watt-32\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tichý režim (žádný výstup)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose bude upovídaný (výchozí chování)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1570,7 +1587,7 @@ " -nv, --no-verbose vypne upovídanost, aniž by byl zcela " "zticha\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1578,7 +1595,7 @@ " --report-speed=ZPÅ®SOB datový tok vypisuje daným ZPÅ®SOBEM,\n" " ZPÅ®SOB může být „bits“ (bity)\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1586,7 +1603,7 @@ " -i, --input-file=SOUBOR stáhne URL uvedená v místním nebo\n" " vnÄ›jším SOUBORU\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1594,11 +1611,11 @@ " --input-metalink=SOUBOR stáhne soubory uvedená v místním\n" " metalinkovém SOUBORU.\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html vstupní soubor považuje za HTML\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1607,25 +1624,25 @@ "F)\n" " relativnÄ› vzhledem k URL\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=SOUBOR urÄuje konfiguraÄní soubor\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-config nenaÄte žádný konfiguraÄní soubor\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Stahování:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1633,26 +1650,26 @@ " -t, --tries=POÄŒET nastaví POÄŒET opakování (0 znamená " "neomezeno)\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused opakuje, i když spojení je odmítnuto\n" -#: src/main.c:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=SEZNAM        Äárkou oddÄ›lený seznam ignorovaných HTML\n" -" znaÄek\n" +" --retry-on-http-error=CHYBY     Äárkou oddÄ›lený seznam chyb HTTP,\n" +" po kterých se má stažení zkusit " +"znovu\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=SOUBOR dokumenty zapisuje do SOUBORU\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1660,14 +1677,14 @@ " -nc, --no-clobber vynechá stahování, která by pÅ™epsala již\n" " existující soubory\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-config nenaÄte žádný konfiguraÄní soubor\n" +msgstr "" +" --no-netrc nezkusí získat jména a hesla z .netrc\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1675,7 +1692,7 @@ " -c, --continue obnoví stahování ÄásteÄnÄ› staženého " "souboru\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1683,11 +1700,11 @@ " --start-pos=POZICE zaÄne stahovat od POZICE (poÄítá se od " "0)\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=DRUH vybere druh indikátoru postupu\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1695,7 +1712,7 @@ " --show-progress zobrazí indikátoru postupu ve vÅ¡ech\n" " úrovních upovídanosti\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1705,7 +1722,7 @@ "mají\n" " mladší místní kopii\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1716,7 +1733,7 @@ " If-Modified-Since pÅ™i porovnání Äasu " "souborů\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1724,20 +1741,20 @@ " --no-use-server-timestamps nenastaví Äas místního souboru podle\n" " souboru na serveru\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response tiskne odpovÄ›Ä serveru\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider nestahuje nic\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1745,7 +1762,7 @@ " --dns-servers=ADRESY seznam serverů DNS na dotazy (oddÄ›lené\n" " Äárkou)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1754,34 +1771,34 @@ "(jméno nebo IP)\n" " na tomto stroji\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 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:699 +#: src/main.c:700 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:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1789,15 +1806,15 @@ " --random-wait Äeká od 0,5*WAIT do 1,5*WAIT sekund mezi\n" " staženími\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy explicitnÄ› vypne proxy\n" -#: src/main.c:705 +#: src/main.c:706 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:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1806,16 +1823,16 @@ "IP)\n" " na tomto stroji\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=RYCHLOST omezí rychlost stahování na RYCHLOST\n" -#: src/main.c:711 +#: src/main.c:712 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:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1823,7 +1840,7 @@ " --restrict-file-names=OS omezí znaky ve jménech souborů na ty,\n" " které dovoluje operaÄní systém OS\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1831,15 +1848,15 @@ " --ignore-case pÅ™i porovnávání jmen souborů/adresářů\n" " nebere zÅ™etel na velikost písmen\n" -#: src/main.c:718 +#: src/main.c:719 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:720 +#: src/main.c:721 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:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1849,24 +1866,24 @@ " RODINY („IPv6“, „IPv4“ nebo " "„none“ (žádná))\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password ptá se na hesla\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1883,30 +1900,30 @@ "WGET_ASKPASS\n" " a SSH_ASKPASS.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri vypne podporu IRI\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink odstraní soubor pÅ™ed jeho pÅ™episem\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1914,7 +1931,7 @@ " --keep-badhash ponechá soubory se Å¡patným kontrolním\n" " souÄtem (pÅ™ipojí .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1922,7 +1939,7 @@ " --metalink-index=ÄŒÃSLO poÅ™adové Äíslo v metaURL metalinku\n" " application/metalink4+xml\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1930,7 +1947,7 @@ " --metalink-over-http použije metalinková metadata z hlaviÄek\n" " odpovÄ›di HTTP\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1938,41 +1955,42 @@ " --preferred-location preferované umístÄ›ní metalinkových " "zdrojů\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr neukládá metadata do rozšířených " "atributů\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Adresáře:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories nevytváří adresáře\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories vynutí vytváření adresářů\n" -#: src/main.c:767 +#: src/main.c:768 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:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories použije jméno protokolu v adresářích\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=CESTA uloží soubory do CESTA/…\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1980,25 +1998,25 @@ " --cut-dirs=POÄŒET ignoruje POÄŒET vzdálených adresářových\n" " komponent\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "PÅ™epínaÄe pro HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 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:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=HESLO nastaví heslo pro HTTP na HESLO\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache zakáže keÅ¡ování na stranÄ› serveru\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2006,7 +2024,7 @@ " --default-page=NÃZEV zmÄ›ní výchozí název stránky (běžnÄ›\n" " to je „index.html“)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2014,42 +2032,43 @@ " -E, --adjust-extension HTML/CSS dokumenty ukládá s patÅ™iÄnou\n" " příponou\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignoruje hlaviÄku „Content-Length“\n" -#: src/main.c:792 +#: src/main.c:793 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:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=DRUH vybere druh indikátoru postupu\n" +msgstr "" +" --compression=DRUH vybere kompresi, jedna z auto, gzip a\n" +" none [žádná]. (výchozí: none)\n" -#: src/main.c:798 +#: src/main.c:799 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:800 +#: src/main.c:801 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:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=HESLO nastaví HESLO k proxy\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2057,11 +2076,11 @@ " --referer=URL zahrne hlaviÄku „Referer: URL“ do HTTP\n" " požadavku\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers hlaviÄky HTTP uloží do souboru\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2069,36 +2088,36 @@ " -U, --user-agent=AGENT identifikuje se jako AGENT místo Wget/" "VERZE\n" -#: src/main.c:810 +#: src/main.c:811 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:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies nepoužije cookies\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 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:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2106,19 +2125,19 @@ " --post-data=ŘETÄšZEC použije metodu POST, jako data poÅ¡le " "ŘETÄšZEC\n" -#: src/main.c:822 +#: src/main.c:823 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:824 +#: src/main.c:825 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:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2126,14 +2145,14 @@ " --body-data=ŘETÄšZEC jako data poÅ¡le ŘETÄšZEC, --method JE " "nutný\n" -#: src/main.c:828 +#: src/main.c:829 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:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2144,14 +2163,14 @@ "v úvahu\n" " hlaviÄku Content-Disposition (POKUSNÉ)\n" -#: src/main.c:833 +#: src/main.c:834 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:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2162,56 +2181,56 @@ "by\n" " nejprve poÄkal na výzvu od serveru\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "PÅ™epínaÄe HTTPS (SSL/TLS):\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -" --secure-protocol=PROT vybere bezpeÄnostní protokol, jeden z " +" --secure-protocol=PROTOKOL vybere bezpeÄnostní protokol, jeden z " "auto,\n" -" SSLv2, SSLv3, TLSv1 a PFS\n" +" SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2 a " +"PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only následuje pouze bezpeÄné HTTPS odkazy\n" -#: src/main.c:849 +#: src/main.c:850 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:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=SOUBOR soubor s certifikátem klienta\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=SOUBOR soubor se soukromým klíÄem\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 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:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2219,13 +2238,13 @@ " --ca-directory=ADRESÃŘ adresář obsahující hashe jmen\n" " certifikaÄních autorit\n" -#: src/main.c:863 +#: src/main.c:864 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:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2241,7 +2260,7 @@ " a které jsou oddÄ›leny znakem „;“, proti\n" " kterým se ověřuje protistrana\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2249,7 +2268,7 @@ " --random-file=SOUBOR soubor s náhodnými daty pro zdroj " "SSL PRNG\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2257,7 +2276,7 @@ " --egd-file=SOUBOR soubor jmenující socket EGD s náhodnými " "daty\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2266,16 +2285,23 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=ŘETÄšZEC Přímo nastaví Å™etÄ›zec s prioritami (GnuTLS)\n" +" nebo se seznamem Å¡ifer (OpenSSL). " +"Používejte\n" +" s obezÅ™etností. Tento pÅ™epínaÄ pÅ™ebije\n" +" --secure-protocol. Podoba a skladba tohoto\n" +" Å™etÄ›zce závisí konkrétní implementaci SSL/" +"TLS.\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "PÅ™epínaÄe pro HSTS:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts zakáže HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2283,11 +2309,11 @@ " --hsts-file cesta k databázi HSTS (pÅ™ebije výchozí\n" " chování)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "PÅ™epínaÄe FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2296,35 +2322,35 @@ "binární\n" " FTP soubory\n" -#: src/main.c:901 +#: src/main.c:902 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:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=HESLO nastaví heslo pro FTP na HESLO\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing neodstraňuje soubory „.listing“\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob neexpanduje jména FTP souborů\n" -#: src/main.c:909 +#: src/main.c:910 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:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions zachová přístupová práva ze serveru\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2333,11 +2359,11 @@ "ne),\n" " na které odkazuje symbolický odkaz\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "PÅ™epínaÄe pro FTPS:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2346,7 +2372,7 @@ "port\n" " je 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2358,7 +2384,7 @@ "spojení\n" " řídicího.\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2366,7 +2392,7 @@ " --ftps-clear-data-connection Å¡ifruje pouze řídicí spojení,\n" " data Å¡ifrována nebudou\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2374,11 +2400,11 @@ " --ftps-fallback-to-ftp není-li FTPS podporováno cílovým\n" " serverem, pÅ™ejde se na FTP\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "PÅ™epínaÄe WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2386,12 +2412,12 @@ " --warc-file=SOUBOR uloží požadavek/odpovÄ›Ä do souboru .warc." "gz\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" @@ -2399,11 +2425,11 @@ "na\n" " ÄŒÃSLO\n" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx zapíše indexové soubory CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2411,22 +2437,22 @@ " --warc-dedup=SOUBOR neukládá záznamy uvedené v tomto souboru " "CDX\n" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-warc-compression nekomprimuje soubory WARC gzipem\n" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests nepoÄítá kontrolní souÄty SHA1\n" -#: src/main.c:949 +#: src/main.c:950 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:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2435,15 +2461,15 @@ " --warc-tempdir=ADRESÃŘ umístÄ›ní doÄasných souborů vytvářených\n" " zapisovatelem WARC\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekurzivní stahování:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive zapne rekurzivní stahování\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2451,7 +2477,7 @@ " -l, --level=POÄŒET maximální hloubka rekurze\n" " („inf“ nebo „0“ pro nekoneÄno)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2459,7 +2485,7 @@ " --delete-after smaže soubory lokálnÄ› po té, co dokonÄí\n" " jejich stahování\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2469,7 +2495,7 @@ "na\n" " místní soubory\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2477,7 +2503,7 @@ " --convert-file-only pÅ™evede pouze Äást URL se souborem " "(basename)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2485,7 +2511,7 @@ " --backups=N pÅ™ed zápisem souboru X odrotuje až N\n" " záložních souborů\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2493,7 +2519,7 @@ " -K, --backup-converted pÅ™ed konverzí souboru X jej zazálohuje\n" " jako X_orig\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2501,7 +2527,7 @@ " -K, --backup-converted pÅ™ed konverzí souboru X jej zazálohuje\n" " jako X.orig\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2509,7 +2535,7 @@ " -m, --mirror zkratka pro -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2517,7 +2543,7 @@ " -p, --page-requisites získá vÅ¡echny obrázky apod. potÅ™ebné pro\n" " zobrazení HTML stránky\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2525,64 +2551,64 @@ " --strict-comments zapne přísné zacházení s HTML komentáři\n" " podle SGML\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Rekurzivní povolení/zakázání:\n" -#: src/main.c:989 +#: src/main.c:990 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:991 +#: src/main.c:992 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:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 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:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=DRUH druh regulárních výrazů (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp následuje FTP odkazy z HTML dokumentů\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2591,7 +2617,7 @@ "urÄených\n" " k následování\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2599,22 +2625,22 @@ " --ignore-tags=SEZNAM        Äárkou oddÄ›lený seznam ignorovaných HTML\n" " znaÄek\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative následuje jen relativní odkazy\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" " -I, --include-directories=SEZNAM\n" " seznam povolených adresářů\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2623,94 +2649,95 @@ " --trust-server-names použije se jméno z poslední Äásti\n" " pÅ™esmÄ›rovávajícího URL\n" -#: src/main.c:1023 +#: src/main.c:1024 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:1025 +#: src/main.c:1026 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:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" msgstr "" -"Zprávy o chybách a návrhy na vylepÅ¡ení programu zasílejte na adresu\n" +"Zprávy o chybách, dotazy a diskuze zasílejte e-mailem na adresu\n" " (pouze anglicky). Komentáře k Äeskému pÅ™ekladu\n" "zasílejte na adresu .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"Nebo otevÅ™ete požadavek na webové adrese\n" +".\n" # , c-format -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Heslo uživatele %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Heslo: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Nelze vytvoÅ™it rouru\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Uživatelské jméno pro „%s%s“: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Heslo pro „%s%s@%s“: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc:" -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Národní prostÅ™edí: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "PÅ™eloženo: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Slinkováno: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2719,29 +2746,29 @@ "GNU Wget %s sestaven na systému %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (prostÅ™edí)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (uživatelský)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2755,7 +2782,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2763,41 +2790,41 @@ "\n" "Původním autorem tohoto programu je Hrvoje NikÅ¡ić .\n" -#: src/main.c:1337 +#: src/main.c:1338 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:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Problém s alokací pamÄ›ti\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "KonÄí se kvůli chybÄ› v %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, 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:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nepřípustný pÅ™epínaÄ – „-n%c“\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2806,7 +2833,7 @@ "Jak --no-clobber, tak --convert-links byly zadány. Použije se jen\n" "pÅ™epínaÄ --convert-links.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2815,22 +2842,22 @@ "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:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2841,7 +2868,7 @@ "více URL nebo je-li zadán pÅ™epínaÄ -p nebo -r. VysvÄ›tlení naleznete " "v manuálu.\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2851,7 +2878,7 @@ "uložen do jediného souboru, který jste urÄili.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2861,7 +2888,7 @@ "v manuálu.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2869,7 +2896,7 @@ "Výstup do WARC nefunguje spolu s --no-clobber. PÅ™epínaÄ --no-clobber bude\n" "vypnut.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2877,12 +2904,12 @@ "Výstup do WARC nefunguje spolu s porovnáváním Äasů. Porovnávání Äasů bude\n" "vypnuto.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, 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:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2891,7 +2918,7 @@ "Výstup do WARC nefunguje spolu s --continue nebo --start-pos. PÅ™epínaÄe\n" "budou vypnuty.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2900,21 +2927,21 @@ "opakující\n" "se záznamy.\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"Výstup do WARC nefunguje spolu s --continue nebo --start-pos. PÅ™epínaÄe\n" -"budou vypnuty.\n" +"Komprese nefunguje spolu s --continue nebo --start-pos. PÅ™epínaÄe budou " +"vypnuty.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "--ask-password a --password nelze zadat najednou.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2923,17 +2950,17 @@ "NedoporuÄuje se uvádÄ›t jak --start-pos, tak --continue. PÅ™epínaÄ --continue\n" "bude vypnut.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: chybí URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2943,7 +2970,7 @@ "method. PÅ™epínaÄ --method oÄekává data skrze pÅ™epínaÄe --body-data a --body-" "file\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2952,17 +2979,17 @@ "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:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Tato verze neobsahuje podporu pro IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2970,7 +2997,7 @@ "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:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2979,42 +3006,42 @@ "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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Nebylo možné inicializovat knihovnu libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Nebylo možné inicializovat kanál knihovny c-ares\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "IP adresu „%s“ nebylo možné rozebrat\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "V souboru „%s“ nebyla nalezena žádná URL.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Metalinkový soubor %s nebylo možné rozebrat.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3025,7 +3052,7 @@ "Celkový skuteÄný Äas: %s\n" "Staženo: %d souborů, %s za %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Kvóta %s na stahování PŘEKROÄŒENA!\n" @@ -3191,7 +3218,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Program pokraÄuje v bÄ›hu na pozadí, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Výstup bude zapsán do %s.\n" @@ -3241,64 +3268,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: volání „stat %s“ skonÄilo chybou: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "VAROVÃNÃ: používám slabý zdroj náhodných Äísel.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "VaÅ¡e verze OpenSSL je příliÅ¡ stará, aby podporovala TLSv1.1\n" +msgstr "VaÅ¡e verze OpenSSL je příliÅ¡ stará, aby podporovala TLSv1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: neimplementovaná hodnota %d volby „secure-protocol“\n" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: Neplatné URL %s: %s\n" +msgstr "OpenSSL: Neplatný seznam Å¡ifer: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "PRNG nelze zinicializovat, zvažte použití pÅ™epínaÄe --random-file.\n" +msgstr "" +"POZOR: PRNG nebylo možné zinicializovat. Zvažte použití pÅ™epínaÄe --random-" +"file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Autoritu vydavatele nelze lokálnÄ› ověřit.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Nalezen certifikát podepsaný sám sebou.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Vydaný certifikát jeÅ¡tÄ› nenabyl platnosti.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Vydanému certifikátu uplynula doba platnosti.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3307,7 +3334,7 @@ "%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:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3315,7 +3342,7 @@ " %s: obecné jméno (CN) certifikátu %s se neshoduje s požadovaným jménem " "poÄítaÄe %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3326,7 +3353,7 @@ " 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:1042 +#: src/openssl.c:1046 #, 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" @@ -3375,22 +3402,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "NaÄítá se „robots.txt“. Chybová hlášení ignorujte, prosím.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Chyba rozebírání URL proxy serveru %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "PÅ™ekroÄeno %d pÅ™esmÄ›rování.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3398,7 +3425,7 @@ "Ani poslední pokus nebyl úspěšný.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3473,99 +3500,111 @@ msgid "HTTPS support not compiled in" msgstr "Podpora HTTPS nebyla zakompilována do programu" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "Zaznamenána neúplná nebo neplatná vícebajtová posloupnost\n" +msgstr "Zaznamenána nepÅ™evoditelná vícebajtová posloupnost\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Program pokraÄuje v bÄ›hu na pozadí. pid %d\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nebylo možné odstranit symbolický odkaz %s: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Nebylo možné inicializovat knihovnu libcares\n" +msgstr "OtevÅ™ení souboru %s selhalo\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Nastavení práv k souboru „%s“ selhalo.\n" +msgstr "Získání deskriptoru souboru „%s“ selhalo\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Nastavení práv k souboru „%s“ selhalo.\n" +msgstr "ZjiÅ¡tÄ›ní přístupových práv k souboru „%s“ selhalo\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Soubor %s se od poslední kontroly zmÄ›nil. BezpeÄnostní kontrola selhala." -#: src/utils.c:917 -#, fuzzy, c-format +# TODO: a space before a colon +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "IP adresu „%s“ nebylo možné rozebrat\n" +msgstr "OtevÅ™ení souboru %s selhalo: %s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Nastavení práv k souboru „%s“ selhalo.\n" +msgstr "Získání údajů o souboru „%s“ selhalo, chyba: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"Pokus otevřít soubor %s, který se od poslední kontroly zmÄ›nil. BezpeÄností " +"kontrola selhala." -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Neplatný regulární výraz %s, chyba PCRE2 %d\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Neplatný regulární výraz %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "PÅ™i porovnávání %s nastala chyba: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "PÅ™eskakuje se klÃ­Ä se Å¡patnou velikostí (%d/%d): %s\n" + +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Chyba pÅ™i duplikaci deskriptoru souboru WARC.\n" -#: src/warc.c:223 +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Chyba pÅ™i otevírání gzipového proudu do souboru WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Chyba pÅ™i zápisu záznamu warcinfo do souboru WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3574,24 +3613,24 @@ "Otevírání souboru WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Chyba pÅ™i otevírání souboru WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Soubor CDX neuvádí původní URL. (Chybí sloupec „a“.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Soubor CDX neuvádí kontrolní souÄet. (Chybí sloupec „k“.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "Soubor CDX neuvádí identifikátory záznamů. (Chybí sloupec „u“.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3609,32 +3648,32 @@ "NaÄteno %d záznamů z CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Nebylo možné pÅ™eÄíst soubor CDX %s za úÄelem odstranÄ›ní duplikátů.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Nebylo možné otevřít doÄasný soubor manifestu WARC.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Nebylo možné otevřít doÄasný soubor protokolu WARC.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Nebylo možné otevřít soubor WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Nebylo možné otevřít soubor CDX pro výstup.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Nebylo možné otevřít doÄasný soubor WARC.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Nalezena pÅ™esná shoda v souboru CDX. Ukládá se záznam o opakované návÅ¡tÄ›vÄ› " Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/da.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/da.gmo differ diff -Nru wget-1.19.5/po/da.po wget-1.20.1/po/da.po --- wget-1.19.5/po/da.po 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/po/da.po 2018-12-26 20:10:49.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: wget 1.12-pre7\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2011-01-09 07:03+0100\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -242,17 +242,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -316,7 +316,7 @@ msgid "failed: %s.\n" msgstr "mislykkedes: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: kan ikke evaluere værtsadresse %s\n" @@ -439,12 +439,12 @@ msgid "Length: %s" msgstr "Længde: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) resterende" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s resterende" @@ -610,7 +610,7 @@ "Ingen fil eller katalog ved navn %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s er opstået.\n" @@ -633,17 +633,17 @@ msgid "Data transfer aborted.\n" msgstr "Dataoverførsel afbrudt.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Filen %s findes allerede, hentes ikke.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(forsøg:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -652,7 +652,7 @@ "%s (%s) - skrevet til standard-udata %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -661,8 +661,8 @@ "%s (%s) - %s gemt [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Fjerner %s.\n" @@ -758,160 +758,174 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Afviser %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Afviser %s.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "Behandler ikke %s, da det er ekskluderet/ikke inkluderet.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Fejl ved sammenligning af %s med %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ingen træffere med mønsteret %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Skrev HTML-formateret indeks til %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Skrev HTML-formateret indeks til %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "FEJL: Kan ikke åbne katalog %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "FEJL: Kan ikke åbne katalog %s.\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Kunne ikke indlæse certifikater fra %s\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "FEJL" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "ADVARSEL" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Intet certifikat præsenteret af %s.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Certifikatet for %s er ikke betroet.\n" -#: src/gnutls.c:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Certifikatet for %s har ingen kendt udsteder.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certifikatet for %s er blevet tilbagekaldt.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Certifikatet for %s er blevet tilbagekaldt.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Fejl ved initialisering af X509-certifikat: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Intet certifikat fundet\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Fejl ved fortolkning af certifikat: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Certifikatet er endnu ikke blevet aktiveret\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Certifikatet er udløbet\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -951,144 +965,144 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Fejl ved skrivning af HTTP-forespørgsel: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Ingen toptekster, antager HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "Filen %s findes allerede, hentes ikke.\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "POST-datafil %s mangler: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Genbruger eksisterende forbindelse til %s:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Genbruger eksisterende forbindelse til %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Fejl ved læsning af svar fra proxy: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEJL %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Forkert udformet statuslinje" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Proxytunnel slog fejl: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Ukendt autorisations-protokol.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Ukendt autorisations-protokol.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Gemmer til: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Deaktiverer SSL, da der opstod fejl.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s forespørgsel sendt, afventer svar... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Ingen data modtaget\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Læsefejl (%s) i toptekster.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(ingen beskrivelse)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Sted: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "uspecificeret" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [omdirigeret]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1096,7 +1110,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1106,82 +1120,82 @@ " Filen er allerede fuldt overført; ingen handling nødvendig.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Længde: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignoreret" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Advarsel: jokertegn ikke understøttet i HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Edderkoptilstand aktiveret. Kontrollér om fjernfilen findes.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kan ikke skrive til %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Kan ikke skrive til %s (%s).\n" -#: src/http.c:4415 +#: src/http.c:4421 #, fuzzy msgid "Cannot write to temporary WARC file.\n" msgstr "Kan ikke skrive til %s (%s).\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Kunne ikke etablere SSL-forbindelse.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Kan ikke skrive til %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEJL: Omdirigering (%d) uden nyt sted.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Fjernfilen findes ikke -- ødelagt henvisning!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified toptekst mangler -- tidsstempling slås fra.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified toptekst ugyldig -- tidsstempel ignoreret.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1190,16 +1204,16 @@ "Serverfil ikke nyere end lokal fil %s -- hentes ikke.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Størrelserne er forskellige (lokal %s) -- hentes.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Fil på server er nyere - hentes.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1209,7 +1223,7 @@ "henter.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1217,7 +1231,7 @@ "Fjernfil findes, men indeholder ingen henvisninger -- henter ikke.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1227,7 +1241,7 @@ "men rekursion er deaktiveret - henter ikke.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1235,12 +1249,12 @@ "Fjernfilen findes.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1249,7 +1263,7 @@ "%s (%s) - skrevet til standard-uddata %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1258,59 +1272,59 @@ "%s (%s) - %s gemt [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Forbindelse lukket ved byte %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Læsefejl ved byte %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" # scheme? -#: src/http.c:5024 +#: src/http.c:5032 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ikke-understøttet skema %s" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan ikke læse %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Fejl i %s på linje %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaksfejl i %s på linje %d.\n" -#: src/init.c:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1318,7 +1332,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1326,75 +1340,75 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Ugyldig kommando %s til --execute\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ugyldigt tal %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ugyldig byteværdi %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ugyldig tidsperiode %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ugyldig værdi %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ugyldig toptekst %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ugyldig toptekst %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ugyldig fremskridtstype %s\n" -#: src/init.c:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1408,16 +1422,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Kodningen %s er ikke gyldig\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Ufuldstændig eller ugyldig flerbytesekvens fundet\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Ubehandlet fejlnr %d\n" @@ -1450,12 +1464,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; deaktiverer logning.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Brug: %s [FLAG]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1463,70 +1477,70 @@ "Obligatoriske argumenter til lange flag er obligatoriske også for korte.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Opstart:\n" -#: src/main.c:596 +#: src/main.c:597 #, 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:598 +#: src/main.c:599 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help udskriv denne hjælp.\n" -#: src/main.c:600 +#: src/main.c:601 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background gå i baggrunden efter opstart.\n" -#: src/main.c:602 +#: src/main.c:603 #, 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Logning og inddatafil:\n" -#: src/main.c:608 +#: src/main.c:609 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FIL log meddelelser til FIL.\n" -#: src/main.c:610 +#: src/main.c:611 #, 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:613 +#: src/main.c:614 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug udskriv masser af fejlsøgningsinformation.\n" -#: src/main.c:617 +#: src/main.c:618 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug udskriv Watt-32-fejlsøgningsinformation.\n" -#: src/main.c:620 +#: src/main.c:621 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet stilhed (ingen udskrift).\n" -#: src/main.c:622 +#: src/main.c:623 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose uddybende udskrift (dette er standardvalget).\n" -#: src/main.c:624 +#: src/main.c:625 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " @@ -1534,13 +1548,13 @@ msgstr "" " -nv, --no-verbose være mindre uddybende, men ikke helt stille.\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " @@ -1548,7 +1562,7 @@ msgstr "" " -i, --input-file=FILE hent URL'er fra den lokale eller eksterne FIL.\n" -#: src/main.c:631 +#: src/main.c:632 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1556,12 +1570,12 @@ msgstr "" " -i, --input-file=FILE hent URL'er fra den lokale eller eksterne FIL.\n" -#: src/main.c:634 +#: src/main.c:635 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html behandl inddatafilen som HTML.\n" -#: src/main.c:636 +#: src/main.c:637 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1571,26 +1585,26 @@ "F)\n" " relativt til URL.\n" -#: src/main.c:639 +#: src/main.c:640 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --no-cookies brug ikke cookies.\n" -#: src/main.c:641 +#: src/main.c:642 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies brug ikke cookies.\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Download:\n" -#: src/main.c:649 +#: src/main.c:650 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1599,14 +1613,14 @@ " -t, --tries=ANTAL sæt antal forsøg til ANTAL (0 for " "ubegrænset)\n" -#: src/main.c:651 +#: src/main.c:652 #, 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:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1615,12 +1629,12 @@ " --ignore-tags=LISTE kommaadskilt liste af HTML-mærker, der\n" " ignoreres.\n" -#: src/main.c:655 +#: src/main.c:656 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FIL skriv dokumenter til FIL.\n" -#: src/main.c:657 +#: src/main.c:658 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1629,14 +1643,14 @@ " -nc, --no-clobber hent ikke filer, der ville blive lagret på\n" " eksisterende filer.\n" -#: src/main.c:660 +#: src/main.c:661 #, 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:662 +#: src/main.c:663 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " @@ -1644,25 +1658,25 @@ msgstr "" " -c, --continue genoptag hentning af en delvis hentet fil.\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" -#: src/main.c:668 +#: src/main.c:669 #, 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:670 +#: src/main.c:671 #, fuzzy msgid "" " -N, --timestamping don't re-retrieve files unless newer " @@ -1673,14 +1687,14 @@ "nyere\n" " end den lokale.\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1689,30 +1703,30 @@ " --no-use-server-timestamps sæt ikke den lokale fils tidsstempel til\n" " den på serveren.\n" -#: src/main.c:679 +#: src/main.c:680 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response udskriv svar fra server.\n" -#: src/main.c:681 +#: src/main.c:682 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider hent intet.\n" -#: src/main.c:683 +#: src/main.c:684 #, 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1722,31 +1736,31 @@ "lokal\n" " vært.\n" -#: src/main.c:691 +#: src/main.c:692 #, 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:693 +#: src/main.c:694 #, 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:695 +#: src/main.c:696 #, 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:697 +#: src/main.c:698 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDER vent SEKUNDER mellem hentninger.\n" -#: src/main.c:699 +#: src/main.c:700 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1756,7 +1770,7 @@ "på\n" " at hente.\n" -#: src/main.c:701 +#: src/main.c:702 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1765,17 +1779,17 @@ " --random-wait vent fra 0,5*VENT til 1,5*VENT sekunder " "mellem hentninger.\n" -#: src/main.c:703 +#: src/main.c:704 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy slå proxy fra eksplicit.\n" -#: src/main.c:705 +#: src/main.c:706 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=ANTAL sæt hentningskvote til ANTAL.\n" -#: src/main.c:707 +#: src/main.c:708 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1785,18 +1799,18 @@ "lokal\n" " vært.\n" -#: src/main.c:709 +#: src/main.c:710 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=HASTIGHED begræns downloadhastighed til HASTIGHED.\n" -#: src/main.c:711 +#: src/main.c:712 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache deaktivér cache for DNS-opslag.\n" -#: src/main.c:713 +#: src/main.c:714 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1806,7 +1820,7 @@ "tillades\n" " af operativsystemet.\n" -#: src/main.c:715 +#: src/main.c:716 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1815,17 +1829,17 @@ " --ignore-case ingen forskel på store/små bogstaver ved\n" " matching af filer/kataloger\n" -#: src/main.c:718 +#: src/main.c:719 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only forbind kun til IPv4-adresser.\n" -#: src/main.c:720 +#: src/main.c:721 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only forbind kun til IPv6-adresser.\n" -#: src/main.c:722 +#: src/main.c:723 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1835,13 +1849,13 @@ " --prefer-family=FAMILIE forbind først til adresser i den angivne\n" " familie, enten IPv6, IPv4, eller none.\n" -#: src/main.c:726 +#: src/main.c:727 #, 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:728 +#: src/main.c:729 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" @@ -1849,12 +1863,12 @@ " --password=KODE angiv både ftp- og http-adgangskode til " "KODE.\n" -#: src/main.c:730 +#: src/main.c:731 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --ask-password bed om adgangskoder.\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1865,19 +1879,19 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri slå understøttelse af IRI fra.\n" -#: src/main.c:739 +#: src/main.c:740 #, 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:741 +#: src/main.c:742 #, fuzzy msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" @@ -1885,72 +1899,71 @@ " --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:743 +#: src/main.c:744 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --no-glob slå globning af FTP-filnavne fra.\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 -#, fuzzy +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" -msgstr " --no-iri slå understøttelse af IRI fra.\n" +msgstr "" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Kataloger:\n" -#: src/main.c:763 +#: src/main.c:764 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories opret ikke kataloger.\n" -#: src/main.c:765 +#: src/main.c:766 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories tving oprettelse af kataloger.\n" -#: src/main.c:767 +#: src/main.c:768 #, 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:769 +#: src/main.c:770 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories brug protokolnavn i kataloger.\n" -#: src/main.c:771 +#: src/main.c:772 #, 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:773 +#: src/main.c:774 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -1959,26 +1972,26 @@ " --cut-dirs=ANTAL ignorér ANTAL komponenter for " "fjernkataloger\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP-flag:\n" -#: src/main.c:779 +#: src/main.c:780 #, 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:781 +#: src/main.c:782 #, 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:783 +#: src/main.c:784 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache tillad ikke serverlagring af data.\n" -#: src/main.c:785 +#: src/main.c:786 #, fuzzy msgid "" " --default-page=NAME change the default page name (normally\n" @@ -1987,7 +2000,7 @@ " --default-page=NAVN Ændr standardsidenavnet (normalt er dette\n" " 'index.html'.).\n" -#: src/main.c:788 +#: src/main.c:789 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -1996,26 +2009,25 @@ " -E, --adjust-extension gem HTML/CSS-dokumenter med passende " "filendelser\n" -#: src/main.c:790 +#: src/main.c:791 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignorér `Content-Length' toptekstfeltet.\n" -#: src/main.c:792 +#: src/main.c:793 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=STRENG indsæt STRENG blandt topteksterne.\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" @@ -2023,17 +2035,17 @@ " --max-redirect maksimalt tilladt antal omdirigeringer pr. " "side.\n" -#: src/main.c:800 +#: src/main.c:801 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=BRUGER sæt BRUGER som proxybrugernavn.\n" -#: src/main.c:802 +#: src/main.c:803 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=KODE brug KODE som proxyadgangskode.\n" -#: src/main.c:804 +#: src/main.c:805 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2042,12 +2054,12 @@ " --referer=URL inkludér `Referer: URL'-toptekst i \n" " HTTP-forespørgsel\n" -#: src/main.c:806 +#: src/main.c:807 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers gem HTTP-topteksterne til en fil.\n" -#: src/main.c:808 +#: src/main.c:809 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2055,7 +2067,7 @@ msgstr "" " -U, --user-agent=AGENT identificér som AGENT frem for Wget/VERSION.\n" -#: src/main.c:810 +#: src/main.c:811 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2064,23 +2076,23 @@ " --no-http-keep-alive deaktivér HTTP-keep-alive (vedvarende \n" " forbindelser).\n" -#: src/main.c:812 +#: src/main.c:813 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies brug ikke cookies.\n" -#: src/main.c:814 +#: src/main.c:815 #, 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:816 +#: src/main.c:817 #, 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:818 +#: src/main.c:819 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " @@ -2089,7 +2101,7 @@ " --keep-session-cookies indlæs og gem (ikke-permanente) " "sessionscookies\n" -#: src/main.c:820 +#: src/main.c:821 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2097,7 +2109,7 @@ msgstr "" " --post-data=STRENG brug POST-metoden; send STRENG som data.\n" -#: src/main.c:822 +#: src/main.c:823 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2105,12 +2117,12 @@ msgstr "" " --post-file=FIL brug POST-metoden; send indhold af FIL.\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " @@ -2118,7 +2130,7 @@ msgstr "" " --post-data=STRENG brug POST-metoden; send STRENG som data.\n" -#: src/main.c:828 +#: src/main.c:829 #, fuzzy msgid "" " --body-file=FILE send contents of FILE. --method MUST be " @@ -2126,7 +2138,7 @@ msgstr "" " --post-file=FIL brug POST-metoden; send indhold af FIL.\n" -#: src/main.c:830 +#: src/main.c:831 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2137,13 +2149,13 @@ " --content-disposition respektér topteksten Content-Disposition ved\n" " valg af lokale filnavne (EKSPERIMENTEL).\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2154,11 +2166,11 @@ " --auth-no-challenge send basal HTTP-autentifikationsinformation\n" " uden først at vente på serverens udfordring.\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS-tilvalg (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2168,45 +2180,45 @@ " --secure-protocol=PR vælg sikker protokol: en af auto, SSLv2,\n" " SSLv3 og TLSv1.\n" -#: src/main.c:847 +#: src/main.c:848 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr " -L, --relative følg kun relative henvisninger.\n" -#: src/main.c:849 +#: src/main.c:850 #, 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:851 +#: src/main.c:852 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FIL klientcertifikatfil.\n" -#: src/main.c:853 +#: src/main.c:854 #, 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:855 +#: src/main.c:856 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FIL privat nøglefil.\n" -#: src/main.c:857 +#: src/main.c:858 #, 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:859 +#: src/main.c:860 #, 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:861 +#: src/main.c:862 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " @@ -2214,12 +2226,12 @@ msgstr "" " --ca-directory=KAT katalog hvor hashlisten af CA'er lagres.\n" -#: src/main.c:863 +#: src/main.c:864 #, 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:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2229,7 +2241,7 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2238,7 +2250,7 @@ " --random-file=FIL fil med tilfældige data til at seede \n" " SSL-talgeneratoren.\n" -#: src/main.c:875 +#: src/main.c:876 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " @@ -2247,7 +2259,7 @@ " --egd-file=FIL fil, der angiver navnet på EGD-soklen med\n" " tilfældige data\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2257,27 +2269,27 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 #, fuzzy msgid "HSTS options:\n" msgstr "HTTP-flag:\n" -#: src/main.c:888 +#: src/main.c:889 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-cache tillad ikke serverlagring af data.\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP-flag:\n" -#: src/main.c:898 +#: src/main.c:899 #, fuzzy msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " @@ -2286,28 +2298,28 @@ " --ftp-stmlf Brug Stream_LF-format til alle binære FTP-" "filer.\n" -#: src/main.c:901 +#: src/main.c:902 #, 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:903 +#: src/main.c:904 #, 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:905 +#: src/main.c:906 #, 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:907 +#: src/main.c:908 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob slå globning af FTP-filnavne fra.\n" -#: src/main.c:909 +#: src/main.c:910 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" @@ -2315,12 +2327,12 @@ " --no-passive-ftp deaktivér den \"passive\" " "overførselstilstand.\n" -#: src/main.c:911 +#: src/main.c:912 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " -S, --server-response udskriv svar fra server.\n" -#: src/main.c:913 +#: src/main.c:914 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2330,54 +2342,54 @@ "ved\n" " rekursion\n" -#: src/main.c:918 +#: src/main.c:919 #, fuzzy msgid "FTPS options:\n" msgstr "FTP-flag:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 #, fuzzy msgid "WARC options:\n" msgstr "FTP-flag:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --header=STRENG indsæt STRENG blandt topteksterne.\n" -#: src/main.c:937 +#: src/main.c:938 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" @@ -2385,28 +2397,28 @@ " -t, --tries=ANTAL sæt antal forsøg til ANTAL (0 for " "ubegrænset)\n" -#: src/main.c:939 +#: src/main.c:940 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider hent intet.\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-cookies brug ikke cookies.\n" -#: src/main.c:949 +#: src/main.c:950 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2415,23 +2427,23 @@ " --ignore-case ingen forskel på store/små bogstaver ved\n" " matching af filer/kataloger\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekursiv download:\n" -#: src/main.c:958 +#: src/main.c:959 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive angiv rekursiv download.\n" -#: src/main.c:960 +#: src/main.c:961 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2440,14 +2452,14 @@ " -l, --level=ANTAL maksimal rekursionsdybde (inf eller 0 for\n" " uendelig).\n" -#: src/main.c:962 +#: src/main.c:963 #, 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:964 +#: src/main.c:965 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2458,19 +2470,19 @@ "pege\n" " på lokale filer.\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2479,7 +2491,7 @@ " -K, --backup-converted før konvertering af fil X, så opret\n" " sikkerhedskopien X_orig.\n" -#: src/main.c:976 +#: src/main.c:977 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2488,7 +2500,7 @@ " -K, --backup-converted før konvertering af fil X, så opret\n" " sikkerhedskopien X.orig.\n" -#: src/main.c:979 +#: src/main.c:980 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2497,7 +2509,7 @@ " -m, --mirror forkortelse for -N -r -l inf --no-remove-" "listing.\n" -#: src/main.c:981 +#: src/main.c:982 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2507,7 +2519,7 @@ "en\n" " HTML-side.\n" -#: src/main.c:983 +#: src/main.c:984 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2516,11 +2528,11 @@ " --strict-comments brug strikt (SGML) håndtering af HTML-" "kommentarer.\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Rekursiv accept/afslag:\n" -#: src/main.c:989 +#: src/main.c:990 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2529,7 +2541,7 @@ " -A, --accept=LISTE kommaadskilt liste af accepterede " "endelser.\n" -#: src/main.c:991 +#: src/main.c:992 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2537,25 +2549,25 @@ msgstr "" " -R, --reject=LISTE kommaadskilt liste af afslåede endelser.\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" -#: src/main.c:1001 +#: src/main.c:1002 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" -#: src/main.c:1004 +#: src/main.c:1005 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2563,14 +2575,14 @@ " -D, --domains=LISTE kommaadskilt liste af accepterede " "domæner.\n" -#: src/main.c:1006 +#: src/main.c:1007 #, 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:1008 +#: src/main.c:1009 #, fuzzy msgid "" " --follow-ftp follow FTP links from HTML documents\n" @@ -2578,7 +2590,7 @@ " --follow-ftp følg FTP-henvisninger fra HTML-" "dokumenter.\n" -#: src/main.c:1010 +#: src/main.c:1011 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2587,7 +2599,7 @@ " --follow-tags=LISTE kommaadskilt liste af HTML-mærker, der\n" " følges.\n" -#: src/main.c:1012 +#: src/main.c:1013 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2596,23 +2608,23 @@ " --ignore-tags=LISTE kommaadskilt liste af HTML-mærker, der\n" " ignoreres.\n" -#: src/main.c:1014 +#: src/main.c:1015 #, 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:1016 +#: src/main.c:1017 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative følg kun relative henvisninger.\n" -#: src/main.c:1018 +#: src/main.c:1019 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTE liste af tillate kataloger.\n" -#: src/main.c:1020 +#: src/main.c:1021 #, fuzzy msgid "" " --trust-server-names use the name specified by the " @@ -2622,90 +2634,90 @@ " --trust-server-names brug navnet angivet ved den sidste komponent på " "redirektion url'en.\n" -#: src/main.c:1023 +#: src/main.c:1024 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTE liste af ekskluderede kataloger.\n" -#: src/main.c:1025 +#: src/main.c:1026 #, 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Rapportér fejl og send forslag til .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, en ikke-interaktiv informationsagent.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Adgangskode for brugeren %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Adgangskode: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Adgangskode for brugeren %s: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Regionsindstilling (locale): " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Kompilering: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Link: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2714,29 +2726,29 @@ "GNU Wget %s kompileret %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (miljø)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (bruger)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Ophavsret © 2009 Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2751,7 +2763,7 @@ # 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:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2759,67 +2771,67 @@ "\n" "Oprindeligt skrevet af Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "Rapportér venligst fejl og send spørgsmål til .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Prøv '%s --help' for flere flag.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ugyldigt flag -- '-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2831,7 +2843,7 @@ "med -p eller -r. Flere detaljer kan findes i manualen.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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 +2854,7 @@ "vil blive lagt i den enkelte fil, du angav.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2852,97 +2864,97 @@ "manualen.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL mangler.\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Denne version understøtter ikke IRI'er.\n" -#: src/main.c:1999 +#: src/main.c:2006 #, 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:2005 +#: src/main.c:2012 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2950,42 +2962,42 @@ msgstr "" "-k kan kun bruges sammen med -O hvis udskrivning er til en almindelig fil.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Kan ikke aflænke den symbolske lænke %s: %s\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: kan ikke evaluere værtsadresse %s\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Fandt ingen URLer i %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Kan ikke slette %s: %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2995,7 +3007,7 @@ "FÆRDIG --%s--\n" "Hentede %d filer, %s på %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Hente-kvote på %s OVERSKREDET!\n" @@ -3162,7 +3174,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Fortsætter i baggrunden, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Uddata vil blive skrevet til %s.\n" @@ -3207,67 +3219,67 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: 'stat' fejlede for %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "ADVARSEL: bruger en svag tilfældig seed.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: Ugyldig URL %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: 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:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Kan ikke lokalt verificere udstederens autoritet.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Der blev fundet et selvunderskrevet certifikat.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " De udstedte certifikat er endnu ikke gyldigt.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 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:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3278,7 +3290,7 @@ # 'common name' kan f.eks. være et personnavn. Eksempel findes på # http://tools.ietf.org/html/rfc5280 -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3286,7 +3298,7 @@ " %s: certifikatets trivialnavn %s svarer ikke til det forespurgte " "værtsnavn %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3297,7 +3309,7 @@ " 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:1042 +#: src/openssl.c:1046 #, 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" @@ -3347,22 +3359,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Henter robots.txt; ignorer eventuelle fejlmeldinger.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fejl ved fortolkning af proxy-URL %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d omdirigeringer overskredet.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3370,7 +3382,7 @@ "Giver op.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3444,121 +3456,130 @@ msgid "HTTPS support not compiled in" msgstr "Understøttelse af HTTPS er ikke kompileret med" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Ufuldstændig eller ugyldig flerbytesekvens fundet\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Fortsætter i baggrunden, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Kunne ikke få certifikatnøgle fra %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Kunne ikke få certifikatnøgle fra %s\n" +msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Fejl ved skrivning til %s: %s\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, fuzzy, c-format msgid "Error opening WARC file %s.\n" msgstr "Fejl ved fortolkning af certifikat: %s\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3569,33 +3590,33 @@ msgstr[0] "" msgstr[1] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 #, fuzzy msgid "Could not open CDX file for output.\n" msgstr "Fandt ikke proxy-server.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" @@ -3614,9 +3635,6 @@ #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: flaget '%s' kræver et argument\n" -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "Filen '%s' findes allerede, hentes ikke.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Autorisation mislykkedes\n" @@ -3630,6 +3648,9 @@ #~ "\n" #~ "%s modtaget.\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" #~ " downloaded file may contain inappropriate line endings.\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/de.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/de.gmo differ diff -Nru wget-1.19.5/po/de.po wget-1.20.1/po/de.po --- wget-1.19.5/po/de.po 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/po/de.po 2018-12-26 20:10:49.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the wget package. # Karl Eichwalder , 1998-1999, 2000. # Karl Eichwalder , 1997-1998. -# Jochen Hein , 2001-2017. +# Jochen Hein , 2001-2018. # msgid "" msgstr "" -"Project-Id-Version: wget 1.18.109\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-01-17 22:11+0100\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-28 21:10+0100\n" "Last-Translator: Jochen Hein \n" "Language-Team: German \n" "Language: de\n" @@ -101,29 +101,29 @@ msgstr "Unbekannter Fehler" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: Option »%s« ist mehrdeutig\n" +msgstr "%s: Option »%s%s« ist mehrdeutig\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: Option »%s« ist mehrdeutig: mögliche Optionen:" +msgstr "%s: Option »%s%s« ist mehrdeutig; mögliche Optionen:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: nicht erkannte Option »%c%s«\n" +msgstr "%s: nicht erkannte Option »%s%s«\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: Option »%c%s« erlaubt kein Argument\n" +msgstr "%s: Option »%s%s« erlaubt kein Argument\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: Option »%s« benötigt ein Argument\n" +msgstr "%s: Option »%s%s« benötigt ein Argument\n" #: lib/getopt.c:621 #, c-format @@ -236,17 +236,17 @@ msgid "Unmatched ) or \\)" msgstr "Schließende Klammer »)« oder »\\)« ohne passende öffnende Klammer" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Kein vorhergehender Regulärer Ausdruck" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "Pipe kann nicht erstellt werden" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -313,7 +313,7 @@ msgid "failed: %s.\n" msgstr "fehlgeschlagen: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: Host-Adresse %s kann nicht aufgelöst werden\n" @@ -442,13 +442,13 @@ msgstr "Länge: %s" # XXX -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) sind noch übrig" # XXX -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s übrig" @@ -630,7 +630,7 @@ "Die Datei oder das Verzeichnis %s existiert nicht.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "»%s« ist plötzlich entstanden.\n" @@ -653,17 +653,17 @@ msgid "Data transfer aborted.\n" msgstr "Daten-Ãœbertragung abgebrochen.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Die Datei %s ist schon vorhanden; kein erneuter Download.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(Versuch:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -673,7 +673,7 @@ "\n" # oder "gesichert"? -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -682,8 +682,8 @@ "%s (%s) - %s gespeichert [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "»%s« wird entfernt.\n" @@ -787,169 +787,185 @@ "Nicht zu %s hinabsteigen, da es ausgeschlossen bzw. nicht eingeschlossen " "ist.\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "%s zurückgewiesen.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "%s zurückgewiesen (Ungültiger Eintrag).\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" +"%s ist ausgeschlossen bzw. nicht eingeschlossen aufgrund eines Regulären " +"Ausdrucks.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Fehler beim Vergleichen von »%s« mit %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Keine Treffer bei dem Muster %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "HTML-artiger Index wurde nach %s [%s] geschrieben.\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "HTML-artiger Index wurde nach %s geschrieben.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" "ERROR: Verzeichnis »%s« kann nicht geöffnet werden.\n" "\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, 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:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "CA-Zertifikat »%s« wurde geladen\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "CRL-Datei »%s« wurde geladen\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Ihre GnuTLS-Version ist zu alt, um TLSv1.3 zu unterstützen\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: Option %d zu »secure-protocol« ist nicht implementiert\n" +msgstr "GnuTLS: Option %u zu »secure-protocol« ist nicht implementiert\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Bitte dieses Problem an melden\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: Priorität kann nicht direkt angegeben werden. Verwende die Standard-" +"Priorität als Ersatz.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "FEHLER" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "WARNUNG" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Kein Zertifikat angegeben von %s.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 +#: src/gnutls.c:932 #, 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" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" +msgstr "%s: Das Zertifikat von »%s« hat keinen bekannten Austeller.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, 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:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Das Zertifikat von %s ist abgelaufen.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Fehler beim Initialisieren des X509-Zertifikates: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Kein Zertifikat gefunden.\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Fehler beim Auswerten des Zertifikates: %s.\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Das ausgestellte Zertifikat ist noch nicht aktiviert.\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Das ausgestellte Zertifikat ist nicht mehr gültig.\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Es muss ein X.509-Zertifikat verwendet werden\n" @@ -989,11 +1005,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Fehler beim Schreiben der HTTP-Anforderung: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Keine Header, vermutlich ist es HTTP/0.9." -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -1002,11 +1018,11 @@ "Die Datei %s ist schon vorhanden; kein erneuter Download.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime hat nicht funktioniert. Das ist vermutlich ein Fehler.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -1014,55 +1030,55 @@ "Kann den Zeitstempel nicht in das http-Format umwandeln. Benutze stattdessen " "die Zeit 0 als Zeitpunkt der letzten Änderung.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY-Datendatei %s fehlt: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Wiederverwendung der bestehenden Verbindung zu [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Wiederverwendung der bestehenden Verbindung zu %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Fehler beim Lesen der Proxy-Antwort: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEHLER %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Statuszeile ist nicht korrekt" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Proxy-Tunneling fehlgeschlagen: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Unbekanntes Authentifizierungsschema.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Authentifizierung ausgewählt: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Wird in %s gespeichert.\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1071,25 +1087,25 @@ "Beim Herunterladen der Signatur:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "ungültiger pri Wert. Verwende %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1097,50 +1113,50 @@ "Kann keinen akzeptablen Digest für die Metalink Ressource finden.\n" "Diese werden ignoriert.\n" -#: src/http.c:3210 +#: src/http.c:3213 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:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-Anforderung gesendet, auf Antwort wird gewartet … " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Keine Daten empfangen.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Lesefehler (%s) beim Vorspann (header).\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(keine Beschreibung)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Platz: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "nicht spezifiziert" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [folgend]" -#: src/http.c:3880 +#: src/http.c:3883 #, 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:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1151,7 +1167,7 @@ "Sie möchten vielleicht die Option »--no-if-modified-since« verwenden.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1162,62 +1178,62 @@ "\n" # Header -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Länge: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "übergangen" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Warnung: Joker-Zeichen werden bei HTTP nicht unterstützt.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Schreiben nach %s nicht möglich (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Ein notwendiges Attribut im empfangenen Header fehlt.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Authentifizierung mit Benutzername/Passwort fehlgeschlagen.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "In die WARC-Datei kann nicht geschrieben werden.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "In die temporäre WARC-Datei kann nicht geschrieben werden.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Es ist nicht möglich, eine SSL-Verbindung herzustellen.\n" # XXX -#: src/http.c:4426 +#: src/http.c:4432 #, 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:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEHLER: Umleitung (%d) ohne Ziel.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1225,24 +1241,24 @@ "Keine Metalink-Daten in der HTTP-Antwort. Datei wird mittel HTTP GET " "heruntergeladen.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink Header gefunden. Metalink Modus wird verwendet.\n" -#: src/http.c:4507 +#: src/http.c:4514 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:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "»Last-modified«-Kopfzeile fehlt -- Zeitstempel abgeschaltet.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "»Last-modified«-Kopfzeile ungültig -- Zeitstempel übergangen.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1251,16 +1267,16 @@ "Datei auf dem Server nicht neuer als die lokale Datei %s -- kein Download.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Datei der Gegenseite ist neuer, erneuter Download.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1268,7 +1284,7 @@ msgstr "" "Datei auf dem Server existiert und enhält Verweise -- Download erfolgt.\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1276,7 +1292,7 @@ "Datei auf dem Server existiert, aber enhält keine Verweise -- kein " "Download.\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1286,7 +1302,7 @@ "aber Rekursion ist abgeschaltet -- kein Download.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1294,12 +1310,12 @@ "Datei auf dem Server existiert.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1308,7 +1324,7 @@ "%s (%s) - auf die Standardausgabe geschrieben %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1317,58 +1333,60 @@ "%s (%s) - %s gespeichert [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Verbindung bei Byte %s geschlossen. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lesefehler bei Byte %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lesefehler bei Byte %s/%s (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Qualität des Schutzes »%s« wird nicht unterstützt.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nicht unterstützter Algorithmus »%s«.\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, 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" +msgstr "" +"%s: WGETRC zeigt auf die Datei »%s«, auf die nicht zugegriffen werden kann: " +"%s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: »%s« nicht lesbar (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, 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:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1379,7 +1397,7 @@ "Bitte »%s« prüfen,\n" "oder eine andere Datei mittels »--config« angeben.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1390,48 +1408,48 @@ "Bitte »%s« prüfen,\n" "oder eine andere Datei mittels »--config« angeben.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Ungültiger »--execute«-Befehl %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ungültige Nummer %s\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s darf nur einmal verwendet werden\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ungültiger Byte-Wert %s.\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ungültige Zeitperiode %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1440,28 +1458,28 @@ "für use-askpass muss eine Zeichenkette angegeben werden oder entweder die " "Umgebungsvariable WGET_ASKPASS oder SSH_ASKPASS gesetzt sein.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ungültiger Wert %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ungültige Kopfzeile %s\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ungültige WARC Kopfzeile %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ungültiger Fortschrittstyp %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1476,16 +1494,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Die Kodierung %s ist nicht korrekt\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Unvollständige oder ungültige Multi-Byte-Sequenz\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Fehlernummer %d nicht behandelt\n" @@ -1520,12 +1538,12 @@ # usage → »Aufruf« ist einige der wenigen Regeln, die wir beim TP # überhaupt haben ;) -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Aufruf: %s [OPTION]... [URL] …\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1534,70 +1552,70 @@ "erforderlich.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Beim Start:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version Programmversion von Wget anzeigen und " "beenden\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help diese Hilfe anzeigen\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background nach dem Starten in den Hintergrund " "gehen\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=BEFEHL einen ».wgetrc«-artigen Befehl ausführen\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Log-Datei schreiben und Eingabe-Datei:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" " -o, --output-file=DATEI Protokoll-Meldungen in DATEI schreiben\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=DATEI Meldungen an DATEI anhängen\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug Debug-Ausgabe anzeigen\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug Watt-32 Debug-Ausgabe anzeigen\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet keine Ausgabe von Meldungen\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose ausführliche Meldungen (Vorgabe)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose weniger Meldungen, aber nicht stumm\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1605,7 +1623,7 @@ " --report-speed=TYP Bandbreite als TYP ausgeben.\n" " TYP kann »bits« sein.\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1613,7 +1631,7 @@ " -i, --input-file=DATEI in lokaler oder externer DATEI\n" " gelistete URLs holen\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1621,11 +1639,11 @@ " --input-metalink=DATEI in lokaler Metalink DATEI gelistete\n" " URLs holen\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html Eingabe-Datei als HTML behandeln\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1634,27 +1652,27 @@ "F)\n" " relativ zur URL auflösen\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=DATEI Datei mit der Konfiguration\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" " --no-config keine Konfigrationsdatei verwenden\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Download:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1663,29 +1681,29 @@ "setzen\n" " (0 steht für unbegrenzt)\n" -#: src/main.c:651 +#: src/main.c:652 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:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=LISTE komma-unterteilte Liste der zu\n" -" missachtenden HTML-Tags\n" +" --retry-on-http-error=FEHLER komma-unterteilte Liste von HTTP-" +"Fehlern\n" +" bei denen erneut versucht wird\n" -#: src/main.c:655 +#: src/main.c:656 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:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1693,15 +1711,14 @@ " -nc, --no-clobber Downloads überspringen, die bestehende\n" " Dateien überschreiben würden\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -" --no-config keine Konfigrationsdatei verwenden\n" +" --no-netrc Keine Credentials aus ».netrc« lesen\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1710,19 +1727,19 @@ "zum\n" " Teil geholten Datei\n" -#: src/main.c:664 +#: src/main.c:665 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:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=STYLE Fortschrittsanzeige mit STYLE darstellen\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1730,7 +1747,7 @@ " --show-progress Immer eine Fortschrittsanzeige " "darstellen\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1740,7 +1757,7 @@ "lokalen\n" " Dateien sind\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1750,7 +1767,7 @@ " GET-Requests im Zeitstempel-Modus\n" " nicht verwenden\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1760,21 +1777,21 @@ "auf\n" " dem Server.\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response Antwort des Servers anzeigen\n" # XXX -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr "" " --spider kein Download (nichts herunterladen)\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -T, --timeout=SEKUNDEN alle Timeouts auf SEKUNDEN setzen\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1782,7 +1799,7 @@ " --dns-servers=ADRESSEN Liste der zu befragenden DNS-Server " "(Komma-separiert)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1791,29 +1808,29 @@ " oder IP) des lokalen Rechners\n" " binden\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SEKUNDEN SEKUNDEN zwischen den Downloads warten\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1822,7 +1839,7 @@ "Versuchen\n" " warten\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1830,17 +1847,17 @@ " --random-wait Zwischen 0,5*WAIT und 1,5*WAIT Sekunden\n" " zwischen den Abfragen warten\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy Keinen Proxy verwenden\n" -#: src/main.c:705 +#: src/main.c:706 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:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1848,19 +1865,19 @@ " --bind-address=ADRESSE An die ADRESSE (Hostname oder IP) des\n" " lokalen Rechners binden\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=RATE Datenrate beim Download auf RATE " "begrenzen\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache Zwischenspeichern von DNS-Abfragen\n" " ausschalten\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1869,7 +1886,7 @@ " diejenigen einschränken, die das\n" " Betriebssystem erlaubt\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1877,15 +1894,15 @@ " --ignore-case Groß-/Kleinschreibung bei Datei- und\n" " Verzeichnisnamen ignorieren\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only Nur zu IPv4-Adressen verbinden\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only Nur zu IPv6-Adressen verbinden\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1895,24 +1912,24 @@ " Familie aufbauen, eins von »IPv6«,\n" " »IPv4« oder »none«\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password Nach Passworten fragen\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1930,30 +1947,30 @@ " WGET_ASKPASS oder SSH_ASKPASS " "verwendet.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri Unterstützung für IRI abschalten\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink Datei löschen vor dem Ãœberschreiben\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1961,7 +1978,7 @@ " --keep-badhash behalte Dateien mit Prüfsummenfehler (es " "wird ».badhash« angehängt)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1969,7 +1986,7 @@ " --metalink-index=NUMMER Metalink Applikation bzw. metalink4+xml " "metaurl Ordnungszahl NUMMER\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1977,51 +1994,52 @@ " --metalink-over-http verwende Metalink Metadaten aus dem\n" " HTTP Response Header\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location bevorzugter Ort für Metalink Ressourcen\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr keine Metadaten in erweiterten " "Dateiattributen speichern\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Verzeichnisse:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories keine Verzeichnisse anlegen\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr "" " -x, --force-directories Anlegen von Verzeichnissen erzwingen\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories keine Host-Verzeichnisse anlegen\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories Den Protokollnamen in Verzeichnissen\n" " verwenden\n" -#: src/main.c:771 +#: src/main.c:772 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:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -2030,26 +2048,26 @@ "Gegenseite\n" " überspringen\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP-Optionen:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=BENUTZER http-Benutzer auf BENUTZER setzen\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-passwd=PASSWORT http-Passwort auf PASSWORT setzen\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache Serverseitige Zwischenspeicherung der " "Daten\n" " verbieten\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2057,7 +2075,7 @@ " --default-page=NAME Den Namen der Standard-Seite ändern\n" " (normalerweise »index.html«)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2066,43 +2084,43 @@ "richtigen\n" " Namenserweiterung speichern\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length das »Content-Length«-Kopffeld ignorieren\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=ZEICHENKETTE ZEICHENKETTE in die Kopfzeilen einfügen\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=STYLE Fortschrittsanzeige mit STYLE darstellen\n" +" --compression=TYP Komprimierung: »auto«, »gzip« oder " +"»none«. (Standard: »none«)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximale Anzahl erlaubter »Redirects«\n" " (Umleitungen) pro Seite\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=BENUTZER BENUTZER als Proxy-Benutzername " "verwenden\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-passwd=PASS PASS als Proxy-Passwort verwenden\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2110,14 +2128,14 @@ " --referer=URL die Kopfzeile »Referer: URL« der HTTP-\n" " Anforderung hinzufügen\n" -#: src/main.c:806 +#: src/main.c:807 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:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2125,7 +2143,7 @@ " -U, --user-agent=AGENT als AGENT anstelle von Wget/VERSION\n" " identifizieren\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2134,24 +2152,24 @@ "Verbindungen)\n" " deaktivieren\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies Cookies nicht verwenden\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2159,7 +2177,7 @@ " --keep-session-cookies (nicht-permanente) Session-Cookies\n" " laden und speichern\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2167,7 +2185,7 @@ " --post-data=ZEICHENKETTE Die POST-Methode verwenden, dabei die\n" " ZEICHENKETTE als Daten senden\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2176,14 +2194,14 @@ "Inhalt\n" " aus DATEI verwenden\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod die Methode »HTTPMethod« im Header " "verwenden\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2191,7 +2209,7 @@ " --body-data=ZEICHENKETTE ZEICHENKETTE als Daten verwenden.\n" " »--method« muss angegeben werden\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2199,7 +2217,7 @@ " --body-file=DATEI Den Inhalt der Datei als Daten senden.\n" " »--method« muss angegeben werden.\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2210,7 +2228,7 @@ " Auswahl lokaler Dateinamen beachten\n" " (EXPERIMENTELL).\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2218,7 +2236,7 @@ " --content-on-error Den empfangenen Inhalt ausgeben, wenn\n" " der Server einen Fehler meldet.\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2231,69 +2249,68 @@ "Aufforderung des\n" " Serverszu warten\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) Optionen:\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" " --secure-protocol=PR Als sicheres Protokoll eines aus »auto«,\n" -" »SSLv2«, »SSLv3«, »TLSv1« oder »PFS«\n" -" verwenden.\n" +" »SSLv2«, »SSLv3«, »TLSv1«, »TLSv1_1«,\n" +" »TLSv1_2« oder »PFS« verwenden.\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only Nur sicheren HTTPS-Verweisen folgen\n" -#: src/main.c:849 +#: src/main.c:850 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:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=DATEI Datei mit dem Client-Zertifikat\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=DATEI Datei mit dem geheimen Schlüssel\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=DATEI Datei mit der CA-Sammlung\n" -#: src/main.c:861 +#: src/main.c:862 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:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=DATEI Datei mit der CRL-Sammlung\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2311,7 +2328,7 @@ " um den Kommunikationspartner zu\n" " verifizieren\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2321,7 +2338,7 @@ " des SSL Pseudo-Zufallszahlen-" "Generators\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2329,7 +2346,7 @@ " --egd-file=DATEI Dateiname des EGD-Sockets mit " "Zufallszahlen\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2338,16 +2355,23 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=STR Setze den Prioritäts-String (GnuTLS) oder den " +"Cipher-Listen-String (openSSL) direkt.\n" +" Bitte mit Vorsicht nutzen. Diese Option " +"überschreibt »--secure-protocol«.\n" +" Das Forman und die Syntax dieser " +"Zeichenkette ist von der verwendeten\n" +" SSL/TLS Bibliothek abhängig.\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "HSTS-Optionen:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts HSTS nicht verwenden\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2355,11 +2379,11 @@ " --hsts-file Pfad der HSTS Datenbank\n" " (überschreibt den Standardwert)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP-Optionen:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2367,40 +2391,40 @@ " --ftp-stmlf Stream_LF Format für alle binären\n" " FTP-Dateien verwenden\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=BENUTZER BENUTZER als ftp-Benutzername verwenden\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" " --ftp-password=PASSWORT PASSWORT als ftp-Passwort verwenden\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing ».listing«-Dateien nicht entfernen\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob FTP-Dateinamens-Globbing ausschalten\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp Nur »aktiven« Ãœbertragungsmodus " "verwenden\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions Die Rechte der fernen Datei erhalten\n" # Check --retr-symlinks -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2409,11 +2433,11 @@ "(keine\n" " Verzeichnisse)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTPS-Optionen:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2421,7 +2445,7 @@ " --ftps-implicit Verwende implizit FTPS\n" " (Standardport ist 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2431,7 +2455,7 @@ "TLS-Sitzung der\n" " Steuer-Verbindung fortsetzen\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2439,7 +2463,7 @@ " --ftps-clear-data-connection nur den Steuerkanal verschlüsseln; " "alle Daten bleiben im Klartext\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2447,11 +2471,11 @@ " --ftps-fallback-to-ftp verwende FTP falls FTPS vom " "Zielserver nicht unterstützt wird\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC-Optionen:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2459,25 +2483,25 @@ " --warc-file=DATEINAME Die Anfrage- und Antwortdaten in einer\n" " .warc.gz-Datei speichern\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx CDX-Index-Dateien schreiben\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2486,17 +2510,17 @@ "dieser\n" " CDX-Datei enthalten sind\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests keine SHA1-Prüfsummen berechnen\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2505,7 +2529,7 @@ "Datensatz\n" " speichern\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2515,15 +2539,15 @@ "durch\n" " den WARC-Schreiber erzeugt werden\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekursiver Download:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive rekursiver Download\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2531,7 +2555,7 @@ " -l, --level=Zahl maximale Rekursionstiefe (»inf« oder »0«\n" " steht für ohne Begrenzung)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2539,7 +2563,7 @@ " --delete-after geholte Dateien nach dem Download " "löschen\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2548,7 +2572,7 @@ " -k, --convert-links Verweise in HTML- oder CSS-Downloads\n" " in lokale Verknüpfungen umwandeln\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2556,7 +2580,7 @@ " --convert-file-only Konvertiere nur den Dateiname der URL " "(auch als »Basename« bekannt)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2564,7 +2588,7 @@ " --backup=N vor dem Speichern der Datei X, bis zu N\n" " Sicherungsdateien behalten.\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2572,7 +2596,7 @@ " -K, --backup-converted vor dem Umwandeln der Datei X, eine\n" " Sicherung als X_orig anlagen.\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2580,7 +2604,7 @@ " -K, --backup-converted vor dem Umwandeln der Datei X, eine\n" " Sicherung als X.orig anlegen.\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2589,7 +2613,7 @@ " »-N -r -l inf --no-remove-listing«\n" " entspricht.\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2598,7 +2622,7 @@ "Anzeige\n" " der HTML-Seite notwendig sind\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2606,11 +2630,11 @@ " --strict-comments Strikte Handhabung (SGML) von\n" " HTML-Kommentaren\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Rekursiv erlauben/zurückweisen:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2618,7 +2642,7 @@ " -A, --accept=LISTE komma-unterteilte Liste der erlaubten\n" " Dateiendungen\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2626,53 +2650,53 @@ " -R, --reject=LISTE komma-unterteilte Liste der\n" " zurückzuweisenden Erweiterungen\n" -#: src/main.c:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYPE Typ des regulären Ausdrucks (posix|" "pcre).\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TYPE Typ des regulären Ausdrucks (posix).\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 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:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2680,7 +2704,7 @@ " --follow-tags=LISTE komma-unterteilte Liste der zu folgenden\n" " HTML-Tags\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2688,23 +2712,23 @@ " --ignore-tags=LISTE komma-unterteilte Liste der zu\n" " missachtenden HTML-Tags\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative nur relativen Verweisen folgen\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" " -I, --include-directories=LISTE Liste der erlaubten Verzeichnisse\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2715,99 +2739,100 @@ "Namen\n" " verwenden.\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=LISTE Liste der auszuschließenden " "Verzeichnisse\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" msgstr "" -"Fehlerberichte und Verbesserungsvorschläge bitte an \n" +"Fehlerberichte, Fragen und Diskussionen bitte an \n" "schicken.\n" "\n" "Für die deutsche Ãœbersetzung ist die Mailingliste\n" " zuständig.\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"Fehlerberichte unter https://savannah.gnu.org/bugs/?func=additem&group=wget " +"melden.\n" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Passwort für Benutzer %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Passwort: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Pipe kann nicht erstellt werden\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Benutzername für »%s%s«: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Passwort für Benutzer »%s%s@%s«: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Lokale: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Ãœbersetzt: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Gebunden: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2816,29 +2841,29 @@ "GNU Wget %s übersetzt unter %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (Umgebung)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (Benutzer)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2852,7 +2877,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2860,7 +2885,7 @@ "\n" "Ursprünglich geschrieben von Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "" "Fehlerberichte und Verbesserungsvorschläge bitte an \n" @@ -2868,33 +2893,33 @@ "\n" "Für die deutsche Ãœbersetzung ist die Mailingliste zuständig.\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Problem bei der Speicheranforderung\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Aufgrund eines Fehlers in %s wird beendet\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "»%s --help« gibt weitere Informationen.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ungültige Option -- »-n%c«\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2903,7 +2928,7 @@ "Sowohl »--no-clobber« als auch »--convert-links« angegeben, nur\n" "»--convert-links« wird verwendet.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2912,25 +2937,25 @@ "Sowohl »--no-clobber« als auch »--convert-file-only« angegeben, nur\n" "»--convert-file-only« wird verwendet.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2942,7 +2967,7 @@ "angegeben sind. Weitere Informationen finden Sie im Handbuch.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2952,7 +2977,7 @@ "bedeutet, dass jeglicher Download in genau der angegebenen Datei\n" "gespeichert wird.\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2962,7 +2987,7 @@ "»-O«. Genauere Erläuterungen finden Sie im Handbuch.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2970,7 +2995,7 @@ "WARC-Ausgabe funktioniert nicht mit »--no-clobber«, »--no-clobber« wird " "deaktiviert.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2978,12 +3003,12 @@ "WARC-Ausgabe funktioniert nicht mit Zeitstempeln, Zeitstempel werden " "deaktiviert.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC-Ausgabe funktioniert nicht mit »--spider«.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2992,7 +3017,7 @@ "WARC-Ausgabe funktioniert nicht mit »--continue« oder »--start-pos«,\n" "die Option wird deaktiviert.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -3000,23 +3025,23 @@ "WARC-Digests sind deaktiviert; WARC-Deduplication wird keine doppelten\n" "Datensätze finden.\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"WARC-Ausgabe funktioniert nicht mit »--continue« oder »--start-pos«,\n" +"Komprimierung funktioniert nicht mit »--continue« oder »--start-pos«,\n" "die Option wird deaktiviert.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3025,19 +3050,19 @@ "Sowohl »--start-pos« als auch »--continue« anzugeben ist nicht empfohlen;\n" "»--continue« wird nicht verwendet.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL fehlt\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3047,7 +3072,7 @@ "»--method« verwendet werden. Bei der Option »--method« werden die Daten\n" "mit den Optionen »--body-data« oder »--body-file« angegeben.\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3056,18 +3081,18 @@ "Für »--body-data« oder »--body-file« muss eine Methode mittels\n" "»--method=HTTPMethod« angegeben werden.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Diese Version unterstützt keine IRIs.\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -3076,7 +3101,7 @@ "eine\n" "normale Datei ist.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3085,43 +3110,43 @@ "»--covert-links« oder »--convert-files-only« kann nur zusammen\n" "verwendet werden, wenn die Ausgabe eine normale Datei ist.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Fehler beim Initialisieren der Bibliothek »libares«\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Initialisieren der »c-ares« Kommunikation\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Fehler beim Parsen der IP-Adresse »%s«\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Keine URLs in %s gefunden.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Kann die Metalink Datei %s nicht parsen.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3132,7 +3157,7 @@ "Verstrichene Zeit: %s\n" "Geholt: %d Dateien, %s in %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Download-Kontingent von %s ERSCHÖPFT!\n" @@ -3302,7 +3327,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Im Hintergrund geht es weiter, die Prozessnummer ist %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Ausgabe wird nach %s geschrieben.\n" @@ -3352,74 +3377,72 @@ msgstr "%s: Aufruf von »stat« für %s nicht möglich: %s\n" # XXX -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" "WARNUNG: Der Zufallszahlengenerator wird mit einem schwachen Wert " "initialisiert.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "Ihre OpenSSL-Version ist zu alt, um TLSv1.1 zu unterstützen\n" +msgstr "Ihre OpenSSL-Version ist zu alt, um TLSv1.3 zu unterstützen\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: Ungültige URL »%s«: %s\n" +msgstr "OpenSSL: Ungültige Cipher-Liste: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "" -"Der Zufallszahlengenerator konnte nicht initialisiert werden,\n" -"denken Sie über --random-file nach.\n" +"WARNUNG: Der Zufallszahlengenerator konnte nicht initialisiert werden,\n" +"denken Sie über »--random-file« nach.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 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:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Ein selbst-signiertes Zertifikat wurde gefunden.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Das ausgestellte Zertifikat ist noch nicht gültig.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Das ausgestellte Zertifikat ist nicht mehr gültig.\n" # XXX -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3428,7 +3451,7 @@ "%s: Keiner der alternativen Namen des Zertifikats stimmt mit dem angefragten " "Maschinennamen %s überein.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3436,7 +3459,7 @@ " %s: Der Common Name %s des Zertifikates entspricht nicht dem " "angeforderten Hostnamen %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3449,7 +3472,7 @@ " nicht derjenige ist, der er zu sein vorgibt\n" " (also nicht der echte %s).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3501,22 +3524,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "»robots.txt« wird geladen; bitte Fehler ignorieren.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fehler beim Auswerten der Proxy-URL »%s«: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d: Die Anzahl der Verweise ist zu groß.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3524,7 +3547,7 @@ "Aufgegeben.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3597,98 +3620,110 @@ msgid "HTTPS support not compiled in" msgstr "Keine HTTPS-Unterstützung einkompiliert" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "Unvollständige oder ungültige Multi-Byte-Sequenz\n" +msgstr "Nicht konvertierbare Multi-Byte-Sequenz gefunden\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Im Hintergrund geht es weiter, die Prozessnummer ist %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Entfernen des symbolischen Verweises %s fehlgeschlagen: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Fehler beim Initialisieren der Bibliothek »libares«\n" +msgstr "Fehler beim »fopen()« der Datei »%s«\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Fehler beim Setzen der Rechte für »%s«.\n" +msgstr "Fehler den Dateideskriptor für die Datei »%s« zu bekommen.\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Fehler beim Setzen der Rechte für »%s«.\n" +msgstr "Fehler beim »stat()« der Datei »%s« (Dateirechte prüfen).\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Datei »%s« wurde seit dem letzten Check geändert. Sicherheitsprüfung " +"fehlgeschlagen." -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Fehler beim Parsen der IP-Adresse »%s«\n" +msgstr "Fehler beim Öffnen der Datei »%s«, Ursache: %s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Fehler beim Setzen der Rechte für »%s«.\n" +msgstr "Fehler beim »stat()« der Datei »%s«. Fehler: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"Versuche Datei »%s« zu öffnen, aber die Datei wurde seit der letzten Prüfung " +"geändert. Sicherheitsprüfung fehlgeschlagen." -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Ungültiger Regulärer Ausdruck %s, PCRE2-Fehler %d\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Ungültiger Regulärer Ausdruck %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Fehler beim Matchen %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "Ãœberspringe Schlüssen mit der falschen Länge (%d/%d): %s\n" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Fehler beim Duplizieren des Deskriptors zur WARC-Datei.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Fehler beim Öffnen des GZIP-Datenstroms zur WARC-Datei.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Warcinfo-Satz kann nicht in die WARC-Datei geschrieben werden.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3697,24 +3732,24 @@ "WARC-Datei %s wird geöffnet.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Fehler beim Öffnen der WARC-Datei %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Die CDX-Datei enthält keine Original-URLs (Spalte »a« fehlt).\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Die CDX-Datei enthält keine Prüfsummen (Spalte »k« fehlt).\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "Die CDX-Datei enthält keine Datensatz-IDs (Spalte »u« fehlt).\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3729,51 +3764,33 @@ "%d Sätze vom CDX geladen.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Die CDX-Datei %s zur Deduplikation kann nicht gelesen werden.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Die temporäre WARC-Manifest-Datei kann nicht geöffnet werden.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Die temporäre WARC-Protokoll-Datei kann nicht geöffnet werden.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Die WARC-Datei kann nicht geöffnet werden.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Die CDX-Datei kann nicht zur Ausgabe geöffnet werden.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Die temporäre WARC-Datei kann nicht geöffnet werden.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" 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" diff -Nru wget-1.19.5/po/el.po wget-1.20.1/po/el.po --- wget-1.19.5/po/el.po 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/po/el.po 2018-12-26 20:10:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: wget 1.9.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2004-12-15 19:46+0000\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" @@ -233,17 +233,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -307,7 +307,7 @@ msgid "failed: %s.\n" msgstr "απέτυχε: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" @@ -432,12 +432,12 @@ msgid "Length: %s" msgstr "Μήκος: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr "" @@ -604,7 +604,7 @@ "Δεν υπάÏχει αÏχείο ή κατάλογος `%s'.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "" @@ -627,24 +627,24 @@ msgid "Data transfer aborted.\n" msgstr "Η μεταφοÏά δεδομένων διακόπηκε ανώμαλα.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "Το αÏχείο `%s' υπάÏχει ήδη, δεν επανακτάται.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(Ï€Ïοσπάθεια:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -653,8 +653,8 @@ "%s (%s) - `%s' αποθηκεÏτηκε [%ld]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "ΔιαγÏαφή του %s.\n" @@ -753,160 +753,174 @@ msgstr "" "Δεν επεκτεινόμαστε στο `%s' διότι είναι εξαιÏοÏμενο/μη-συμπεÏιλαμβανόμενο\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "ΑπόÏÏιψη του `%s'.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "ΑπόÏÏιψη του `%s'.\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" + +#: src/ftp.c:2645 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "Σφάλμα στην εγγÏαφή στο `%s': %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "Δεν βÏέθηκαν ταιÏιάσματα στη μοÏφή `%s'.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "ΓÏάφτηκε αÏχείο καταλόγου σε HTML στο `%s' [%ld].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "ΓÏάφτηκε αÏχείο καταλόγου σε HTML στο `%s'.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Αποτυχία φόÏτωσης πιστοποιητικών από %s\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Στείλτε αναφοÏές σφαλμάτων και Ï€Ïοτάσεις στο .\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Σφάλμα στην ανάλυση του URL του διαμεσολαβητή %s: %s.\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -948,145 +962,145 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Σφάλμα στην εγγÏαφή της αίτησης HTTP: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1620 +#: src/http.c:1623 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "Το αÏχείο `%s' υπάÏχει ήδη, δεν επανακτάται.\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2087 +#: src/http.c:2090 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "ΧÏήση ξανά της σÏνδεσης στο %s:%hu.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "ΧÏήση ξανά της σÏνδεσης στο %s:%hu.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr "Σφάλμα στην εγγÏαφή της αίτησης HTTP: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ΣΦΑΛΜΑ %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Εσφαλμένη γÏαμμή κατάστασης" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Άγνωστο σχήμα αυθεντικοποίησης.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Άγνωστο σχήμα αυθεντικοποίησης.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "Η αίτηση για %s στάλθηκε, αναμονή απάντησης... " -#: src/http.c:3392 +#: src/http.c:3395 #, fuzzy msgid "No data received.\n" msgstr "Δεν ελήφθησαν δεδομένα" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Σφάλμα ανάγνωσης (%s) στις κεφαλίδες.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(χωÏίς πεÏιγÏαφή)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Τοποθεσία: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "μη οÏισμένο" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [ακολουθεί]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1094,7 +1108,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1103,84 +1117,84 @@ "\n" " Το αÏχείο έχει ήδη ανακτηθεί πλήÏως· τίποτα να κάνω.\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Μήκος: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "αγνοείται" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "" "ΠÏοειδοποίηση: μεταχαÏακτήÏες (wildcards) δεν υποστηÏίζονται στο HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4387 +#: src/http.c:4380 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Αδυναμία στην εγγÏαφή στο `%s' (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Αδυναμία στην εγγÏαφή στο `%s' (%s).\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "ΑδÏνατη η σÏσταση σÏνδεσης SSL.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Αδυναμία στην εγγÏαφή στο `%s' (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ΣΦΑΛΜΑ: Μετάσταση (%d) χωÏίς τοποθεσία.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Κεφαλίδα Last-modified δεν υπάÏχει -- χÏονικές αναφοÏές απενεÏγοποιήθηκαν.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Κεφαλίδα Last-modified δεν είναι έγκυÏη -- χÏονικές αναφοÏές αγνοοÏνται.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1190,16 +1204,16 @@ "γίνεται ανάκτηση.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Τα μεγέθη δεν είναι ίσα (τοπικό %ld) -- γίνεται ανάκτηση ξανά.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "ΑπομακÏυσμένο αÏχείο είναι νεότεÏο, έναÏξη ανάκτησης.\n" -#: src/http.c:4607 +#: src/http.c:4615 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1210,7 +1224,7 @@ "ανάκτηση.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" @@ -1220,33 +1234,33 @@ "ανάκτηση.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4628 +#: src/http.c:4636 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "ΑπομακÏυσμένο αÏχείο είναι νεότεÏο, έναÏξη ανάκτησης.\n" -#: src/http.c:4637 +#: src/http.c:4645 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ΣΦΑΛΜΑ %d: %s.\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4688 +#: src/http.c:4696 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1255,58 +1269,58 @@ "%s (%s) - `%s' αποθηκεÏτηκε [%ld/%ld]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Η σÏνδεση διακόπηκε στο byte %ld. " -#: src/http.c:4772 +#: src/http.c:4780 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Σφάλμα ανάγνωσης στο byte %ld (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Σφάλμα ανάγνωσης στο byte %ld/%ld (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" -#: src/init.c:585 +#: src/init.c:579 #, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Αδυναμία ανάγνωσης %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Σφάλμα στο %s στη γÏαμμή %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, fuzzy, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Σφάλμα στο %s στη γÏαμμή %d.\n" -#: src/init.c:713 +#: src/init.c:706 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: ΣΦΑΛΜΑ: Άγνωστη εντολή `%s', τιμή `%s'.\n" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1314,7 +1328,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1322,77 +1336,77 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: ΠÏοειδοποίηση: Το wgetrc του συστήματος και του χÏήστη δείχνουν στο ίδιο " "αÏχείο `%s'.\n" -#: src/init.c:983 +#: src/init.c:977 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1043 +#: src/init.c:1037 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: ΠαÏακαλώ οÏίστε on ή off.\n" -#: src/init.c:1076 +#: src/init.c:1070 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: ΠαÏακαλώ οÏίστε on ή off.\n" -#: src/init.c:1096 +#: src/init.c:1090 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Μη έγκυÏος Ï„Ïπος Ï€Ïοόδου `%s'.\n" -#: src/init.c:1379 +#: src/init.c:1373 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Μη έγκυÏος Ï„Ïπος Ï€Ïοόδου `%s'.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1404,16 +1418,16 @@ msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "" @@ -1446,12 +1460,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; απενεÏγοποίηση λήψης καταγÏαφών.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "ΧÏήση: %s [ΕΠΙΛΟΓΗ]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1462,297 +1476,297 @@ "τα σÏντομα οÏίσματα.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:653 +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:660 +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 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:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1763,212 +1777,212 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:761 +#: src/main.c:762 #, fuzzy msgid "Directories:\n" msgstr "Κατάλογος " -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:795 +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1976,13 +1990,13 @@ "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1990,58 +2004,58 @@ " challenge\n" msgstr "" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:844 +#: src/main.c:845 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:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2051,19 +2065,19 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2073,402 +2087,402 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Στείλτε αναφοÏές σφαλμάτων και Ï€Ïοτάσεις στο .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, ένα μη-διαλογικό δικτυακό Ï€ÏόγÏαμμα ανάκτησης αÏχείων.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "" -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "" -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "" -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, 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:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2478,7 +2492,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 #, fuzzy msgid "" "\n" @@ -2487,69 +2501,69 @@ "\n" "ΓÏάφτηκε αÏχικά από τον Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Στείλτε αναφοÏές σφαλμάτων και Ï€Ïοτάσεις στο .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Δοκιμάστε `%s --help' για πεÏισσότεÏες επιλογές Ïυθμίσεων.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: μη αποδεκτή επιλογή -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, fuzzy, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "%s: η υποστήÏιξη εκσφαλμάτωσης δεν έχει συμπεÏιληφθεί στη μεταγλώττιση.\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Δεν μποÏÏŽ να είμαι επεξηγηματικός και ταυτόχÏονα σιωπηλός.\n" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Δεν μποÏÏŽ να χÏησιμοποιώ χÏονικές αναφοÏές και ταυτόχÏονα να μην υποκαθιστώ " "τα αÏχεία βάση των αναφοÏών.\n" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2557,152 +2571,152 @@ "\n" msgstr "" -#: src/main.c:1666 +#: src/main.c:1667 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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: παÏαλείφθηκε το URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Δεν βÏέθηκαν URL στο %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Αποτυχία διαγÏαφής του `%s': %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "Αποτυχία φόÏτωσης πιστοποιητικών από %s\n" -#: src/main.c:2257 +#: src/main.c:2264 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2713,7 +2727,7 @@ "ΤΕΡΜΑΤΙΣΜΟΣ --%s--\n" "ΜεταφοÏτώθηκαν: %s byte σε %d αÏχεία\n" -#: src/main.c:2271 +#: src/main.c:2278 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "" @@ -2883,7 +2897,7 @@ "Συνέχιση στο παÏασκήνιο, ταυτότητα διεÏγασίας (pid) %d.\n" "\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Η έξοδος θα γÏαφτεί στο `%s'.\n" @@ -2930,77 +2944,76 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: αδυναμία Ï€Ïόσβασης στο %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:190 +#: src/openssl.c:192 #, fuzzy msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "ΑδÏνατη η αÏχικοποίηση της PRNG της OpenSSL· απενεÏγοποίηση του SSL.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" +msgstr "" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "ΑδÏνατη η αÏχικοποίηση της PRNG της OpenSSL· απενεÏγοποίηση του SSL.\n" +msgstr "" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3008,7 +3021,7 @@ " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3058,22 +3071,22 @@ msgstr "" "Ανάγνωση του robots.txt; παÏακαλώ αγνοείστε τυχόν μηνÏματα σφαλμάτων.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Σφάλμα στην ανάλυση του URL του διαμεσολαβητή %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Σφάλμα στο URL διαμεσολαβητή %s: ΠÏέπει να είναι HTTP.\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "ΥπέÏβαση %d επανακατευθÏνσεων.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3081,7 +3094,7 @@ "Εγκαταλείπω.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3152,122 +3165,131 @@ msgstr "" "%s: η υποστήÏιξη εκσφαλμάτωσης δεν έχει συμπεÏιληφθεί στη μεταγλώττιση.\n" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "" "Συνέχιση στο παÏασκήνιο, ταυτότητα διεÏγασίας (pid) %d.\n" "\n" -#: src/utils.c:554 +#: src/utils.c:557 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Αποτυχία διαγÏαφής ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï ÏƒÏ…Î½Î´Î­ÏƒÎ¼Î¿Ï… `%s': %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" +msgstr "Αποτυχία φόÏτωσης πιστοποιητικών από %s\n" -#: src/utils.c:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" +msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" +msgstr "Αποτυχία φόÏτωσης πιστοποιητικών από %s\n" -#: src/utils.c:923 +#: src/utils.c:929 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" +msgstr "Αποτυχία φόÏτωσης πιστοποιητικών από %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Σφάλμα στην εγγÏαφή στο `%s': %s\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, fuzzy, c-format msgid "Error opening WARC file %s.\n" msgstr "Σφάλμα στην ανάλυση του URL του διαμεσολαβητή %s: %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3278,60 +3300,36 @@ msgstr[0] "" msgstr[1] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 #, fuzzy msgid "Could not open CDX file for output.\n" msgstr "Αδυναμία εÏÏεσης διαμεσολαβητή.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: η επιλογή `--%s' δεν επιδέχεται ÏŒÏισμα\n" - -#, fuzzy -#~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s: μη αναγνωÏίσημη επιλογή `--%s'\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" - -#, fuzzy -#~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: η επιλογή `%s' απαιτεί ÏŒÏισμα\n" - -#, fuzzy -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "Το αÏχείο `%s' υπάÏχει ήδη, δεν επανακτάται.\n" - #~ msgid "Error in Set-Cookie, field `%s'" #~ msgstr "Σφάλμα στο Set-Cookie, πεδίο `%s'" @@ -3345,9 +3343,23 @@ #~ 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 -Nru wget-1.19.5/po/en_GB.po wget-1.20.1/po/en_GB.po --- wget-1.19.5/po/en_GB.po 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/po/en_GB.po 2018-12-26 20:10:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: wget 1.9.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2004-05-27 21:46-0400\n" "Last-Translator: Gareth Owen \n" "Language-Team: English (British) \n" @@ -235,17 +235,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -309,7 +309,7 @@ msgid "failed: %s.\n" msgstr "failed: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" @@ -432,12 +432,12 @@ msgid "Length: %s" msgstr "Length: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr "" @@ -606,7 +606,7 @@ "No such file or directory `%s'.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "" @@ -629,24 +629,24 @@ msgid "Data transfer aborted.\n" msgstr "Data transfer aborted.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "File `%s' already there, not retrieving.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(try:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -655,8 +655,8 @@ "%s (%s) - `%s' saved [%ld]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Removing %s.\n" @@ -752,160 +752,174 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "Rejecting `%s'.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Rejecting `%s'.\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" + +#: src/ftp.c:2645 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "Error writing to `%s': %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "No matches on pattern `%s'.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Wrote HTML-ised index to `%s' [%ld].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Wrote HTML-ised index to `%s'.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Failed to load certificates from %s\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Mail bug reports and suggestions to .\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Error parsing proxy URL %s: %s.\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -946,145 +960,145 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Failed writing HTTP request: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1620 +#: src/http.c:1623 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "File `%s' already there, not retrieving.\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2087 +#: src/http.c:2090 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Reusing connection to %s:%hu.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Reusing connection to %s:%hu.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr "Failed writing HTTP request: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Malformed status line" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Unknown authentication scheme.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Unknown authentication scheme.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s request sent, awaiting response... " -#: src/http.c:3392 +#: src/http.c:3395 #, fuzzy msgid "No data received.\n" msgstr "No data received" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Read error (%s) in headers.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(no description)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Location: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "unspecified" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [following]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1092,7 +1106,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1102,81 +1116,81 @@ " The file is already fully retrieved; nothing to do.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Length: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignored" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Warning: wildcards not supported in HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4387 +#: src/http.c:4380 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Cannot write to `%s' (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Cannot write to `%s' (%s).\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Unable to establish SSL connection.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Cannot write to `%s' (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redirection (%d) without location.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified header missing -- time-stamps turned off.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified header invalid -- time-stamp ignored.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1185,16 +1199,16 @@ "Server file no newer than local file `%s' -- not retrieving.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Remote file is newer, retrieving.\n" -#: src/http.c:4607 +#: src/http.c:4615 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1204,40 +1218,40 @@ "Remote file is newer than local file `%s' -- retrieving.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 #, 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:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4628 +#: src/http.c:4636 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "Remote file is newer, retrieving.\n" -#: src/http.c:4637 +#: src/http.c:4645 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4688 +#: src/http.c:4696 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1246,58 +1260,58 @@ "%s (%s) - `%s' saved [%ld/%ld]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Connection closed at byte %ld. " -#: src/http.c:4772 +#: src/http.c:4780 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Read error at byte %ld (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Unsupported scheme" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Cannot read %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Error in %s at line %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1305,7 +1319,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1313,75 +1327,75 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Invalid --execute command `%s'\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Invalid number `%s'.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Invalid byte value `%s'\n" -#: src/init.c:1379 +#: src/init.c:1373 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Invalid time period `%s'\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Invalid value `%s'.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Invalid header `%s'.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Invalid header `%s'.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Invalid progress type `%s'.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1393,16 +1407,16 @@ msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "" @@ -1435,12 +1449,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; disabling logging.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Usage: %s [OPTION]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1450,297 +1464,297 @@ "Mandatory arguments to long options are mandatory for short options too.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:653 +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:660 +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 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:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1751,212 +1765,212 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:761 +#: src/main.c:762 #, fuzzy msgid "Directories:\n" msgstr "Directory " -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:795 +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1964,13 +1978,13 @@ "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1978,58 +1992,58 @@ " challenge\n" msgstr "" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:844 +#: src/main.c:845 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:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2039,19 +2053,19 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2061,400 +2075,400 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Mail bug reports and suggestions to .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "" -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "" -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "" -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2003 Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2464,7 +2478,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2472,66 +2486,66 @@ "\n" "Originally written by Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Mail bug reports and suggestions to .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Try `%s --help' for more options.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: illegal option -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, fuzzy, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "%s: debug support not compiled in.\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2539,152 +2553,152 @@ "\n" msgstr "" -#: src/main.c:1666 +#: src/main.c:1667 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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: missing URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "No URLs found in %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Unable to delete `%s': %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2695,7 +2709,7 @@ "FINISHED --%s--\n" "Downloaded: %s bytes in %d files\n" -#: src/main.c:2271 +#: src/main.c:2278 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Download quota (%s bytes) EXCEEDED!\n" @@ -2861,7 +2875,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Continuing in background, pid %d.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Output will be written to `%s'.\n" @@ -2906,77 +2920,76 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: cannot stat %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:190 +#: src/openssl.c:192 #, fuzzy msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Could not seed OpenSSL PRNG; disabling SSL.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: %s: Invalid value `%s'.\n" +msgstr "" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "Could not seed OpenSSL PRNG; disabling SSL.\n" +msgstr "" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2984,7 +2997,7 @@ " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3033,22 +3046,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Loading robots.txt; please ignore errors.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Error parsing proxy URL %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirections exceeded.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3056,7 +3069,7 @@ "Giving up.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3124,120 +3137,129 @@ msgid "HTTPS support not compiled in" msgstr "%s: debug support not compiled in.\n" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Continuing in background, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Failed to unlink symlink `%s': %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Failed to get certificate key from %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Failed to get certificate key from %s\n" +msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Error writing to `%s': %s\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, fuzzy, c-format msgid "Error opening WARC file %s.\n" msgstr "Error parsing proxy URL %s: %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3248,59 +3270,35 @@ msgstr[0] "" msgstr[1] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: option `--%s' doesn't allow an argument\n" - -#, fuzzy -#~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s: unrecognised option `--%s'\n" - -#, fuzzy -#~ msgid "%s: option '-W %s' is ambiguous\n" -#~ msgstr "%s: option `-W %s' is ambiguous\n" - -#, fuzzy -#~ msgid "%s: option '-W %s' doesn't allow an argument\n" -#~ msgstr "%s: option `-W %s' doesn't allow an argument\n" - -#, fuzzy -#~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: option `%s' requires an argument\n" - -#, fuzzy -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "File `%s' already there, not retrieving.\n" - #~ 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" @@ -3317,9 +3315,21 @@ #~ 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" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/eo.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/eo.gmo differ diff -Nru wget-1.19.5/po/eo.po wget-1.20.1/po/eo.po --- wget-1.19.5/po/eo.po 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/po/eo.po 2018-12-26 20:10:49.000000000 +0000 @@ -1,15 +1,15 @@ # Translation of wget messages to Esperanto. -# Copyright (C) 2015, 2016 Free Software Foundation, Inc. +# Copyright (C) 2015, 2016, 2018 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Luiz Portella , 2005. -# Felipe Castro , 2013, 2015, 2016. +# Felipe Castro , 2013, 2015, 2016, 2018. # msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.18\n" +"Project-Id-Version: GNU wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2016-11-13 21:42-0300\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-05-10 21:24-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" @@ -22,7 +22,7 @@ #: lib/error.c:195 msgid "Unknown system error" -msgstr "Nekonata sistem-eraro" +msgstr "Nekonata sistemeraro" #: lib/gai_strerror.c:57 msgid "Address family for hostname not supported" @@ -193,9 +193,8 @@ msgstr "Malvalida retroreferenco" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Senpara [ aÅ­ [^" +msgstr "Senpara [, [^, [:, [., aÅ­ [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -233,17 +232,17 @@ msgid "Unmatched ) or \\)" msgstr "Senpara ) aÅ­ \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Mankas antaÅ­a regulesprimo" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "ne eblas krei dukton" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -296,7 +295,7 @@ #: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" -msgstr "" +msgstr "setsockopt SO_RCVBUF fiaskis: %s\n" #: src/connect.c:356 msgid "connected.\n" @@ -307,7 +306,7 @@ msgid "failed: %s.\n" msgstr "malsukceso: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: ne eblas trovi gastigantan adreson %s\n" @@ -315,12 +314,12 @@ #: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" -msgstr "" +msgstr "setsockopt SO_REUSEADDR fiaskis: %s\n" #: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" -msgstr "" +msgstr "Tro multaj fds malfermitaj. Ne eblas uzi elekton e nfd >= %d\n" #: src/convert.c:198 #, c-format @@ -430,12 +429,12 @@ msgid "Length: %s" msgstr "Grando: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) restanta" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s restanta" @@ -604,7 +603,7 @@ "Neniu tia dosiero aÅ­ dosierujo %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s ekfloris naskiÄe.\n" @@ -627,17 +626,17 @@ msgid "Data transfer aborted.\n" msgstr "Transporto de datumoj estas ĉesigita.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, 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:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(provo:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -646,7 +645,7 @@ "%s (%s) - skribita al ĉefeligo %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -655,8 +654,8 @@ "%s (%s) - %s konservita [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Ni forviÅas %s.\n" @@ -733,9 +732,9 @@ msgstr "%s: nekonata/nesubtenata dosier-tipo.\n" #: src/ftp.c:2404 -#, fuzzy, c-format +#, c-format msgid "Failed to set permissions for %s.\n" -msgstr "Ne eblas preni kuketon por %s\n" +msgstr "Malsukcesis difini permesojn por %s.\n" #: src/ftp.c:2425 #, c-format @@ -754,159 +753,174 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Ni rifuzas %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Ni rifuzas %s.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "Ni ne iras suben al %s ĉar Äi estas forigita/ne-inkluzivita.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Eraro dum kongruo de %s kontraŭ %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Neniu kongruo ĉe la Åablono %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Ni skribis HTML-igitan indekson al %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Ni skribis HTML-igitan indekson al %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERARO: ne eblas malfermi la dosierujon %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERARO: ni fiaskis malfermi atestilon %s: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Ni Åargis la CA-atestilon '%s'\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Ni Åargis la CRL-dosieron '%s'\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Via versio de OpenSSL tro malnovas por subteni TLSv1.1\n" + +#: src/gnutls.c:676 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: nerealigita 'sekurec-protokola' modifil-valoro %d\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: nerealigita 'sekurec-protokola' modifil-valoro %d\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ERARO" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "AVERTO" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: neniu atestilo estis prezentata de %s.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: la atestilo de %s ne sukcesis havi konatan eldonanton.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: la atestilo de %s estas senvalidigita.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: la atestilo de %s senvalidiÄis.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Eraro dum ekigo de atestilo X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Neniu atestilo estis trovata\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Eraro dum analizo de atestilo: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "La atestilo ankoraÅ­ ne estas aktivigita\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "La atestilo eksvalidiÄis\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Atestilo devas esti X.509\n" @@ -946,11 +960,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Fiasko dum skribo de HTTP-peton: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Sen ĉapoj, ni supozas HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -959,11 +973,11 @@ "La dosiero %s jam estas tie; Äi ne estos elÅutata.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime malsukcesis. Probable tio estas programeraro.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -971,55 +985,55 @@ "Ne eblas konverti tempindikon al formo http. Ni retropaÅas al tempo 0 kiel " "lasta modif-tempo.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY-datumar-dosiero %s mankas: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Ni reuzas ekzistantan konekton al [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Ni reuzas ekzistantan konekton al %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Fiasko dum lego de prokurila respondo: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERARO %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "FuÅa stat-linio" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Prokura tuneligo fiaskis: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Nekonata aÅ­tentikiga Åablono.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Elektita aÅ­tentikiÄo: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Ni konservas al: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1028,20 +1042,20 @@ "Dum elÅuto de subskribo:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Malvalida valoro pri. Ni konsideras %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1049,42 +1063,42 @@ "Ne eblis trovi akceptebla resumo por rimedoj Metalink.\n" "Ni preteratentas ilin.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Ni malebligas SSL pro aperintaj eraroj.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s peto sendita, ni atendas respondon... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Neniu datumaro estas ricevita.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Leg-eraro (%s) en kapoj.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(sen priskribo)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Loko: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "nespecifita" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [sekvanta]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1093,7 +1107,7 @@ "La dosiero %s ne estas modifita en servilo. Ni preterpasas la elÅuton.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1104,7 +1118,7 @@ "Vi eble volas aldoni la modifilon --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1114,58 +1128,58 @@ " La dosiero estas fakte tute elÅutita; nenio farendas.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Grando: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "preteratentita" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Averto: ĵokeroj ne estas subtenataj en HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Arenea reÄimo ebligita. Kontrolu ĉu fora dosiero ekzistas.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ne eblas skribi al %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Mankas postulata atributo el Kaplinio 'received'.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "AÅ­tentikigo de uzantnomo/pasvorto fiaskis.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Ne eblas skribi al dosiero WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Ne eblas skribi al provizora dosiero WARC.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Ne eblas starigi SSL-konekton.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ne eblas forigi %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERARO: redirektigo (%d) sen loko.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1173,24 +1187,24 @@ "Ne eblis trovi datumaron Metalink en respondo HTTP. Ni elÅutas la dosieron " "uzante HTTP GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Kapoj Metalink estis trovataj. Ni Åaltas la reÄimon Metalink.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Fora dosiero ne ekzistas -- fuÅa ligo!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Mankas ĉapo 'last-modified' -- temp-indikoj estas malaktivitaj.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Malvalida ĉapo 'last-modified' -- temp-indikoj estas preteratentitaj.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1199,16 +1213,16 @@ "Servila dosiero ne estas pli nova ol loka %s -- ni ne elÅutas.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Fora dosiero estas pli nova, ni elÅutas.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1218,7 +1232,7 @@ "elÅutas.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1226,7 +1240,7 @@ "Fora dosiero ekzistas sed enhavas neniun ligon -- ni ne elÅutas.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1236,7 +1250,7 @@ "sed rikuro estas malaktivita -- ni ne elÅutas.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1244,12 +1258,12 @@ "Fora dosiero ekzistas.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1258,7 +1272,7 @@ "%s (%s) - skribita al ĉefeligujo %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1267,58 +1281,58 @@ "%s (%s) - %s konservita [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Konekto fermita ĉe la bajto %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Leg-eraro ĉe la bajto %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nesubtenata eco de protekto '%s'.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nesubtenata algoritmo '%s'.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ne eblas legi %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Eraro en %s ĉe linio %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1329,7 +1343,7 @@ "kontrolu '%s',\n" "aÅ­ indiku malsaman dosieron uzante --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1340,76 +1354,78 @@ "kontrolu '%s',\n" "aÅ­ indiku malsaman dosieron uzante --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: malvalida komando --execute %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: malvalida numero %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s devas esti uzata nur unufoje\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: malvalida bajt-valoro %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: malvalida tempo-periodo %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" +"use-askpass postulas ĉenon aÅ­ alian medi-variablon WGET_ASKPASS aÅ­ " +"SSH_ASKPASS por esti difinata.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: malvalida valoro %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: malvalida ĉapo %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: malvalida ĉapo WARC %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: malvalida progres-tipo %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1423,16 +1439,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Enkodigo %s ne validas\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Malkompleta aÅ­ malvalida plurbajta sekvo estis trovata\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Netraktita errno %d\n" @@ -1447,30 +1463,30 @@ msgstr "idn_encode fiaskis (%d): %s\n" #: src/iri.c:288 -#, fuzzy, c-format +#, c-format msgid "Failed to convert to lower: %d: %s\n" -msgstr "ne eblis konekti al %s pordo %d: %s\n" +msgstr "Malsukcesis konverti minusklen: %d: %s\n" #: src/log.c:931 src/log.c:950 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Redirecting output to %s.\n" msgstr "" "\n" -"%s estis ricevata, ni redirektas eligon al %s.\n" +"Redirekto de eligo al %s.\n" #: src/log.c:943 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; ni malebligas protokoladon.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uzmaniero: %s [MODIFILO]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1478,67 +1494,67 @@ "Nepraj argumentoj por longaj modifiloj ankaÅ­ nepras por la mallongaj.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Ekigo:\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help montri tiun ĉi helpilon\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background iri al fona reÄimo post ekigo\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=KOMANDO lanĉi komandon laŭ stilo '.wgetrc'\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Saluta kaj enig-dosiero:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=DOSIERO log mesaÄoj al DOSIERO\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=DOSIERO postmeti mesaÄojn al DOSIERO\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug montri multe da rafiniga informaro\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug montri rafinigan eligon Watt-32\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet kviete (neniu eligo)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose fariÄi detalema (tio ĉi aprioras)\n" -#: src/main.c:624 +#: src/main.c:625 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:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1546,7 +1562,7 @@ " --report-speed=TIPO eligi bendlarÄo kiel TIPO. TIPO povas " "esti 'bits'\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1554,7 +1570,7 @@ " -i, --input-file=DOSIERO elÅuti URL-ojn trovitajn en loka aÅ­ " "ekstera DOSIERO\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1562,11 +1578,11 @@ " --input-metalink=DORSIERO elÅuti dosierojn traktatajn en loka meta-" "liga DOSIERO.\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html trakti enig-dosieron kiel HTML\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1575,26 +1591,26 @@ "-F)\n" " relativajn al URL\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=DOSIERO indiki uzotan agord-dosieron\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-cookies ne uzi kuketojn\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "ElÅuti:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1602,14 +1618,14 @@ " -t, --tries=NOMBRO agordi nombron de reprovoj je NOMBRO (0 " "senlimigas)\n" -#: src/main.c:651 +#: src/main.c:652 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:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1618,11 +1634,11 @@ " --ignore-tags=LISTO kom-apartita listo de preteratentataj " "markoj HTML\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=DOSIERO skribi dokumentojn al DOSIERO\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1630,21 +1646,21 @@ " -nc, --no-clobber preterpasi elÅutojn kiuj anstataÅ­igus\n" " ekzistantajn dosierojn\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-cookies ne uzi kuketojn\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" " -c, --continue daÅ­rigi uzi dosieron parte elÅutita\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1652,11 +1668,11 @@ " --start-pos=DEÅœOVO komenci elÅuton el nul-bazita pozicio " "DEÅœOVO\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TIPO elekti progres-montrilan tipon\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1664,7 +1680,7 @@ " --show-progress montri la progres-breton en iu ajn " "detaliga reÄimo\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1674,7 +1690,7 @@ "ol\n" " la loka\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1684,7 +1700,7 @@ "preni\n" " petojn laÅ­ reÄimo de tempindiko\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1693,20 +1709,20 @@ "per\n" " tiu de la servilo\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response montri respondon de la servilo\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider ne elÅuti ion ajn\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1714,7 +1730,7 @@ " --dns-servers=ADRESOJ listo da DNS-serviloj por alpeti " "(apartitaj de komoj)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1722,27 +1738,27 @@ " --bind-dns-address=ADRESO ligi DNS-solvilon al ADRESO (gastigant-" "nomo aÅ­ IP) en la loka gastiganto\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDOJ atendi SEKUNDOJn inter elÅutoj\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1750,7 +1766,7 @@ " --waitretry=SEKUNDOJ atendi 1..SEKUNDOJn inter reprovoj de " "elÅutoj\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1758,15 +1774,15 @@ " --random-wait atendi de 0.5*WAIT...1.5*WAIT sekundoj " "inter elÅutoj\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy nepre malÅalti prokur-servilon\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=NUMERO difini elÅuta limo al NUMERO\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1774,15 +1790,15 @@ " --bind-address=ADRESO ligi al ADRESO (gastigant-nomo aÅ­ IP) en " "la loka gastiganto\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=RAPIDO limigi elÅut-rapido al RAPIDO\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache malebligi kaÅmemorajn DNS-serĉojn\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1790,7 +1806,7 @@ " --restrict-file-names=OS limigi signojn en dosiernomoj al tiuj " "permesataj de la OS\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1798,15 +1814,15 @@ " --ignore-case preteratenti usklecon dum kongruo al " "dosieroj/dosierujoj\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only konekti nur al adresoj IPv4\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only konekti nur al adresoj IPv6\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1816,24 +1832,24 @@ "familio,\n" " unu el IPv6, IPv4, aÅ­ neniu\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password peti pasvortojn\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1843,42 +1859,52 @@ "SSH_ASKPASS \n" " environment variable is used.\n" msgstr "" +" --use-askpass=KOMANDO indiki legitiman manipulilon por peti\n" +" uzantnomon kaj pasvorton. Se neniu " +"KOMANDO estis\n" +" indikata, la medi-variablo WGET_ASKPASS " +"aÅ­\n" +" SSH_ASKPASS estos uzata.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri malÅalti subteno al IRI\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink forigi la dosieron antaÅ­ ol pereigo\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" +" --keep-badhash teni dosierojn kun malakorda kontrolsumo " +"(sufiksi per .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" +" --metalink-index=NUMERO 'Metalink' application/metalink4+xml " +"'metaurl' ordiga NUMERO\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1886,48 +1912,48 @@ " --metalink-over-http uzi metadatumaron Metalink el kapoj de " "respondo HTTP\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location preferata loko por rimedoj Metalink\n" -#: src/main.c:756 +#: src/main.c:757 #, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -" --no-glob malebligi Åablonojn por dosiernomoj de " -"FTP\n" +" --no-xattr malebligi konservon de metadatumaro en " +"kromaj dosieratributoj\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Dosierujoj:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ne krei dosierujojn\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories devigi kreon de dosierujoj\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ne krei gastigantajn dosierujojn\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories uzi protokolan nomon en dosierujoj\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIKSO konservi dosierojn al PREFIKSO/..\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1935,25 +1961,25 @@ " --cut-dirs=NOMBRO preteratenti NOMBROn da dosierujaj " "komponantoj\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Modifiloj de HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=UZANTO difini http-uzanton kiel UZANTOn\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --password=PASV difini pasvorton de http kiel PASV\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache malebligi servil-enmemorigitan datumaron\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1961,7 +1987,7 @@ " --default-page=NOMO ÅanÄi la aprioran paÄnomon (ordinare\n" " Äi estas 'index.html'.)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1969,42 +1995,41 @@ " -E, --adjust-extension konservi dokumentojn HTML/CSS kun taÅ­gaj " "sufiksoj\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length preteratenti la kap-kampon 'Content-" "Length'\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=ĈENO enmeti ĈENO inter la kaplinioj\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TIPO elekti progres-montrilan tipon\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximumo da redirektigoj permesataj por " "paÄo\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=UZANTO difini UZANTO kiel prokuran uzantnomon\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=PASV difini PASV kiel prokuran pasvorton\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2012,12 +2037,12 @@ " --referer=URL inkluzivigi la kapon 'Referer: URL' en " "peto HTTP\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers konservi la kapliniojn HTTP en dosieron\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2025,7 +2050,7 @@ " -U, --user-agent=AGENTO identigi kiel AGENTOn anstataÅ­ Wget/" "VERSIO\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2033,24 +2058,24 @@ " --no-http-keep-alive malebligi HTTP-an 'keep-alive' (persistaj " "konektoj)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ne uzi kuketojn\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2058,7 +2083,7 @@ " --keep-session-cookies Åargi kaj konservi seancajn (ne-ĉiamajn) " "kuketojn\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2066,7 +2091,7 @@ " --post-data=ĈENO uzi metodon POST; sendi ĈENOn kiel la " "datumaron\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2074,13 +2099,13 @@ " --post-file=DOSIERO uzi metodon POST; sendi enhavojn de " "DOSIERO\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMetodo uzi metodon \"HTTPMetodo\" en la peto\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2088,7 +2113,7 @@ " --body-data=ĈENO sendi ĈENOn kiel datumaron. --method " "DEVAS esti difinita\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2096,7 +2121,7 @@ " --body-file=DOSIERO sendi enhavojn de DOSIERO. --method DEVAS " "esti difinita\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2108,7 +2133,7 @@ " elekto de lokaj dosiernomoj " "(EKSPERIMENTA)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2116,7 +2141,7 @@ " --content-on-error montri la ricevitan enhavon je servilaj " "eraroj\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2127,11 +2152,11 @@ " sen unue atendi por testo de la " "servilo\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Modifiloj HTTPS (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2142,38 +2167,38 @@ "SSLv2,\n" " SSLv3, TLSv1 aÅ­ PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only nur sekvi sekurajn ligojn HTTPS\n" -#: src/main.c:849 +#: src/main.c:850 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:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=DOSIERO klienta atestila dosiero\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=DOSIERO privata Ålosila dosiero\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 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:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2181,12 +2206,11 @@ " --ca-directory=UJO dosierujo kie haketa listo da CA-oj estas " "konservataj\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=DOSIERO dosiero kun aro da CRL-oj\n" -#: src/main.c:865 -#, fuzzy +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2204,7 +2228,7 @@ " apartitaj de ';', por kontroli " "samtavolanon\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2212,7 +2236,7 @@ " --random-file=DOSIERO dosiero kun hazarda datumaro por semigi " "la SSL PRNG\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2220,7 +2244,7 @@ " --egd-file=DOSIERO dosiero nomigantan la ingo EGD kun " "hazarda datumaro\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2230,15 +2254,15 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "Modifiloj de HSTS:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts malebligi HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2246,11 +2270,11 @@ " --hsts-file vojo de datumbazo HSTS (anstataÅ­igos la " "originalon)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Modifiloj FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2258,37 +2282,37 @@ " --ftp-stmlf uzi la formon Stream_LF por ĉiuj " "ciferecaj dosieroj FTP\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=UZANTO difini uzanton de FTP kiel UZANTOn\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASV difini pasvorton de FTP kiel PASV\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ne forigi dosierojn '.listing'\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob malebligi Åablonojn por dosiernomoj de " "FTP\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp malebligi \"pasivan\" Åutan reÄimon\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions konservi deforajn dosier-permesojn\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2296,11 +2320,11 @@ " --retr-symlinks dum rikuro, preni dosierojn 'linked-" "to' (ne ujo)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "Modifiloj FTPS:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2308,7 +2332,7 @@ " --ftps-implicit uzi implican FTPS (apriora pordo " "estas 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2318,7 +2342,7 @@ "en la kontrola konekto kiam\n" " oni malfermas datumaran konekton\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2326,7 +2350,7 @@ " --ftps-clear-data-connection ĉifri nur la kontrolan kanalon; la " "tuta datumaro estos laŭ simpla teksto\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2334,11 +2358,11 @@ " --ftps-fallback-to-ftp retropaÅi al FTP se FTPS ne estas " "subtenata en la celita servilo\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Modifiloj WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2346,24 +2370,24 @@ " --warc-file=DOSIERNOMO konservi petan/respondan datumaron al " "dosiero .warc.gz\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx skribi indeks-dosierojn CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2371,17 +2395,17 @@ " --warc-dedup=DOSIERNOMO ne konservi rikordojn listigitajn en tiu " "ĉi dosiero CDX\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ne kalkuli totalojn SHA1\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2389,7 +2413,7 @@ " --no-warc-keep-log ne konservi protokol-dosiero en rikordo " "WARC\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2398,15 +2422,15 @@ " --warc-tempdir=DOSIERUJO loko por provizoraj dosieroj kreitaj de\n" " la skribanto WARC\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rikura elÅuto:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive indiki rikuran elÅuton\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2414,14 +2438,14 @@ " -l, --level=NUMERO maksimuma rikura profundo (inf aÅ­ 0 por " "senlima)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" " --delete-after forigi dosierojn loke post elÅuti ilin\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2431,7 +2455,7 @@ "aÅ­ CSS indiku\n" " lokajn dosierojn\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2439,7 +2463,7 @@ " --convert-file-only nur konverti la dosieran parton de la URL-" "oj (baznomo)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2447,7 +2471,7 @@ " --backups=N antaÅ­ ol skribi dosieron X, rotacii Äis N " "savkopiajn dosierojn\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2455,7 +2479,7 @@ " -K, --backup-converted antaÅ­ ol konverti dosieron X, savkopii " "kiel X_orig\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2463,7 +2487,7 @@ " -K, --backup-converted antaÅ­ ol konverti dosieron X, savkopii " "kiel X.orig\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2471,7 +2495,7 @@ " -m, --mirror mallongigo por -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2479,7 +2503,7 @@ " -p, --page-requisites preni ĉiujn bildojn, ktp, bezonataj por " "montri paÄon HTML\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2487,11 +2511,11 @@ " --strict-comments Åalti severan (SGML) traktadon de " "komentoj HTML\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Rikura akcepto/malakcepto:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2499,7 +2523,7 @@ " -A, --accept=LISTO kom-apartita listo de akcepteblaj " "sufiksoj\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2507,46 +2531,46 @@ " -R, --reject=LISTO kom-apartita listo de malakcepteblaj " "sufiksoj\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGESP regesp kongruanta al akcepteblaj URL-oj\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGESP regesp kongruanta al malakcepteblaj URL-" "oj\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TIPO tipo de regesp (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TIPO tipo de regesp (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp sekvi ligojn FTP el dokumentoj HTML\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2554,7 +2578,7 @@ " --follow-tags=LISTO kom-apartita listo de sekvataj markoj " "HTML\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2562,20 +2586,20 @@ " --ignore-tags=LISTO kom-apartita listo de preteratentataj " "markoj HTML\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative sekvi nur relativajn ligojn\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTO listo de permesataj dosierujoj\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2584,91 +2608,91 @@ " --trust-server-names uzi nomon indikitan de la lasta elemento\n" " de la redirektiga URL\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTO listo de forigitaj dosierujoj\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "" "Bonvolu sendi raportojn pri program-misoj kaj sugestojn al \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Pasvorto por uzanto %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Pasvorto: " -#: src/main.c:1103 -#, fuzzy, c-format +#: src/main.c:1104 +#, c-format msgid "Cannot create pipe\n" -msgstr "ne eblas krei dukton" +msgstr "Ne eblas krei dukton\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" -msgstr "" +msgstr "Eraro dum ekigo de generigaj dosier-agoj por use-askpass: %d\n" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" -msgstr "" +msgstr "Eraro dum difino de generigaj dosier-agoj por use-askpass:%d\n" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" -msgstr "" +msgstr "Eraro dum lego de respondo el komando \"%s %s\": %s\n" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " -msgstr "" +msgstr "Uzantnomo por '%s%s':" -#: src/main.c:1177 -#, fuzzy, c-format +#: src/main.c:1178 +#, c-format msgid "Password for '%s%s@%s': " -msgstr "Pasvorto por uzanto %s: " +msgstr "Pasvorto por '%s%s@%s': " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Lokaĵaro: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Kompili: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Ligo: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2677,29 +2701,29 @@ "GNU Wget %s konstruita en %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (med)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (uzanto)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Kopirajto © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2714,7 +2738,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2722,39 +2746,39 @@ "\n" "Originale skribita de Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "" "Bonvolu sendi raportojn pri program-misoj kaj demandojn al .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Problemo pri memor-rezervo\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Ni ĉesas pro eraro en %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Provu '%s --help' por pliaj modifiloj.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: malvalida modifilo -- '-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2763,7 +2787,7 @@ "Kaj --no-clobber kaj --convert-links estis indikataj, nur --convert-links " "estos uzata.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2772,22 +2796,22 @@ "Kaj --no-clobber kaj --convert-file-only estis indikataj, nur --convert-file-" "only estos uzata.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2799,7 +2823,7 @@ "kun -p aŭ -r. Konsultu la gvidlibron por pli da detaloj.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2809,7 +2833,7 @@ "estos metita en ununura dosiero indikita de vi.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2819,26 +2843,26 @@ "por pli da detaloj.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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:1699 +#: src/main.c:1700 #, 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:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Eligo de WARC ne funkcias kun --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2847,7 +2871,7 @@ "Eligo de WARC ne funkcias kun --continue aÅ­ --start-pos, ili estos " "malebligataj.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2855,7 +2879,7 @@ "Resumoj estas malebligataj; Multobligo de WARK ne trovos duobligitajn " "rikordojn.\n" -#: src/main.c:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2864,12 +2888,12 @@ "Eligo de WARC ne funkcias kun --continue aÅ­ --start-pos, ili estos " "malebligataj.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Ne eblas difini kaj --ask-password kaj --password.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2878,26 +2902,26 @@ "Indiki samtempe --start-pos kaj --continue ne estas rekomendinde; --continue " "estos malebligata.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: mankanta URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 -#, fuzzy, c-format +#: src/main.c:1827 +#, 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 "" "Vi ne povas uzi --post-data aÅ­ --post-file kune kun --method. --method " -"postulas datumaron per la modifiloj --body-data kaj --body-file" +"postulas datumaron per la modifiloj --body-data kaj --body-file\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2906,24 +2930,24 @@ "Vi devas indiki metodon per --method=HTTPMetodo por uzi kun --body-data aÅ­ --" "body-file.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Tiu ĉi versio ne subtenas IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, 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:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2932,42 +2956,42 @@ "--convert-links aÅ­ --convert-file-only povas esti uzataj kune nur se " "eliganta al ordinara dosiero.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Ni fiaskis lanĉi 'libcares'\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Ni fiaskis lanĉi kanalon c-ares\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Ni fiaskis analizi IP-adreson '%s'\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "URL-oj ne trovitaj en %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ne eblas analizi meta-ligan dosieron %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2978,7 +3002,7 @@ "Totala mur-horloÄa tempo: %s\n" "ElÅutite: %d dosieroj, %s en %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "ElÅuta limo de %s TROIGIS!\n" @@ -2990,45 +3014,45 @@ #: 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 +#, c-format msgid "Planned metalink file: %s\n" -msgstr "Ne eblas analizi meta-ligan dosieron %s.\n" +msgstr "Planita meta-liga dosiero: %s\n" #: src/metalink.c:179 -#, fuzzy, c-format +#, c-format msgid "Secured metalink file: %s\n" -msgstr "Ne eblas analizi meta-ligan dosieron %s.\n" +msgstr "Sekurigita meta-liga dosiero: %s\n" #: src/metalink.c:184 msgid "Rejecting metalink file. Unsafe name.\n" -msgstr "" +msgstr "Rifuzo de 'metalink'-dosiero. Malsekura nomo.\n" #: src/metalink.c:238 #, c-format msgid "Processing metaurl %s...\n" -msgstr "" +msgstr "Procezado de 'metaurl' %s...\n" #: src/metalink.c:251 #, c-format msgid "Rejecting metaurl file %s. Unsafe name.\n" -msgstr "" +msgstr "Rifuzo de 'metaurl'-dosiero %s. Malsekura nomo.\n" #: src/metalink.c:268 -#, fuzzy, c-format +#, c-format msgid "Failed to download %s. Skipping metaurl.\n" -msgstr "Ni malsukcesis elÅuti %s. Ni saltas la rimedon.\n" +msgstr "Ni malsukcesis elÅuti %s. Ni preterpasas la meta-URL.\n" #: src/metalink.c:285 -#, fuzzy, c-format +#, c-format msgid "Unable to parse metaurl file %s.\n" -msgstr "Ne eblas analizi meta-ligan dosieron %s.\n" +msgstr "Ne eblas analizi meta-URL-an dosieron %s.\n" #: src/metalink.c:354 msgid "Metaurls processing returned with error.\n" -msgstr "" +msgstr "Procezado de 'metaurl'-oj finis liveranta eraron.\n" #: src/metalink.c:386 #, c-format @@ -3040,29 +3064,26 @@ msgstr "Ne eblis malfermi elÅutitan dosieron.\n" #: src/metalink.c:514 -#, fuzzy, c-format +#, c-format msgid "Computing size for %s\n" -msgstr "Konputado de kontrolsumo por %s\n" +msgstr "Konputado de grando por %s\n" #: src/metalink.c:519 -#, fuzzy msgid "File size not declared. Skipping check.\n" -msgstr "Ni malsukcesis elÅuti %s. Ni saltas la rimedon.\n" +msgstr "Dosier-grando ne estas deklarita. Ni preterpasas kontrolon.\n" #: src/metalink.c:527 -#, fuzzy msgid "Could not get downloaded file's size.\n" -msgstr "Ne eblis malfermi elÅutitan dosieron.\n" +msgstr "Ne eblis scii la grandon de la elÅutita dosiero.\n" #: src/metalink.c:539 -#, fuzzy, c-format +#, c-format msgid "Size mismatch for file %s.\n" -msgstr "Malkongruo de kontrolsumo por dosiero%s.\n" +msgstr "Malkongruo de grando por la dosiero%s.\n" #: src/metalink.c:547 -#, fuzzy msgid "Size matches.\n" -msgstr "Kontrolsumo kongruas.\n" +msgstr "Grando kongruas.\n" #: src/metalink.c:600 #, c-format @@ -3097,7 +3118,6 @@ msgstr "GPGME op_verify_result: NULL\n" #: src/metalink.c:821 -#, fuzzy msgid "Signature validation succeeded.\n" msgstr "Validigo de subskribo sukcesis.\n" @@ -3110,9 +3130,8 @@ msgstr "Datumaro kongruas al subskribo, sed subskribo ne estas fidebla.\n" #: src/metalink.c:865 -#, fuzzy msgid "No checksums found.\n" -msgstr "Neniu atestilo estis trovata\n" +msgstr "Neniu kontrolsumo estis trovata.\n" #: src/metalink.c:871 #, c-format @@ -3120,9 +3139,9 @@ msgstr "Ni malsukcesis elÅuti %s. Ni saltas la rimedon.\n" #: src/metalink.c:878 -#, fuzzy, c-format +#, c-format msgid "File %s retrieved but size does not match. \n" -msgstr "La dosiero %s estas elÅutita sed la subskribo ne kongruas. \n" +msgstr "La dosiero %s estas elÅutita sed grando ne kongruas. \n" #: src/metalink.c:885 #, c-format @@ -3135,9 +3154,9 @@ msgstr "La dosiero %s estas elÅutita sed la subskribo ne kongruas. \n" #: src/metalink.c:1113 -#, fuzzy, c-format +#, c-format msgid "Renaming %s to %s.\n" -msgstr "Ni forviÅas %s.\n" +msgstr "Renomigo de %s al %s.\n" #: src/mswindows.c:96 #, c-format @@ -3149,7 +3168,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Ni daÅ­rigas fone, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Eligo estos skribita al %s.\n" @@ -3194,64 +3213,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: ne eblas apliki stat al %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "AVERTO: ni uzas malfortan hazardan semon.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Ne ebli semi PRNG; konsideru uzi --random-file.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "Via versio de OpenSSL tro malnovas por subteni TLSv1.1\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: nerealigita modifil-valoro de 'secure-protocol' %d\n" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: malvalida URL %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "Ne ebli semi PRNG; konsideru uzi --random-file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 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:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Mem-signita atestilo estis trovata.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Eldonita atestilo ne validas ankoraÅ­.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Eldonita atestilo malvalidiÄis.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3260,14 +3279,14 @@ "%s: neniu atestila alternativa nomo de temo kongruas al\n" "\tla petita gastigant-nomo %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, 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:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3278,7 +3297,7 @@ " 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:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Por konekti al %s sensekure, uzu '--no-check-certificate'.\n" @@ -3327,22 +3346,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Ni Åargas je robots.txt; bonvolu preteratenti erarojn.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Eraro dum analizado de prokurila URL %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d rediktegij troigi.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3350,7 +3369,7 @@ "Ni rezignas.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3422,97 +3441,107 @@ msgid "HTTPS support not compiled in" msgstr "Subteno al HTTPS ne estas enkompilita" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Malkompleta aÅ­ malvalida plurbajta sekvo estis trovata\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Ni daÅ­rigas en fona reÄimo, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ni fiaskis forigi simbol-ligon %s: %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Ni fiaskis lanĉi 'libcares'\n" -#: src/utils.c:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" -msgstr "Ne eblas preni kuketon por %s\n" +msgstr "Malsukcesis difini permesojn por %s.\n" -#: src/utils.c:872 +#: src/utils.c:878 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Ne eblas preni kuketon por %s\n" +msgstr "Malsukcesis difini permesojn por %s.\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Ni fiaskis analizi IP-adreson '%s'\n" -#: src/utils.c:923 +#: src/utils.c:929 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Ne eblas preni kuketon por %s\n" +msgstr "Malsukcesis difini permesojn por %s.\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Malvalida regul-esprimo %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Malvalida regul-esprimo %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Eraro dum kongruo al %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Eraro dum malfermo de la dosieros WARK %s.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Eraro dum malfermo de fluo GZIP al dosiero WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Eraro dum skribo de rikordo warcinfo al dosiero WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3521,24 +3550,24 @@ "Malfermo de la dosiero WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Eraro dum malfermo de la dosieros WARK %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Dosiero CDX ne listigas originalajr URL-ojn. (Mankas kolumno 'a'.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Dosiero CDX ne listigas kontrolsumojn. (Mankas kolumno 'k'.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "Dosiero CDX ne listigas id de rikordoj. (Mankas kolumno 'k'.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3553,32 +3582,32 @@ "Ni Åargis je %d rikordoj el CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Ne eblis legi dosieron CDX %s por multobligo.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Ne eblis malfermi provizoran dosieron WARC de manifesto.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Ne eblis malfermi provizoran dosieron WARC de protokolo.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Ne eblis malfermi dosieron WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Ne eblis malfermi dosieron CDX por eligo.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Ne eblis provizoran dosieron WARC.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Estis trovata Äusta kongruo en dosiero CDX. Ni konservas revizitan rikordon " Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/es.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/es.gmo differ diff -Nru wget-1.19.5/po/es.po wget-1.20.1/po/es.po --- wget-1.19.5/po/es.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/es.po 2018-12-26 20:10:49.000000000 +0000 @@ -26,7 +26,7 @@ msgstr "" "Project-Id-Version: GNU wget 1.18\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2016-06-28 22:09+0200\n" "Last-Translator: Carlos E. Robinson \n" "Language-Team: Spanish \n" @@ -258,17 +258,17 @@ msgid "Unmatched ) or \\)" msgstr ") or \\) desparejado" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "No hay expresión regular previa" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "no se puede crear tubería" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -342,7 +342,7 @@ msgid "failed: %s.\n" msgstr "falló: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: no se pudo resolver la dirección del equipo %s\n" @@ -468,12 +468,12 @@ msgid "Length: %s" msgstr "Longitud: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", quedan %s (%s)" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", quedan %s" @@ -720,7 +720,7 @@ "No existe tal fichero o directorio %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s de repente existe.\n" @@ -747,7 +747,7 @@ # `no recuperando' no me suena muy español, te propongo la alternativa # más "humanizada", `no se recupera' - cll -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "El fichero %s ya está ahí, no se recupera.\n" @@ -755,12 +755,12 @@ # nota jjrs: no sería mejor intento? # pues sí - Salva # decididamente si - cll -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(intento:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -769,7 +769,7 @@ "%s (%s) - escritos a stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -778,8 +778,8 @@ "%s (%s) - %s guardado [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Eliminando %s.\n" @@ -893,12 +893,25 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Rechazando %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Rechazando %s.\n" + +# 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:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "No se desciende hasta %s por estar excluido/no-incluido.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Error ajustando %s a %s: %s\n" @@ -911,153 +924,158 @@ # 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:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "No hay nada que se ajuste al patrón %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, 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:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Se escribió un índice en HTML a %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERROR: No se puede abrir el directorio %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERROR: No se pudo abrir certificado %s: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Cargado certificado CA '%s'\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Cargado fichero CRL '%s'\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Su versión de OpenSSL es demasiado antigua para soportar TLSv1.1\n" + +#: src/gnutls.c:676 #, 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:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ERROR" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "AVISO" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s no ha presentado certificado.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: El certificado de %s no tiene un emisor conocido.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, 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:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: El certificado de %s ha expirado.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Error inicializando el certificado X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "No se encontró certificado\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Error analizando el certificado: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "El certificado no ha sido aún activado\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Ha expirado el certificado\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "El certificado debe ser X.509\n" @@ -1097,13 +1115,13 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Fallo escribiendo petición HTTP: %s.\n" -#: src/http.c:790 +#: src/http.c:793 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:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -1112,11 +1130,11 @@ "El fichero %s ya está ahí, no se recupera.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "Falló gmtime. Probablemente sea un gazapo.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -1125,27 +1143,27 @@ "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:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "El fichero de datos BODY %s falta: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Reutilizando la conexión existente a [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Reutilizando la conexión con %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Fallo leyendo la respuesta del proxy: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" @@ -1155,32 +1173,32 @@ # 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:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Línea de estado mal formada" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Falló la tunelización proxy: %s" # CER: 20101118 ¿Método o esquema? -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Esquema de autentificación desconocido.\n" # CER: 20101118 ¿Método o esquema? -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Autenticación seleccionada: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Grabando a: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1189,22 +1207,22 @@ "Mientras se descargaba la firma:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Valor pri inválido. Asumiendo %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1212,45 +1230,45 @@ "No se pudo encontrar resumen aceptable para los recursos Metalink.\n" "Ignorándolos.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Desactivando SSL debido a los errores encontrados.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "Petición %s enviada, esperando respuesta... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "No se han recibido datos.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Error de lectura (%s) en las cabeceras.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(sin descripción)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Localización: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "no especificado" # Duda: Hmmm, ... ¿`siguiendo' o `siguiente'? - cll # siguiendo - Salva # -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [siguiendo]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1259,7 +1277,7 @@ "Fichero %s no modificado en el servidor. Omitiendo la descarga.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1270,7 +1288,7 @@ "Podría úd intentar añadir la opción --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1280,59 +1298,59 @@ " El fichero ya ha sido totalmente recuperado, no hay nada que hacer.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Longitud: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "descartado" -#: src/http.c:4215 +#: src/http.c:4208 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:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "No se puede escribir a %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Recibido el atributo requerido que faltaba de la cabecera.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "La autentificación usuario/contraseña falló.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "No se puede escribir en fichero WARC..\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "No se puede escribir en fichero WARC temporal.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "No se pudo establecer la conexión SSL.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "No se puede des-enlazar %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: redirección (%d) sin localización.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1340,29 +1358,29 @@ "No se pudo encontrar los datos Metalink en la respuesta HTTP. Descargando el " "fichero usando HTTP GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Se han encontrado cabeceras Metalink. Cambiando a modo Metalink.\n" -#: src/http.c:4507 +#: src/http.c:4514 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:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 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:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1372,16 +1390,16 @@ "descargará.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "El fichero remoto es más nuevo, recuperando.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1391,7 +1409,7 @@ "descargando.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1399,7 +1417,7 @@ "El fichero remoto existe pero no contiene ningún enlace -- no se " "descargará.\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1409,7 +1427,7 @@ "pero la recursión está desactivada -- no se recupera.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1417,12 +1435,12 @@ "El fichero remoto existe.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1431,7 +1449,7 @@ "%s (%s) - escritos a stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1440,58 +1458,58 @@ "%s (%s) - %s guardado [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexión cerrada en el byte %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, 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:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Calidad de protección no soportada '%s'.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmo no soportado '%s'.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: No se pudo leer %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, 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:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1503,7 +1521,7 @@ "'%s',\n" "o especifique un fichero diferente usando --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1515,81 +1533,81 @@ "o especifique un fichero diferente usando --config.\n" # CER, 20101031: cambio atención por aviso (warning), por consistencia. -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, 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:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: número inválido %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s sólo debe usarse una vez\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: valor byte inválido %s.\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: periodo de tiempo inválido %s.\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: valor %s inválido.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: cabecera %s inválida.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, 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:1602 +#: src/init.c:1596 #, 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:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1603,16 +1621,16 @@ msgid "Encoding %s isn't valid\n" msgstr "La codificación %s no es válida\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Secuencia multibyte incompleta o inválida\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "error %d no manejado\n" @@ -1645,7 +1663,7 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; deshabilitando el registro.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Modo de empleo: %s [OPCIÓN]... [URL]...\n" @@ -1655,7 +1673,7 @@ # 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:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1664,62 +1682,62 @@ "obligatorios para las opciones cortas.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Inicio:\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help muestra esta ayuda\n" -#: src/main.c:600 +#: src/main.c:601 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:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=COMMAND ejecuta una orden estilo `.wgetrc'\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Ficheros de registro y de entrada:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FICHERO registra mensajes en FICHERO\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FILE anexa mensajes a FILE\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug saca montones de información para " "depuración\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug saca salida de depuración Watt-32\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet silencioso (sin texto de salida)\n" -#: src/main.c:622 +#: src/main.c:623 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:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1727,7 +1745,7 @@ " -nv, --no-verbose desactiva modo verboso, sin ser " "silencioso\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1735,7 +1753,7 @@ " --report-speed=TYPE Ancho de banda de salida como TYPE. \n" " TYPE puede ser bits\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1744,7 +1762,7 @@ "(FILE)\n" " local o externo\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1753,12 +1771,12 @@ "(FILE) local\n" " o externo de metalinks\n" -#: src/main.c:634 +#: src/main.c:635 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:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1767,29 +1785,29 @@ "entrada\n" " (-i -F) relativos a la URL\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FILE Especifica el fichero de configuración a " "usar\n" -#: src/main.c:641 +#: src/main.c:642 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:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Descarga:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1797,14 +1815,14 @@ " -t, --tries=NÚMERO define número de intentos a NÚMERO\n" " (0 es sin limite)\n" -#: src/main.c:651 +#: src/main.c:652 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:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1813,12 +1831,12 @@ " --ignore-tags=LIST lista separada por comas de etiquetas " "HTML a ignorar\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" " -O, --output-document=FILE escribe documentos al fichero FILE\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1827,7 +1845,7 @@ " ficheros existentes " "(sobrescribiéndolos)\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1835,7 +1853,7 @@ msgstr "" " --no-config no lee ningún fichero de configuración\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1843,7 +1861,7 @@ " -c, --continue continua una descarga parcial de un " "fichero\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1851,12 +1869,12 @@ " --start-pos=OFFSET inicia la descarga desde la posición de\n" " base-cero OFFSET\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TYPE selecciona tipo de indicador de progreso\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1865,7 +1883,7 @@ "cualquier\n" " modo de verbosidad\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1874,7 +1892,7 @@ " -N, --timestamping no re-recupera ficheros a menos que sean\n" " más nuevos que la versión local\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1884,7 +1902,7 @@ "modified-since\n" " en modo de sellado de tiempo\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1892,21 +1910,21 @@ " --no-use-server-timestamps no pone la hora/fecha del fichero local\n" " a la que tenga el servidor\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response muestra la respuesta del servidor\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider (araña) no descarga nada\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1915,7 +1933,7 @@ "preguntar\n" " (separados por comas)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1923,30 +1941,30 @@ " --bind-dns-address=DIRECCN enlazar resolvedor DNS resolver a DIRECCN " "(nombredeequipo o IP) en equipo local\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SEGUNDOS espera tantos SEGUNDOS entre reintentos\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1954,7 +1972,7 @@ " --waitretry=SEGUNDOS espera 1..SEGUNDOS entre reintentos\n" " de una descarga\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1962,17 +1980,17 @@ " --random-wait espera entre 0.5*WAIT...1.5*WAIT segs.\n" " entre descargas\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy explícitamente desconecta el proxy\n" -#: src/main.c:705 +#: src/main.c:706 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:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1980,16 +1998,16 @@ " --bind-address=DIRECCIÓN bind a DIRECCIÓN (nombredeequipo o IP) en " "equipo local\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=VELOCIDAD limita velocidad de descarga a VELOCIDAD\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache desactiva búsquedas en tampón DNS\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1998,7 +2016,7 @@ "ficheros\n" " a los que el SO permita\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -2006,15 +2024,15 @@ " --ignore-case ignora mayús/minúsculas al encajar " "ficheros/directorios\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only conecta sólo a direcciones IPv4\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only conecta sólo a direcciones IPv6\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -2025,24 +2043,24 @@ " especificada, bien IPv6, IPv4, o " "ninguna\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password pide las contraseñas\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -2053,11 +2071,11 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri desactiva soporte IRI\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" @@ -2065,30 +2083,30 @@ "codificación\n" " local para IRIs\n" -#: src/main.c:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink borra fichero antes de machacar\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -2096,7 +2114,7 @@ " --metalink-over-http usa metadatos Metalink de las cabeceras " "de la respuesta HTTP\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -2104,42 +2122,40 @@ " --preferred-location localización preferida para los recursos " "Metalink\n" -#: src/main.c:756 +#: src/main.c:757 #, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" -msgstr "" -" --no-glob desactiva generación de nombres de\n" -" fichero del FTP (globbing)\n" +msgstr " --warc-cdx escribe ficheros indice CDX\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Directorios:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories no crea directorios\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories fuerza la creación de directorios\n" -#: src/main.c:767 +#: src/main.c:768 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:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories usa nombre de protocolo en los " "directorios\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIJO graba los ficheros en PREFIJO/..\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -2147,25 +2163,25 @@ " --cut-dirs=NÚMERO ignora NÚMERO de componentes de\n" " directorio remoto\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Opciones HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=USUARIO pone el usuario http a USUARIO\n" -#: src/main.c:781 +#: src/main.c:782 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:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache no permite los datos en tampón del " "servidor\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2173,7 +2189,7 @@ " --default-page=NAME Cambia el nombre de página por defecto\n" " (suele ser `index.html'.)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2181,45 +2197,43 @@ " -E, --adjust-extension graba documentos HTML/CSS con las " "extensiones correctas\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignora campo `Content-Length' en " "cabeceras\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=STRING inserta STRING entre las cabeceras\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=TYPE selecciona tipo de indicador de progreso\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect máximo de redirecciones permitidas por " "página\n" -#: src/main.c:800 +#: src/main.c:801 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:802 +#: src/main.c:803 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:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2227,12 +2241,12 @@ " --referer=URL incluye cabecera `Referer: URL' en " "petición HTTP\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers graba las cabeceras HTTP a fichero\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2240,7 +2254,7 @@ " -U, --user-agent=AGENTE se identifica como AGENTE en vez de Wget/" "VERSIÓN\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2248,24 +2262,24 @@ " --no-http-keep-alive desactiva HTTP keep-alive (conexiones " "persistentes)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies no usa \"cookies\"\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2273,7 +2287,7 @@ " --keep-session-cookies carga y graba las \"cookies\" de sesión " "(no-permanentes)\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2281,7 +2295,7 @@ " --post-data=STRING usa el método POST; envía STRING como los " "datos\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2289,13 +2303,13 @@ " --post-file=FICHERO usa el método POST; envía el contenido de " "FICHERO\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod usa método \"HTTPMethod\" en la cabecera\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2303,7 +2317,7 @@ " --body-data=STRING Envía STRING como datos. Debe usarse --" "method\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2311,7 +2325,7 @@ " --body-file=FICHERO Envía el contenido de FICHERO. Debe " "usarse --method\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2323,7 +2337,7 @@ " cuando se elige nombre de ficheros " "locales (EXPERIMENTAL)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2331,7 +2345,7 @@ " --content-on-error imprime el contenido recibido si hay " "errores del servidor\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2343,11 +2357,11 @@ " sin antes esperar al desafío del " "servidor\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opciones HTTPS (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2358,41 +2372,41 @@ "SSLv2,\n" " SSLv3, TLSv1 y PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only sigue sólo enlaces HTTPS seguros\n" -#: src/main.c:849 +#: src/main.c:850 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:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr "" " --certificate=FILE fichero de certificado del cliente\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FILE fichero de llave privada\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 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:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2400,11 +2414,11 @@ " --ca-directory=DIR directorio donde se guarda la lista \"hash" "\" de CAs\n" -#: src/main.c:863 +#: src/main.c:864 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:865 +#: src/main.c:866 #, fuzzy msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" @@ -2422,7 +2436,7 @@ "separados\n" " por ';', para verificar contra el par\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2430,7 +2444,7 @@ " --random-file=FILE fichero con datos aleatorios como semilla " "de SSL PRNG\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2438,7 +2452,7 @@ " --egd-file=FICHERO fichero que denomina el conector EGD con " "datos aleatorios\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2448,17 +2462,17 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "Opciones HSTS:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr "" " --no-cache no permite los datos en tampón del " "servidor.\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2466,11 +2480,11 @@ " --hsts-file camino de la base de tados HSTS " "(invalidará las opciones por omisión)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Opciones FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2478,39 +2492,39 @@ " --ftp-stmlf Usa formato Stream_LF para todos los " "ficheros binarios FTP\n" -#: src/main.c:901 +#: src/main.c:902 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:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASS pone PASS como contraseña ftp\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing no elimina los ficheros `.listing'\n" -#: src/main.c:907 +#: src/main.c:908 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:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp desactiva el modo \"pasivo\" de " "transferencia\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions preserva permisos de ficheros remotos\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2518,11 +2532,11 @@ " --retr-symlinks en modo recursivo, descarga los ficheros\n" " enlazados (no los directorios)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "Opciones FTPS:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2530,7 +2544,7 @@ " --ftps-implicit use FTPS implícito (el puerto por " "omisión es el990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2541,7 +2555,7 @@ " conexión de control al abrir una " "conexión de datos\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2549,7 +2563,7 @@ " --ftps-clear-data-connection cifra sólo el canal de control; todos " "los datos irán en texto claro\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2557,11 +2571,11 @@ " --ftps-fallback-to-ftp retrae a FTP si FTPS no es soportado " "por el servidor objetivo\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Opciones WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2569,24 +2583,24 @@ " --warc-file=FILENAME guarda datos de la petición/respuesta en " "un fichero .warc.gz\n" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=STRING inserta STRING en registro warcinfo\n" -#: src/main.c:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx escribe ficheros indice CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2595,17 +2609,17 @@ "en\n" " este fichero CDX\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests no calcula resúmenes SHA1\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2613,7 +2627,7 @@ " --no-warc-keep-log no guarda el fichero de registro en un " "campo WARC\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2622,15 +2636,15 @@ " --warc-tempdir=DIRECTORY localización para ficheros temporales\n" " creada por el grabador de WARC\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Descarga recursiva:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive especifica descarga recursiva\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2638,7 +2652,7 @@ " -l, --level=NUMBER máxima profundidad de recursión (inf o 0 " "para infinita)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2646,7 +2660,7 @@ " --delete-after borra los ficheros localmente después de " "descargarlos\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2655,7 +2669,7 @@ " -k, --convert-links hace que los enlaces en el HTML o CSS\n" " descargado apunte a ficheros locales\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2663,7 +2677,7 @@ " --convert-file-only convertir sólo la parte del fichero de " "las URLs (normalmente conocido como el basename)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2672,7 +2686,7 @@ "hasta un\n" " máximo de N ficheros de respaldo\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2681,7 +2695,7 @@ "salvaguardarlo\n" " como X_orig\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2690,7 +2704,7 @@ "salvaguardarlo\n" " como X.orig\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2698,7 +2712,7 @@ " -m, --mirror atajo para -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2706,7 +2720,7 @@ " -p, --page-requisites descarga todas las imágenes, etc. que se\n" " necesitan para mostrar la página HTML\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2714,11 +2728,11 @@ " --strict-comments activa manejo estricto (SGML) de los " "comentarios en HTML\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Acepta/rechaza recursivamente:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2726,7 +2740,7 @@ " -A, --accept=LIST lista separada por comas de extensiones " "aceptadas\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2734,46 +2748,46 @@ " -R, --reject=LIST lista separada por comas de extensiones " "rechazadas\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGEX regex que encaja en las URLS aceptadas\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGEX regex que encaja las URLs rechazadas\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TYPE tipo de regex (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYPE tipo de regex (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 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:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2781,7 +2795,7 @@ " --follow-tags=LIST lista separada por comas de etiquetas " "HTML a seguir\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2789,21 +2803,21 @@ " --ignore-tags=LIST lista separada por comas de etiquetas " "HTML a ignorar\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative sólo sigue enlaces relativos\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LIST lista de directorios permitidos\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2813,88 +2827,88 @@ "redirección \n" " del último componente de la url\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LIST lista de directorios excluidos\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Envíe información sobre gazapos y sugerencias a \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Contraseña para el usuario %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Contraseña: " -#: src/main.c:1103 +#: src/main.c:1104 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "no se puede crear tubería" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Contraseña para el usuario %s: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Locale: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Compila: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Enlaza: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2904,29 +2918,29 @@ "\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:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (entorno)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (usuario)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (©) %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2941,7 +2955,7 @@ # 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:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2951,38 +2965,38 @@ # CER, 201011117: Yo traduzco bugs por gazapo, en vez de "bichos" :-) # (acepcion 2.2 de ) -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "Envíe informes de gazapos y preguntas a .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Problema de ubicación de memoria\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Saliendo debido a error en %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Pruebe `%s --help' para ver más opciones.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opción ilegal -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2991,7 +3005,7 @@ "Ambos --no-clobber y --convert-links fueron especificados, sólo se usará --" "convert-links.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -3005,25 +3019,25 @@ # # 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:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -3035,7 +3049,7 @@ "en combinación con -p o -r. Vea el manual para los detalles.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -3046,7 +3060,7 @@ "se situará en el único fichero que ha especificado.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -3057,14 +3071,14 @@ "para los detalles.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -3072,12 +3086,12 @@ "La salida WARC no funciona con marcas de tiempo, las marcas de tiempo serán " "desactivadas.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "La salida WARC no funciona con --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -3085,7 +3099,7 @@ msgstr "" "La salida WARC no funciona con --continue, --continue será desactivado.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -3093,7 +3107,7 @@ "Los resúmenes están desactivados; deduplicación WARC no encontrará\n" "registros duplicados.\n" -#: src/main.c:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -3101,12 +3115,12 @@ msgstr "" "La salida WARC no funciona con --continue, --continue será desactivado.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3115,17 +3129,17 @@ "No se recomienda especificar al mismo tiempo --start-pos y --continue; --" "continue será desactivada.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: falta la URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3134,7 +3148,7 @@ "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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3143,18 +3157,18 @@ "Debe especificar un método a través de --method=HTTPMethod para usarse con --" "body-data o --body-file.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, 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:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -3162,7 +3176,7 @@ "-k o -r puede ser usado junto con -O sólo si la salida va a un fichero " "regular.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3171,37 +3185,37 @@ "--convert-links o --convert-file-only pueden ser usados juntos sólo si la " "salida va a un fichero regular.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "No se pudo inicializar libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "No se pudo inicializar el canal c-ares\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "No se pudo analizar dirección IP '%s'\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "No se han encontrado URLs en %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "No se pudo analizar el fichero metalink %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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" @@ -3209,7 +3223,7 @@ # `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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3222,7 +3236,7 @@ # ¡Efectivamente! Ahora lo has puesto tu, ... `download'=`descarga' - # cll -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "¡Cuota de descarga de %s EXCEDIDA!\n" @@ -3399,7 +3413,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Continuando en segundo plano, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "La salida será escrita a %s.\n" @@ -3463,64 +3477,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: no se pudo ejecutar “stat†sobre %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "AVISO: usando una semilla aleatoria débil.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "Su versión de OpenSSL es demasiado antigua para soportar TLSv1.1\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: URL inválida %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "No se pudo sembrar el PRNG; considere usar --random-file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Imposible verificar localmente la autoridad emisora.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Certificado auto-firmado encontrado.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " El certificado emitido no es aún válido.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " El certificado emitido ha expirado.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3529,7 +3543,7 @@ "%s: ningún nombre de sujeto alternativo del certificado encaja con\n" "\tel nombre de equipo %s solicitado.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3537,7 +3551,7 @@ " %s: el nombre común %s del certificado no encaja con el nombre de equipo " "%s solicitado.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3549,7 +3563,7 @@ " É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:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Para conectar inseguramente a %s, use `--no-check-certificate'.\n" @@ -3602,22 +3616,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Cargando robots.txt; por favor ignore los errores.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Error analizando la URL del proxy %s: %s\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "Sobrepasadas las %d redirecciones.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3625,7 +3639,7 @@ "Abandonando.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3698,99 +3712,109 @@ msgid "HTTPS support not compiled in" msgstr "El soporte HTTPS no ha sido compilado" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Secuencia multibyte incompleta o inválida\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Continuando en segundo plano, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Fallo al desligar el enlace simbólico %s: %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "No se pudo inicializar libcares\n" -#: src/utils.c:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "No se pudo obtener cookie para %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "No se pudo obtener cookie para %s\n" +msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Expresión regular inválida %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Expresión regular inválida %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Error mientras encajando %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Error al abrir fichero WARC %s.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Error al abrir flujo GZIP a fichero WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Error al escribir registro warcinfo a fichero WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3799,24 +3823,24 @@ "Abriendo fichero WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Error al abrir fichero WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Fichero CDX no lista las urls originales. (Falta la columna 'a'.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Fichero CDX no lista los checksums. (Falta la columna 'k'.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "Fichero CDX no lista los ids de registro. (Falta la columna 'u'.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3831,32 +3855,32 @@ "Cargados registros %d desde CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "No se pudo leer fichero CDX %s para deduplicación.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "No se pudo abrir el fichero WARC temporal de manifiesto.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "No se pudo abrir el fichero WARC temporal de registro.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "No se pudo abrir el fichero WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "No se pudo abrir el fichero CDX para salida.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "No se pudo abrir el fichero WARC temporal.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Dato exacto encontrado en el fichero CDX. Grabando registro de revisitas a " @@ -3877,12 +3901,6 @@ #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: la opción '-W %s' requiere un argumento\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 "Invalid UTF-8 sequence: %s\n" #~ msgstr "Secuencia UTF-8 inválida %s\n" @@ -3896,6 +3914,12 @@ #~ "\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" + # En vez de `falló la autorización' me parece más apropiado # `Autorización denegada' - cll # Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/et.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/et.gmo differ diff -Nru wget-1.19.5/po/et.po wget-1.20.1/po/et.po --- wget-1.19.5/po/et.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/et.po 2018-12-26 20:10:49.000000000 +0000 @@ -1,14 +1,14 @@ # This file is distributed under the same license as the wget package. # Estonian translations for GNU wget. # Copyright (C) 1998 Free Software Foundation, Inc. -# Toomas Soome , 2017. +# Toomas Soome , 2018. # msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.18.109\n" +"Project-Id-Version: GNU wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-01-17 19:42+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-13 23:20+0200\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "Language: et\n" @@ -99,29 +99,29 @@ msgstr "Tundmatu viga" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: võti '%s' on segane\n" +msgstr "%s: võti '%s%s' on segane\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: võti '%s' on arusaamatu; variandid:" +msgstr "%s: võti '%s%s' on arusaamatu; variandid:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: tundmatu võti '%c%s'\n" +msgstr "%s: tundmatu võti '%s%s'\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: võti '%c%s' ei luba argumenti\n" +msgstr "%s: võti '%s%s' ei luba argumenti\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: võti '--%s' nõuab argumenti\n" +msgstr "%s: võti '%s%s' nõuab argumenti\n" #: lib/getopt.c:621 #, c-format @@ -230,17 +230,17 @@ msgid "Unmatched ) or \\)" msgstr ") või \\) paariline puudub" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Eelmist regulaaravaldist pole" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "toru ei õnnestu luua" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -304,7 +304,7 @@ msgid "failed: %s.\n" msgstr "ebaõnnestus: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: hosti aadressi %s ei õnnestu lahendada\n" @@ -427,12 +427,12 @@ msgid "Length: %s" msgstr "Pikkus: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) veel" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s veel" @@ -601,7 +601,7 @@ "Faili või kataloogi %s pole.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s ilmus.\n" @@ -624,17 +624,17 @@ msgid "Data transfer aborted.\n" msgstr "Andmete ülekanne katkestatud.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Fail %s on juba olemas, ei tõmba.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(katse:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -643,7 +643,7 @@ "%s (%s) - kirjutatud standardväljundissse %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -652,8 +652,8 @@ "%s (%s) - %s salvestatud [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Kustutan %s.\n" @@ -749,159 +749,173 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Keelame %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Keelame %s (Vigane kirje).\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s on välistatud või pole kaasatud tänu regulaaravaldisele.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Viga %s otsimisel %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Jokker %s ei anna midagi.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Kirjutasin HTML-iseeritud indeksi faili %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Kirjutasin HTML-iseeritud indeksi faili %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "VIGA: Kataloogi %s ei saa avada.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "VIGA: Ei õnnestu avada sertifikaati %s: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Laetud CA sertifikaat '%s'\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Laetud CRL fail '%s'\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Teie OpenSSL versioon on TLS 1.3 jaoks liiga vana\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: realiseerimata 'secure-protocol' parameetri väärtus %d\n" +msgstr "GnuTLS: realiseerimata 'secure-protocol' parameetri väärtus %u\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: realiseerimata 'secure-protocol' parameetri väärtus %d\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" -msgstr "" +msgstr "GnuTLS: prio seadmine ebaõnnestus. Kasutan vaikimisi prioriteeti.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "VIGA" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "HOIATUS" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s ei esitanud sertifikaati.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Sertifikaat %s ei ole usaldatav.\n" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: %s sertifikaat ei oma tuntud väljastajat.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Sertifikaat %s on kuulutatud kehtetuks.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: %s sertifikaat on aegunud.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Viga X509 sertifikaadi initsialiseerimisel: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Sertifikaati pole.\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Viga sertifikaadi parsimisel: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Sertifikaat pole veel kehtiv\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Sertifikaat on aegunud\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Sertifikaat peab olema X.509\n" @@ -941,11 +955,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "HTTP päringu kirjutamine ebaõnnestus: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Päiseid pole, eeldan HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -954,11 +968,11 @@ "Fail %s on juba olemas, ei tõmba.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime ebaõnnestus. See on tõenäoliselt viga.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -966,55 +980,55 @@ "Ajatemplit ei õnnestu http vormingusse teisendada. Kasutan viimase muutmise " "ajana 0.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY andmete failis %s puudub: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Kasutan ühendust serveriga [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Kasutan ühendust serveriga %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Proksi vastuse lugemine ebaõnnestus: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s VIGA %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Katkine staatuse rida" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Proksi tunneldamine ebaõnnestus: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Tundmatu autentimis skeem.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Valitud autentimine: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Salvestan: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1023,61 +1037,61 @@ "Laadides allkirja:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Ajutise faili loomine ebaõnnestus. Ei lae allkirja.\n" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Vigane pri väärtus. Eeldan %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 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:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Kuna tekkis vigu, siis blokeerin SSLi.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s päring saadetud, ootan vastust... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Andmeid ei saanudki.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Päiste lugemise viga (%s).\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(kirjeldus puudub)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Asukoht: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "määramata" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [järgnev]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1086,7 +1100,7 @@ "Fail %s ei ole serveril muutunud. Ei lae.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1097,7 +1111,7 @@ "Võib olla mõistlik kasutada võtit --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1107,83 +1121,83 @@ " Fail on juba täielikult kohal; rohkem ei saa midagi teha.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Pikkus: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignoreerin" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Hoiatus: HTTP ei toeta jokkereid.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ei saa kirjutada faili %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Laekunud päises puudub nõutud atribuut.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Kasutajanimi/Parool autentimine ebaõnnestus.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Ei saa kirjutada WARC faili.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Ei saa kirjutada ajutisse WARC faili.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "SSL ühenduse loomine ei õnnestu.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ei saa kustutada %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "VIGA: Ãœmbersuunamine (%d) ilma asukohata.\n" -#: src/http.c:4458 +#: src/http.c:4464 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:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Leidsin metalink päised. Lülitan metalink moodi.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Mittelokaalset faili pole -- katkine viide!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified päist pole -- ei kasuta ajatempleid.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified päis on vigane -- ignoreerin ajatemplit.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1192,16 +1206,16 @@ "Fail serveril ei ole uuem lokaalsest failist %s -- ei lae.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Suurused ei klapi (lokaalne %s) -- laen uuesti.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Kauge fail on uuem, laen alla.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1211,13 +1225,13 @@ "laen.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 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:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1227,7 +1241,7 @@ "aga rekursioon pole lubatud -- ei lae.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1235,12 +1249,12 @@ "Kauge fail on olemas.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1249,7 +1263,7 @@ "%s (%s) - %s salvestatud [%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1258,58 +1272,58 @@ "%s (%s) - %s salvestatud [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Ãœhendus suletud baidil %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lugemise viga baidil %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lugemise viga baidil %s/%s (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Mittetoetatud kaitse kvaliteet '%s'.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Mittetoetatud algoritm '%s'.\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, 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" +msgstr "%s: WGETRC viitab failile %s, mille kasutamisel on viga: %s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s ei saa lugeda (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Viga %s's real %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1319,7 +1333,7 @@ "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:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1329,47 +1343,47 @@ "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:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Vigane --execute käsklus %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s %s: Vigane number %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s tohib kasutada ainult korra\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Vigane baidi väärtus %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Vigane aja periood %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1377,28 +1391,28 @@ msgstr "" "use-askpass nõuab sõne või keskkonnamuutujat WGET_ASKPASS või SSH_ASKPASS.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Vigane väärtus %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Vigane päis %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Vigane WARC päis %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Vigane edenemise tüüp %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1412,16 +1426,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Kodeering %s ei ole lubatud\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Leiti mittetäielik või vigane mitmebaidi järjestus\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Käsitlemata errno %d\n" @@ -1454,12 +1468,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; blokeerin logimise.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Kasuta: %s [VÕTI]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1468,64 +1482,64 @@ "lühikestele.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Start:\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help näita abiinfot\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background tööta taustal\n" -#: src/main.c:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Logimine ja sisendfail:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FAIL logi teated faili FAIL\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FAIL lisa teated faili FAIL\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug väljasta silumise teated\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug väljasta Watt-32 silumise teated\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tööta vaikselt\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose lobise (see on vaikimisi)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --non-verbose keela lobisemine, luba asjalikud teated\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1533,14 +1547,14 @@ " --report-speed=TÜÜP läbilaske väljundi tüüp. TÜÜP võib olla " "bitid\n" -#: src/main.c:628 +#: src/main.c:629 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:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1548,11 +1562,11 @@ " --input-metalink=FAIL lae lokaalses Metalink failis näidatud " "failid\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html käsitle sisendfaili HTMLina\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1561,50 +1575,49 @@ "faili\n" " viited (-i -F)\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=FAIL määra seadistuste fail\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-config ära kasuta seadete faile\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr " --rejected-log=FAIL URLide blokeerimise teadete logi\n" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Allalaadimine:\n" -#: src/main.c:649 +#: src/main.c:650 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:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused korda isegi kui ühendusest keeldutakse\n" -#: src/main.c:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=LIST komadega eraldatud loend ignoreeritavaid\n" -" HTML lipikuid\n" +" --retry-on-http-error=VEAD komaga-eraldatud loend HTTP vigadest " +"mille korral korrata\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=FAIL kirjuta dokumendid faili FAIL\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1613,38 +1626,37 @@ "olemasolevad\n" " failid üle\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-config ära kasuta seadete faile\n" +msgstr " --no-netrc ära loe krediite failist .netrc\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" " -c, --continue jätka olemasoleva faili allalaadimist\n" -#: src/main.c:664 +#: src/main.c:665 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:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TÜÜP vali progressi indikaatori tüüp\n" -#: src/main.c:668 +#: src/main.c:669 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:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1652,7 +1664,7 @@ msgstr "" " -N, --timestamping ära tõmba vanemaid faile kui lokaalsed\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1661,7 +1673,7 @@ " --no-if-modified-since ära kasuta tingimust if-modified-since,\n" " kasuta päringutel ajatembeldamist\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1669,54 +1681,54 @@ " --no-use-server-timestamps ära sea lokaalsele failile serveris\n" " oleva faili aega\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response trüki serveri vastused\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider ara tõmba midagi\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -T, --timeout=SEK kõik taimoutid on SEKUNDEID\n" -#: src/main.c:686 +#: src/main.c:687 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:688 +#: src/main.c:689 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:691 +#: src/main.c:692 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:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=SEK ühenduse loomise aegumine on SEK\n" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SEK lugemise aegumine on SEK\n" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDEID oota SEKUNDEID päringute vahel\n" -#: src/main.c:699 +#: src/main.c:700 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:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1724,30 +1736,30 @@ " --random-wait oota korduste vahel " "0.5*SEKUNDIT..1.5*SEKUNDIT\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy proksit ei kasuta\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=NUMBER kasuta kvooti NUMBER\n" -#: src/main.c:707 +#: src/main.c:708 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:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=KIIRUS piira allalaadimise kiirust\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache blokeeri nimeserveri puhver\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1755,7 +1767,7 @@ " --restrict-file-names=OS luba failinimedes ainult OS poolt lubatud " "sümboleid\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1763,15 +1775,15 @@ " --ignore-case failide/kataloogide otsimine on " "tõstutundetu\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only kasuta ainult IPv4 aadresse\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only kasuta ainult IPv6 aadresse\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1780,20 +1792,20 @@ " --prefer-family=PEREK loo ühendus esmalt antud aadressiga,\n" " väärtus on IPv6, IPv4 või none\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password küsi paroole\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1810,26 +1822,26 @@ " WGET_ASKPASS või SSH_ASKPASS keskkonna\n" " muutujat.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri lülita IRI tugi välja\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink eemalda fail\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1837,7 +1849,7 @@ " --keep-badhash säilita kontrollsumma vigadega failid " "(lisa .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1845,7 +1857,7 @@ " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl järjekorra NUMBER\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1853,72 +1865,73 @@ " --metalink-over-http kasuta HTTP päistest Metalink " "metaandmeid\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location Metalink ressursside eelistatud asukoht\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr ära kasuta laiendatud atribuute metainfo " "jaks\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Kataloogid:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories ära loo katalooge\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr "" " -x, --force-directories kohustuslik kataloogide tekitamine\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ära loo hosti kataloogi\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories kasuta kataloogides protokolli nime\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" " -P, --directory-prefix=PREFIX salvesta failid kataloogi PREFIX/...\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" " --cut-dirs=NUMBER ignoreeri NUMBER kataloogi komponente\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP võtmed:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=USER kasuta http kasutajat USER\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=PASS kasuta http parooli PASS\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache keela puhverdamise kasutamine\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1926,7 +1939,7 @@ " --default-page=NIMI muuda vaikimisi lehe nime (tavaliselt\n" " on selleks `index.html'.)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1934,38 +1947,39 @@ " -E, --adjust-extension salvesta HTML/CSS dokumendid korrektse " "lõpuga\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length inoreeri `Content-Length' päise välja\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=SÕNE lisa SÕNE päisesse\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TÜÜP vali progressi indikaatori tüüp\n" +msgstr "" +" --compression=TÜÜP vali tihendamine, auto, gzip ja none. " +"(vaikimisi: none)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maksimaalne ümbersuunamiste arv lehel\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=USER USER proxy kasutajanimeks\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-passwd=PASS PASS proxy parooliks\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -1973,11 +1987,11 @@ " --referer=URL lisa HTTP päringu päisesse `Referer: " "URL'\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers salvesta HTTP päised\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -1985,7 +1999,7 @@ " -U, --user-agent=AGENT identifitseeri kui AGENT, mitte kui\n" " Wget/VERSIOON\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -1993,23 +2007,23 @@ " --no-http-keep-alive blokeeri HTTP keep-alive (püsivad " "ühendused)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ära kasuta präänikuid\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2017,32 +2031,32 @@ " --keep-session-cookies lae ja salvesta sessiooni (ühekordsed)\n" " präänikud\n" -#: src/main.c:820 +#: src/main.c:821 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:822 +#: src/main.c:823 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:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr " --method=HTTPMeetod kasuta päises \"HTTPMeetod\"\n" -#: src/main.c:826 +#: src/main.c:827 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:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2050,7 +2064,7 @@ " --body-file=FAIL saada faili sisu. --method PEAB olema " "seatud\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2060,14 +2074,14 @@ " --content-disposition luba Content-Disposition päist lokaalse\n" " faili nime valikul (EKSPERIMENTAALNE)\n" -#: src/main.c:833 +#: src/main.c:834 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:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2078,12 +2092,11 @@ "et\n" " ootaks serverilt päringut\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) võtmed:\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" @@ -2091,51 +2104,51 @@ msgstr "" " --secure-protocol=PR vali turvaprotokoll, võimalikud auto, " "SSLv2,\n" -" SSLv3, TLSv1 ja PFS\n" +" SSLv3, TLSv1, TLSv1_1, TLSv1_2 ja PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only järgi ainult turvalisi HTTPS viiteid\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate ära valideeri serveri sertifikaati\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FAIL kliendi sertifikaat\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --privare-key=FAIL privaatvõti\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FAIL CA nimekirja fail\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr " --ca-directory=KAT CA nimekirja kataloog\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FAIL CRL fail\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2149,20 +2162,20 @@ " 'sha256//' ja eraldajaga ';', millega\n" " konrtollida partnerit\n" -#: src/main.c:871 +#: src/main.c:872 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:875 +#: src/main.c:876 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:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2171,27 +2184,33 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=STR Sea prioriteedi sõne (GnuTLS) või Å¡ihvri " +"loendi sõne (OpenSSL) otse.\n" +" Kasutada ettevaatlikult. See võti muudab " +"võtit --secure-protocol.\n" +" Vorming ja süntaks sõltub konkreetsest " +"SSL/TLS mootorist.\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "HSTS võtmed:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts keela HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" " --hsts-file HSTS andmebaas (vaikeväärtuse asemel)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP võtmed:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2199,34 +2218,34 @@ " --ftp-stmlf kasuta binaar moodis FTP failide jaoks\n" " Stream_LF vormingut\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=USER sea ftp kasutaja\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASS sea ftp parool\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ära eemalda `.listing' faile\n" -#: src/main.c:907 +#: src/main.c:908 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:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp ei kasuta \"passive\" ülekande moodi\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions säilita kauge faili õigused\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2234,18 +2253,18 @@ " --retr-symlinks lae ka failide nimeviited\n" " (mitte kataloogidele)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTPS võtmed:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" " --ftps-implicit kasuta FTPS protokolli (port 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2255,7 +2274,7 @@ "ühendusel\n" " loodud SSL/TLS sessiooni\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2263,18 +2282,18 @@ " --ftps-clear-data-connection Å¡ifreeri ainult kontroll kanal; " "andmed on avatekstis\n" -#: src/main.c:927 +#: src/main.c:928 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:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC võtmed:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2282,21 +2301,21 @@ " --warc-file=FAILINIMI salvesta päring/vastus info .warc.gz " "faili\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx kirjuta CDX indeks failid\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2304,23 +2323,23 @@ " --warc-dedup=FAILINIMI ära salvesta selles CDX failis olevaid\n" " kirjeid\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ära arvuta SHA1 räsi\n" -#: src/main.c:949 +#: src/main.c:950 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:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2328,15 +2347,15 @@ msgstr "" " --warc-tempdir=KATALOOG WARC kirjutaja ajutiste failide asukoht\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekursiivne allalaadimine:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive rekursiivne allalaadimine\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2344,13 +2363,13 @@ " -l, --level=NUMBER maksimaalne rekursiooni sügavus\n" " (inf või 0 lõpmatu)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after kustuta allalaetud failid\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2360,7 +2379,7 @@ "viited\n" " viitama lokaalsetele failidele\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2368,7 +2387,7 @@ " --convert-file-only teisenda ainult faili osa URL'is (tuntud " "kui baasnimi)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2376,7 +2395,7 @@ " --backups=N enne faili X kirjutamist, roteeri kuni\n" " N varukoopiat\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2384,7 +2403,7 @@ " -K, --backup-converted enne faili X teisendamist salvesta\n" " failiks X_orig\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2392,7 +2411,7 @@ " -K, --backup-converted enne faili X teisendamist salvesta\n" " failiks X.orig\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2400,7 +2419,7 @@ " -m, --mirror lühend võtmetele\n" " -N -r -l inf --no-remove-listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2408,7 +2427,7 @@ " -p, --page-requisites lae kõik HTML lehe vaatamiseks vajalik " "info\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2416,61 +2435,61 @@ " --strict-comments lülita sisse range (SGML) HTML\n" " kommentaaride käsitlemine\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Rekursiivne accept/reject:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=LIST lubatud laienduste nimistu\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=LIST keelatud laienduste nimistu\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGAV aktsepteeritavate URLide regulaaravaldis\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=REGAV keelatud URLide regulaaravaldis\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TÜÜP regulaaravaldise tüüp (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TÜÜP regulaaravaldise tüüp (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LIST komadega eraldatud lubatud doomenite " "loend\n" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LIST komadega eraldatud keelatud doomenite " "loend\n" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp järgne HTML dokumentides FTP viidetele\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2478,7 +2497,7 @@ " --follow-tags=LIST komadega eraldatud loend järgitavaid\n" " HTML lipikuid\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2486,19 +2505,19 @@ " --ignore-tags=LIST komadega eraldatud loend ignoreeritavaid\n" " HTML lipikuid\n" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr " -H, --span-hosts mine ka teistesse serveritesse\n" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative järgne ainult suhtelisi viiteid\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LIST lubatud kataloogide nimistu\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2506,88 +2525,89 @@ msgstr "" " --trust-server-names kasuta ümbersuunamisel määratud nime\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LIST välistatud kataloogide nimistu\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" msgstr "Saatke soovitused ja vigade kirjeldused aadressil \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"ja/või avatud probleemid aadressil https://savannah.gnu.org/bugs/?" +"func=additem&group=wget.\n" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Parool kasutajale %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Parool: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Toru ei õnnestu luua\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Kasutajanimi '%s%s': " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Parool kasutajale '%s%s@%s': " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Lokaat: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Kompileeritud:" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Lingitud:" -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2596,29 +2616,29 @@ "GNU Wget %s ehitatud süsteemil %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (keskkond)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (kasutaja)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Autoriõigus © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2632,7 +2652,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2640,37 +2660,37 @@ "\n" "Selle programmi kirjutas Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "" "Palun saatke vigade kirjeldused ja küsimused aadressil .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Mälu ei jätku\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Lõpetan %s vea tõttu\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Täiendava info saamiseks proovige `%s --help'.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: illegaalne võti -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2679,7 +2699,7 @@ "Kasutati korraga --no-clobber ja --convert-links, kasutan ainult --convert-" "links.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2688,22 +2708,22 @@ "Kasutati korraga --no-clobber ja --convert-file-only, kasutan ainult --" "convert-file-only.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2716,7 +2736,7 @@ "manualist.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2726,7 +2746,7 @@ "salvestatakse teie poolt määratud ühte faili.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2736,25 +2756,25 @@ "manualist.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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:1699 +#: src/main.c:1700 #, 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:1706 +#: src/main.c:1707 #, 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:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2763,28 +2783,28 @@ "WARC väljund ei tööta võtmetega --continue, --start-pos, need " "blokeeritakse.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, 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:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"WARC väljund ei tööta võtmetega --continue, --start-pos, need " +"Tihendamine ei tööta võtmetega --continue või --start-pos, need " "blokeeritakse.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2793,17 +2813,17 @@ "Korraga --start-pos ja --continue kasutamine pole soovitatav; --continue " "blokeeritakse.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: puudub URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2812,7 +2832,7 @@ "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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2821,17 +2841,17 @@ "--body-data või --body-file korral tuleb määrata meetod võtmega --" "method=HTTPMeetod.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "See versioon ei toeta IRIsid\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2840,7 +2860,7 @@ "suunatud\n" "tavalisse faili.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2849,42 +2869,42 @@ "--convert-links või --convert-file-only saab koos kasutada ainult juhul, kui " "väljund on suunatud tavalisse faili.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "libcares initsialiseerimine ebaõnnestus\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Ei õnnestu seadistada c-ares kanalit\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "IP aadressi '%s' ei õnnestu parsida\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Ei õnnestu seada DNS serverit '%s' (%d)\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "%s ei sisalda URLe.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Metalink faili %s parsimine ei õnnestu.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2895,7 +2915,7 @@ "Täielik aeg: %s\n" "Alla laetud: %d faili, %s aeg %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Allalaadimise kvoot %s ON ÃœLETATUD!\n" @@ -3061,7 +3081,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Jätkan taustal, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Väljund kirjutatakse faili %s.\n" @@ -3106,64 +3126,62 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: stat operatsioon ebaõnnestus %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "HOIATUS: vilets juhuarvude alginfo.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Ei õnnestu laadida PRNGd; kasutage --random-file.\n" -#: src/openssl.c:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "Teie OpenSSL versioon on TLSv1.1 jaoks liiga vana\n" +msgstr "Teie OpenSSL versioon on TLSv1.3 jaoks liiga vana\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: realiseerimata 'secure-protocol' parameetri väärtus %d\n" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: Vigane URL %s: %s\n" +msgstr "OpenSSL: Vigane Å¡ifri loend: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "Ei õnnestu laadida PRNGd; kasutage --random-file.\n" +msgstr "HOIATUS: Ei õnnestu laadida PRNGd; kasutage --random-file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Väljastaja autoriteeti ei saa kontrollida.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Leiti ise-allkirjastatud sertifikaat.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Välja antud sertifikaat pole veel kehtiv.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Välja antud sertifikaat on aegunud.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3172,14 +3190,14 @@ "%s: sertifikaadi subjekti alternatiivne nimi ei klapi\n" "\tküsitud hosti nimega %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, 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:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3190,7 +3208,7 @@ " 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:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3241,28 +3259,28 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Laen robots.txti faili; palun ignoreerige võimalikk vigu.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Viga proxy urli parsimisel %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Viga proxy urlis %s: Peab olema HTTP.\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d ümbersuunamist ületatud.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" msgstr "Annan alla.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3330,97 +3348,108 @@ msgid "HTTPS support not compiled in" msgstr "HTTPS tuge pole sisse kompileeritud" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "Leiti mittetäielik või vigane mitmebaidi järjestus\n" +msgstr "Leiti mitteteisendatav mitmebaidi järjestus\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Jätkan taustal, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ei õnnestu kustutada nimeviidet %s: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "libcares initsialiseerimine ebaõnnestus\n" +msgstr "Faili %s fopen sai vea\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "%s õiguseid ei õnnestu seada.\n" +msgstr "Faili %s deskriptorit ei õnnestu saada\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "%s õiguseid ei õnnestu seada.\n" +msgstr "Faili %s atribuute ei õnnestu lugeda (kontrollige õiguseid)\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Fail %s on peale viimast kontrolli muutunud. Turvakontroll ebaõnnestus." -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "IP aadressi '%s' ei õnnestu parsida\n" +msgstr "Faili %s ei õnnestu avada: %s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "%s õiguseid ei õnnestu seada.\n" +msgstr "Faili %s atribuute ei õnnestu lugeda, viga: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"Proovin avada faili %s aga see on peale viimast kontrolli muutunud. " +"Turvakontroll ebaõnnestus." -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Vigane regulaaravaldis %s, PCRE2 viga %d\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Vigane regulaaravaldis %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Viga %s leidmisel: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "Jätan vale suurusega võtme vahele (%d/%d): %s\n" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Viga WARC faili pideme dubleerimisel.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Viga GZIP voo WARC faili avamisel.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Viga warcinfo kirje WARC faili kirjutamisel.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3429,24 +3458,24 @@ "Avan WARC faili %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Viga WARC faili %s avamisel.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "CDX failis pole algseid URLe. (Puudub veerg 'a'.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "CDX failis pole kontrollsummasid. (Puudub veerg 'k'.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "CDX failis pole kirjete infot. (Puudub veerg 'u'.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3461,51 +3490,33 @@ "Laetud %d kirjet CDX failist.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "deduplitseerimisel CDX faili %s lugemine ebaõnnestus.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Ajutise WARC manifesti faili avamine ebaõnnestus.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Ajutise WARC logi faili avamine ebaõnnestus.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "WARC faili avamine ebaõnnestus.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "CDX faili ei õnnestu kirjutamiseks avada.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Ajutise WARC faili avamine ebaõnnestus.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" 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" diff -Nru wget-1.19.5/po/eu.po wget-1.20.1/po/eu.po --- wget-1.19.5/po/eu.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/eu.po 2018-12-26 20:10:49.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: wget 1.14.128\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2013-06-14 00:35+0100\n" "Last-Translator: Mikel Olasagasti Uranga \n" "Language-Team: Basque \n" @@ -241,17 +241,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -315,7 +315,7 @@ msgid "failed: %s.\n" msgstr "huts egin da: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" @@ -440,12 +440,12 @@ msgid "Length: %s" msgstr "Luzeera: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr "" @@ -614,7 +614,7 @@ "Ez dago `%s' fitxategi edo direktoriorik.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "" @@ -637,24 +637,24 @@ msgid "Data transfer aborted.\n" msgstr "Datu transferentzia abortatua.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "`%s' fitxategia dagoeneko badago, ez da jasoko.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(saiatu:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -663,8 +663,8 @@ "%s (%s) - %s gordeta [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "%s ezabatzen.\n" @@ -759,160 +759,174 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "`%s' ez onartzen.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "`%s' ez onartzen.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "Ez jaisten `%s'ra, ez baitago sartua edo exkluditua dago.\n" + +#: src/ftp.c:2645 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "Errorea `%s' idazterakoan: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "`%s' ereduarekin ez du lotzen.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Idatzia HTMLizatutako index-a `%s'-en [%ld].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Idatzia HTMLzatutako index-a '%s'-en.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "%s-tik zertifikazioak kargatzerakoan huts egin da\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Bidali bug-ak eta iradokizunak -era.\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ERROREA" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Proxy URLa parseatzen errorea %s: %s.\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -952,145 +966,145 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Huts egin da HTTP eskaera idazterakoan: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1620 +#: src/http.c:1623 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "`%s' fitxategia dagoeneko badago, ez da jasoko.\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2087 +#: src/http.c:2090 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Konexioa berrerabiltzen %srentzat: %hu.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Konexioa berrerabiltzen %srentzat: %hu.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr "Huts egin da HTTP eskaera idazterakoan: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROREA %d %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Gaizki eratutako egoera lerroa" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Autentifikazio eskema ezezaguna.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Autentifikazio eskema ezezaguna.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Hemen gordetzen: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s eskaera bidalia, erantzunaren zain... " -#: src/http.c:3392 +#: src/http.c:3395 #, fuzzy msgid "No data received.\n" msgstr "Ez da daturik jaso" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Irakurketa errorea (%s) goiburukoetan.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(deskripziorik gabe)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Kokapena: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "zehaztugabea" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [hurrengoa]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1098,7 +1112,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1108,81 +1122,81 @@ " Fitxategi hau iada guztiz jasoa dago; ezer ez egiteko.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Luzera: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "baztertua" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Oharra: komodinak ez daude onartuak HTTPean.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4387 +#: src/http.c:4380 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Ezinezkoa SSL konexioa sortzea.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROREA: (%d) helbideraketa kokapenik gabe.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Azken·burugoiko·modifikazitua falta da·-·ordu·zigilua·itzalia.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Azken burugoiko modifikazioa baliogabekoa - ordu zigilua ignoratua.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1192,16 +1206,16 @@ "da jasoko.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Fitxategi erremotoa berriagoa da, jasotzen.\n" -#: src/http.c:4607 +#: src/http.c:4615 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1209,7 +1223,7 @@ "\n" msgstr "`%s' fitxategi erremotoa bertakoa baina berriagoa da -- jasotzen.\n" -#: src/http.c:4613 +#: src/http.c:4621 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" @@ -1217,33 +1231,33 @@ msgstr "" "`%s' fitxategi erremotoa ez da bertakoa baina berriagoa -- ez da jasoko.\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4628 +#: src/http.c:4636 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "Fitxategi erremotoa berriagoa da, jasotzen.\n" -#: src/http.c:4637 +#: src/http.c:4645 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ERROREA %d %s.\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4688 +#: src/http.c:4696 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1252,58 +1266,58 @@ "%s (%s) - `%s' gordeta [%ld/%ld]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Konexioa itxia ondorengo bytean %ld. " -#: src/http.c:4772 +#: src/http.c:4780 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Irakurtze errorea %ld bytean (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Sostengu gabeko eskema" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ezin irakurri %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: %s-n errorea %d lerroan.\n" -#: src/init.c:708 +#: src/init.c:701 #, fuzzy, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: %s-n errorea %d lerroan.\n" -#: src/init.c:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1311,7 +1325,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1319,75 +1333,75 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Baliogaeko --exekutatu`%s' komandoa\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Baliogabeko zenbakia `%s'.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Baliogabeko byte balioa `%s'\n" -#: src/init.c:1379 +#: src/init.c:1373 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Baliogabeko denbora tartea `%s'\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Baliogabeko balioa `%s'.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Baliogabeko goiburukoa `%s'.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Baliogabeko goiburukoa `%s'.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Baliogabeko aurreratze mota `%s'.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1399,16 +1413,16 @@ msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "" @@ -1441,12 +1455,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; saio hasiera desgaitzen.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Erabili: %s [AUKERA]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1456,297 +1470,297 @@ "Aginduzko argumentu luzeegiak aukera txikientzako agindu ere badira.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:653 +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:660 +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 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:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1757,211 +1771,211 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Direktorioak:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:795 +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1969,13 +1983,13 @@ "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1983,58 +1997,58 @@ " challenge\n" msgstr "" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:844 +#: src/main.c:845 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:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2044,19 +2058,19 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2066,400 +2080,400 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Bidali bug-ak eta iradokizunak -era.\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Pasahitza:" -#: src/main.c:1103 +#: src/main.c:1104 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Locale-a:" -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Konpilazioa:" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Esteka:" -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2003 Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2469,7 +2483,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2477,67 +2491,67 @@ "\n" "Originalki Hrvoje Niksic-k idatzia .\n" -#: src/main.c:1337 +#: src/main.c:1338 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Bidali bug-ak eta iradokizunak -era.\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Saiatu `%s --help` aukera gehiagorako.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: legez kanpoko aukera -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2545,152 +2559,152 @@ "\n" msgstr "" -#: src/main.c:1666 +#: src/main.c:1667 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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL falta\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Huts egin da `%s' link sinbolikoa askatzerakoan: %s\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Ez da URLrik aurkitu %s-n.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ezin da `%s' ezabatu: %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2701,7 +2715,7 @@ "AMAITUTA --%s--\n" "Jatsitakoa: %s byte %d fitxategietan\n" -#: src/main.c:2271 +#: src/main.c:2278 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Jaitsiera kuota (%s byte) GAINDITUA!\n" @@ -2869,7 +2883,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Atzeko planoan jarraitzen, pid %d.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Irteera `%s'-n idatziko da.\n" @@ -2914,77 +2928,77 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: ezin da identifikatu %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:190 +#: src/openssl.c:192 #, fuzzy msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Ezin da OpenSSL PRNG hasi, SSL ezintzen.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: Baliogabeko URLa %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "Ezin da OpenSSL PRNG hasi, SSL ezintzen.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2992,7 +3006,7 @@ " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3042,22 +3056,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Robots.txt kargatzen; mesedez ignoratu erroreak.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Proxy URLa parseatzen errorea %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d erredirekzio kopurua gainditua.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3065,7 +3079,7 @@ "Utzitzen.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3133,120 +3147,130 @@ msgid "HTTPS support not compiled in" msgstr "%s: ez dago debug euskarriarekin konpilatua.\n" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Atzeko planoan jarraitzen, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Huts egin da `%s' link sinbolikoa askatzerakoan: %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, 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:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, 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:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Errorea `%s' idazterakoan: %s\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Proxy URLa parseatzen errorea %s: %s.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, fuzzy, c-format msgid "Error opening WARC file %s.\n" msgstr "Proxy URLa parseatzen errorea %s: %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3257,32 +3281,32 @@ msgstr[0] "" msgstr[1] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" @@ -3295,10 +3319,6 @@ #~ msgstr "%s: aukera·ezezaguna `--%s'\n" #, fuzzy -#~ msgid "%s: option '-W %s' is ambiguous\n" -#~ msgstr "%s: `-W %s' aukera anbiguoa da\n" - -#, fuzzy #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: `-W %s' aukerak ez du argudiorik onartzen\n" @@ -3306,10 +3326,6 @@ #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: `%s' aukerak argudio bat behar du\n" -#, fuzzy -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "`%s' fitxategia dagoeneko badago, ez da jasoko.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Autorizazitzen huts egin da.\n" @@ -3320,6 +3336,10 @@ #~ msgstr "Ez da daturik jaso" #, 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" #~ msgstr "%s: Ezin da osatu gabeko linka ebatzi %s.\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/fi.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/fi.gmo differ diff -Nru wget-1.19.5/po/fi.po wget-1.20.1/po/fi.po --- wget-1.19.5/po/fi.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/fi.po 2018-12-26 20:10:49.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: wget 1.16.1.46\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2015-04-16 20:27+0200\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" @@ -234,17 +234,17 @@ msgid "Unmatched ) or \\)" msgstr "Pariton ) tai \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Virheellinen edeltävä säännöllinen lauseke" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "putken luominen epäonnistui" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -308,7 +308,7 @@ msgid "failed: %s.\n" msgstr "epäonnistui: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: verkkoasemaosoitteen %s ratkaiseminen epäonnistui\n" @@ -431,12 +431,12 @@ msgid "Length: %s" msgstr "Pituus: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) jäljellä" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s jäljellä" @@ -605,7 +605,7 @@ "Tiedostoa tai hakemistoa %s ei ole.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s on ilmestynyt.\n" @@ -628,17 +628,17 @@ msgid "Data transfer aborted.\n" msgstr "Tiedonsiirto keskeytetty.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Tiedostoa %s ei noudeta, koska se on jo paikalla.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(yritys:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -647,7 +647,7 @@ "%s (%s) - kirjoitettu vakiotulosteeseen %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -656,8 +656,8 @@ "%s (%s) - %s tallennettu [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Poistetaan %s.\n" @@ -755,159 +755,174 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Hylätään %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Hylätään %s.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "Hakemiston %s sisältöä ei noudeta, koska se on hylätty.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Virhe kohteessa %s; se on erilainen kuin %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Hakulause %s ei löytänyt mitään.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "HTML-muotoiltu indeksi on kirjoitettu tiedostoon %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "HTML-muotoiltu indeksi on kirjoitettu tiedostoon %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "VIRHE: Hakemiston %s avaaminen epäonnistui.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "VIRHE: Varmenteen %s: (%d) avaaminen epäonnistui.\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Ladattu CA-varmenne ’%s’\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Ladattu CRL-tiedosto ’%s’\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "OpenSSL-versiosi on liian vanha tukemaan TLSv1.1-yhteyskäytäntöä\n" + +#: src/gnutls.c:676 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: toteuttamaton ’secure-protocol’-valitsinarvo %d\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: toteuttamaton ’secure-protocol’-valitsinarvo %d\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "VIRHE" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "VAROITUS" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s ei esittänyt varmennetta.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Varmenne %s ei ole luotettava.\n" -#: src/gnutls.c:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Varmenteella %s ei ole tunnettua julkaisijaa.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Varmenne %s on vanhentunut.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Varmenne %s on vanhentunut.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Virhe alustettaessa X509-varmennetta: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Varmennetta ei löytynyt\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Virhe jäsennettäessä varmennetta: %s.\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Varmenne ei ole vielä voimassa\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Varmenne on vanhentunut\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Varmenteen on oltava X.509\n" @@ -947,11 +962,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "HTTP-pyynnön kirjoitus epäonnistui: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Ei otsakkeita, oletetaan HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -960,133 +975,133 @@ "Tiedostoa %s ei noudeta, koska se on jo paikalla.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY data-tiedosto %s puuttuu: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Käytetään uudelleen yhteyttä [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Käytetään uudelleen yhteyttä %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Vastaanotto välityspalvelimelta epäonnistui: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s VIRHE %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Väärin muotoiltu Status-otsake" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Välityspalvelintunnelointi epäonnistui: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Tuntematon todennusjärjestelmä.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Todennus valittu: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Tallennetaan kohteeseen %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL otetaan pois päältä tapahtuneiden virheiden johdosta.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-pyyntö lähetetty, odotetaan vastausta... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Yhtään dataa ei vastaanotettu.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Lukuvirhe (%s) otsakkeissa.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(ei kuvausta)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Sijainti: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "määrittelemätön" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [seurataan]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1094,7 +1109,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1104,81 +1119,81 @@ " Tiedosto on jo kokonaan noudettu.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Pituus: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "jätetty huomiotta" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Varoitus: HTTP ei tue jokerimerkkejä.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Hakurobottitila aktivoitu. Tarkista, onko etätiedosto olemassa.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kirjoittaminen tiedostoon %s epäonnistui (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Vastaanotetusta otsakkeesta puuttuu vaadittu attribuutti.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Käyttäjätunnus-/Salasanatodennus epäonnistui.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "WARC-tiedostoon kirjoittaminen epäonnistui.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Tilapäiseen WARC-tiedostoon kirjoittaminen epäonnistui.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "SSL-yhteyden muodostaminen ei onnistunut.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Linkin %s (%s) purkaminen epäonnistui.\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "VIRHE: Edelleenohjaus (%d) ilman sijaintia.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Etätiedostoa ei ole – rikkinäinen linkki!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "â€Last-modifiedâ€-otsake puuttuu – aikaleimat poistettu käytöstä.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "â€Last-modifiedâ€-otsake on virheellinen – aikaleima jätetty huomiotta.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1187,16 +1202,16 @@ "Palvelimen tiedosto %s ei ole paikallista uudempi – ei noudeta.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Etätiedosto on uudempi, noudetaan.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1206,7 +1221,7 @@ "noudetaan.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1215,7 +1230,7 @@ "\n" # Tämä kuten useat aiemmat yllä ovat lokitiedostorivejä, joilla kommentoidaan hakurobotin tekemisiä ja tekemättä jättämisiä. -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1225,7 +1240,7 @@ "Rekursio ei kuitenkaan ole käytössä, joten linkkejä ei seurata.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1233,12 +1248,12 @@ "Etätiedosto on olemassa.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s VERKKO-OSOITE: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1247,7 +1262,7 @@ "%s (%s) - kirjoitettu vakiotulosteeseen %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1256,58 +1271,58 @@ "%s (%s) - %s tallennettu [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Yhteys suljettu tavun %s kohdalla. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lukuvirhe tavun %s kohdalla (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lukuvirhe tavun %s/%s kohdalla (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Tukematon suojauslaatu ’%s’.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Tukematon algoritmi ’%s’.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kohteen %s (%s) lukeminen epäonnistui.\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Virhe kohdassa %s rivillä %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaksivirhe kohdassa %s rivillä %d.\n" -#: src/init.c:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1319,7 +1334,7 @@ "'%s',\n" "tai määritä eri tiedosto valitsimella --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1330,77 +1345,77 @@ "'%s',\n" "tai määritä eri tiedosto valitsimella --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Komento --execute %s on virheellinen\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Numero %s on virheellinen.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s on käytettävä vain kerran\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Tavun arvo %s on virheellinen.\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Aikaväli %s on virheellinen\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Arvo %s on virheellinen.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Otsake %s on virheellinen.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Virheellinen WARC-otsake %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Edistymistyyppi %s on virheellinen.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1414,16 +1429,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Koodaus %s on virheellinen\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Kohdattu puutteellinen tai virheellinen monitavusekvenssi\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Käsittelemätön errno-virhenumero %d\n" @@ -1456,12 +1471,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; loki poistettu käytöstä.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Käyttö: %s [VALITSIN]... [VERKKO-OSOITE]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1469,67 +1484,67 @@ "Pakolliset argumentit pitkille valitsimille ovat pakollisia myös lyhyille.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Käynnistys:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version näytä Wget-versio ja lopeta\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help näytä tämä ohje\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background siirry taustalle käynnistyksen jälkeen\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=KOMENTO suorita â€.wgetrcâ€-tyylinen komento\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Loki- ja syötetiedostot:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=TIEDOSTO kirjaa viestit TIEDOSTOon\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=TIEDOSTO lisää viestit TIEDOSTOon\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug näytä paljon vianetsintätietoja\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug näytä â€Watt-32â€-virheenjäljitystuloste\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet ole hiljaa (ei tulostusta)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose näytä yksityiskohtia (oletus)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose ei yksityiskohtia, muttei hiljainen\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1537,7 +1552,7 @@ " --report-speed=TYYPPI Tulosta kaistanleveys TYYPPInä. TYYPPI voi " "olla bittejä\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1545,7 +1560,7 @@ " -i, --input-file=TIEDOSTO lataa paikalliset tai ulkoisesta\n" " TIEDOSTOsta löydetyt verkko-osoitteet\n" -#: src/main.c:631 +#: src/main.c:632 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1554,11 +1569,11 @@ " --metalink-file lataa paikalliset tai ulkoisesta metalink-" "TIEDOSTOsta löydetyt verkko-osoitteet.\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html käsittele syötetiedosto HTML:nä\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1567,51 +1582,51 @@ "F)\n" " VERKKO-OSOITE-osoitteen suhteen\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=TIEDOSTO Määritä käytettävä config-tiedosto\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-cookies älä lue mitään config-tiedostoa\n" -#: src/main.c:643 +#: src/main.c:644 #, 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Noutaminen:\n" -#: src/main.c:649 +#: src/main.c:650 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:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused yritä uudelleen vaikka yhteys " "torjuttaisiin\n" -#: src/main.c:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr " --ignore-tags=LISTA lista ohitettavista HTML-tageista\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=TIEDOSTO kirjoita dokumentit TIEDOSTOon\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1619,14 +1634,14 @@ " -nc, --no-clobber ohita noudot, jotka korvaisivat jo\n" " olemassaolevia tiedostoja\n" -#: src/main.c:660 +#: src/main.c:661 #, 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:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1634,7 +1649,7 @@ " -c, --continue jatka osittain noudetun tiedoston " "noutamista\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1642,11 +1657,11 @@ " --start-pos=OFFSET aloita lataaminen nollaperustaisesta " "OFFSET-osoitteesta\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYYPPI valitse edistymismittarin tyyppi\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1654,7 +1669,7 @@ " --show-progress näytä edistymispalli kaikissa " "tulostustiloissa\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1663,7 +1678,7 @@ " -N, --timestamping nouda vain paikallista uudemmat " "tiedostot\n" -#: src/main.c:673 +#: src/main.c:674 #, fuzzy msgid "" " --no-if-modified-since don't use conditional if-modified-since " @@ -1674,7 +1689,7 @@ "aikaleimaa\n" " palvelimen aikaleimalla\n" -#: src/main.c:676 +#: src/main.c:677 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1684,25 +1699,25 @@ "aikaleimaa\n" " palvelimen aikaleimalla\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response näytä palvelimen vastaus\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider älä nouda mitään\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -T, --timeout=SEKUNTIA kaikkien aikakatkaisujen pituus\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1711,24 +1726,24 @@ " --bind-address=OSOITE liitä (verkkoasema- tai IP-) OSOITE " "paikallisesti\n" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEKUNTIA nimipalveluhaun aikakatkaisun pituus\n" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=SEKUNTIA yhdistämisen aikakatkaisun pituus\n" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SEKUNTIA vastaanoton aikakatkaisun pituus\n" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNTIA odota SEKUNTIA noutojen välillä\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1736,7 +1751,7 @@ " --waitretry=SEKUNTIA odota 1...SEKUNTIA noutojen " "uudelleenyritysten välillä\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1744,15 +1759,15 @@ " --random-wait odota 0.5*WAIT...1.5*WAIT sekuntia " "noutojen välillä\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy välityspalvelin pois päältä\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=LUKU noutokiintiön koko\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1760,17 +1775,17 @@ " --bind-address=OSOITE liitä (verkkoasema- tai IP-) OSOITE " "paikallisesti\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=NOPEUS rajoita noutoNOPEUS\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache älä säilytä nimipalvelutietoja " "välimuistissa\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1778,7 +1793,7 @@ " --restrict-file-names=KJ käytä vain käyttöjärjestelmän\n" " sallimia tiedostonimiä\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1787,17 +1802,17 @@ "verrataan\n" " tiedostoja/hakemistoja\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" " -4, --inet4-only ota yhteyttä vain IPv4-osoitteisiin\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" " -6, --inet6-only ota yhteyttä vain IPv6-osoitteisiin\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1807,20 +1822,20 @@ "osoitteeseen,\n" " vaihtoedot: IPv6, IPv4 tai none\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=SALASANA FTP- ja HTTP-salasana\n" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --password=SALASANA kehote salasanoille\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1831,112 +1846,112 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri IRI-tuki pois päältä\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink poista tiedosto ennen päällekirjoitusta\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 #, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" -msgstr " --no-glob älä täydennä tiedostonimiä\n" +msgstr " --warc-cdx kirjoita CDX-indeksitiedostot\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Hakemistot:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories älä luo hakemistoja\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories pakotettu hakemistojen luonti\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories älä luo verkkoasemahakemistoja\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories käytä yhteyskäytännön nimeä " "hakemistoissa\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" " -P, --directory-prefix=ETULIITE tallenna tiedostot hakemistoon " "ETULIITE/..\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr " --cut-dirs=LUKU ohita ensimmäiset LUKU hakemistoa\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP-valitsimet:\n" -#: src/main.c:779 +#: src/main.c:780 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:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-passwd=SALASANA HTTP-salasana\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache älä käytä palvelimelle välivarastoitua " "dataa\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1944,7 +1959,7 @@ " --default-page=NIMI Vaihda oletussivun nimi (normaalisti\n" " se on â€index.htmlâ€.)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1952,41 +1967,40 @@ " -E, --adjust-extension tallenna HTML/CSS-dokumentit oikeilla " "tiedostonimipäätteillä\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length älä välitä â€Content-Lengthâ€-" "otsakekentästä\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=MERKKIJONO lisää MERKKIJONO otsakkeiden sekaan\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TYYPPI valitse edistymismittarin tyyppi\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect uudelleenohjausten sallittu maksimimäärä " "sivua kohden\n" -#: src/main.c:800 +#: src/main.c:801 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:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-passwd=SALASANA välityspalvelimen salasana\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -1994,12 +2008,12 @@ " --referer=VERKKO-OSOITE liitä â€Referer: URLâ€-otsake HTTP-" "pyyntöön\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers tallenna HTTP-otsakkeet tiedostoon\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2007,30 +2021,30 @@ " -U, --user-agent=AGENTTI tunnistaudu Wget/version sijasta AGENTTI-" "käyttäjäksi\n" -#: src/main.c:810 +#: src/main.c:811 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:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies älä käytä evästeitä\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2038,7 +2052,7 @@ " --keep-session-cookies hae ja tallenna (väliaikaiset) " "istuntoevästeet\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2046,7 +2060,7 @@ " --post-data=MERKKIJONO käytä POST-metodia; lähetä MERKKIJONO " "datana\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2054,13 +2068,13 @@ " --post-file=TIEDOSTO käytä POST-metodia; lähetä TIEDOSTOn " "sisältö\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod käytä metodia â€HTTPMethod†otsakkeessa\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2068,7 +2082,7 @@ " --body-data=MERKKIJONO Lähetä MERKKIJONO datana. Valitsin --" "method ON asetettava\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2076,7 +2090,7 @@ " --body-file=TIEDOSTO Lähetä TIEDOSTOn sisältö. Valitsin --" "method ON asetettava\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2088,7 +2102,7 @@ " valitaan paikalliset tiedostonimet " "(KOKEELLINEN)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2097,7 +2111,7 @@ "palvelinvirheinä\n" # Challenge viittaa tässä ilmeisesti challenge-response method eli haastemenetelmään -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2108,11 +2122,11 @@ " odottamatta ensin palvelimen\n" " haastetta\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) -valitsimet:\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2122,51 +2136,51 @@ " --secure-protocol=PR valitse turvayhteyskäytäntö, vaihtoehdot:\n" " auto, SSLv2, SSLv3, TLSv1 ja PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only seuraa vain turvallisia HTTPS-linkkejä\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate älä tarkista palvelimen varmennetta\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=TIEDOSTO asiakasvarmenne\n" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYYPPI asiakasvarmenteen tyyppi: PEM tai DER\n" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=TIEDOSTO salainen avain\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=TIEDOSTO juurivarmennekokoelma\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr " --ca-directory=HAKEMISTO juurivarmenteiden hajautuslista\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=TIEDOSTO juurivarmennekokoelma\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2176,21 +2190,21 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 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:875 +#: src/main.c:876 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:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2200,30 +2214,30 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 #, fuzzy msgid "HSTS options:\n" msgstr "HTTP-valitsimet:\n" -#: src/main.c:888 +#: src/main.c:889 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr "" " --no-cache älä käytä palvelimelle välivarastoitua " "dataa\n" -#: src/main.c:890 +#: src/main.c:891 #, fuzzy msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr " -v, --verbose näytä yksityiskohtia (oletus)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP-valitsimet:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2231,34 +2245,34 @@ " --ftp-stmlf Käytä â€Stream_LFâ€-muotoa kaikille " "binäärisille FTP-tiedostoille\n" -#: src/main.c:901 +#: src/main.c:902 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:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=SALASANA FTP-salasana\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing älä poista â€.listingâ€-tiedostoja\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob älä täydennä tiedostonimiä\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp älä käytä â€passiivista†siirtotapaa\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions säilytä noudetun tiedoston oikeudet\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2266,12 +2280,12 @@ " --retr-symlinks rekursiossa: hae linkitetyt tiedostot\n" " (ei hakemistoja)\n" -#: src/main.c:918 +#: src/main.c:919 #, fuzzy msgid "FTPS options:\n" msgstr "FTP-valitsimet:\n" -#: src/main.c:920 +#: src/main.c:921 #, fuzzy msgid "" " --ftps-implicit use implicit FTPS (default port is " @@ -2280,7 +2294,7 @@ " --ftp-stmlf Käytä â€Stream_LFâ€-muotoa kaikille " "binäärisille FTP-tiedostoille\n" -#: src/main.c:922 +#: src/main.c:923 #, fuzzy msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " @@ -2291,23 +2305,23 @@ "osoitteen\n" " viimeisen komponentin edelleenohjaus\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC-valitsimet:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2315,24 +2329,24 @@ " --warc-file=TIEDOSTONIMI tallenna pyyntö-/vastaustiedot tiedostoon ." "warc.gz\n" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=MERKKIJONO lisää MERKKIJONO warcinto-tietueeseen\n" -#: src/main.c:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx kirjoita CDX-indeksitiedostot\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2340,18 +2354,18 @@ " --warc-dedup=TIEDOSTONIMI älä tallenna CDX-tiedostossa lueteltuja " "tietueita\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests älä laske SHA1-tiivisteitä\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2359,7 +2373,7 @@ " --no-warc-keep-log älä tallenna lokitiedostoa WARC-" "tietueeseen\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2369,28 +2383,28 @@ "tiedostojen\n" " sijainti\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekursiivinen nouto:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive nouda rekursiivisesti\n" -#: src/main.c:960 +#: src/main.c:961 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:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after poista tiedostot haun jälkeen\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2400,13 +2414,13 @@ "linkit\n" " osoittamaan paikallisiin tiedostoihin\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2414,7 +2428,7 @@ " --backups=N palauta ennen tiedoston X kirjoittamista N " "varmuuskopiotiedostoa\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2422,7 +2436,7 @@ " -K, --backup-converted ennen tiedoston X muuttamista,\n" " varmuuskopioi nimellä â€X.origâ€\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2430,7 +2444,7 @@ " -K, --backup-converted ennen tiedoston X muuttamista,\n" " varmuuskopioi nimellä â€X.origâ€\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2438,7 +2452,7 @@ " -m, --mirror oikovalitsin, yhtäkuin -r -N -l inf\n" " --no-remove-listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2446,7 +2460,7 @@ " -p, --page-requisites nouda kaikki kuvat yms. HTML-sivun\n" " näyttämiseen tarvittava\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2454,90 +2468,90 @@ " --strict-comments käytä HTML-kommenttien tiukkaa\n" " (SGML) käsittelyä\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "" "Rekursiivinen hyväksyntä/hylkäys:\n" "(listojen osat erotellaan pilkuin)\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=LISTA lista hyväksytyistä päätteistä\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=LISTA lista hylätyistä päätteistä\n" -#: src/main.c:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYYPPI säännöllisen lauseen tyyppi (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TYYPPI säännöllisen lauseen tyyppi (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LISTA lista hyväksytyistä verkkotunnuksista\n" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LISTA lista hylätyistä verkkotunnuksista\n" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp seuraa ftp-linkkejä HTML-dokumenteista\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr " --follow-tags=LISTA lista seurattavista HTML-tageista\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr " --ignore-tags=LISTA lista ohitettavista HTML-tageista\n" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts siirry rekursiossa eri verkkoasemalle\n" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative seuraa vain suhteellisia linkkejä\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTA lista hyväksytyistä hakemistoista\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2547,16 +2561,16 @@ "osoitteen\n" " viimeisen komponentin edelleenohjaus\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTA lista hylätyistä hakemistoista\n" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent älä nouse hakemistorakenteessa\n" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "" @@ -2565,74 +2579,74 @@ "Ilmoita käännösvirheistä osoitteeseen \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, ei-vuorovaikutteinen tiedostojen noutaja.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Salasana käyttäjälle %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Salasana: " -#: src/main.c:1103 +#: src/main.c:1104 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "putken luominen epäonnistui" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Salasana käyttäjälle %s: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Lokaali: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Käännä: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Linkitä: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2641,29 +2655,29 @@ "GNU Wget %s käännetty järjestelmään %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (ympäristö)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (käyttäjä)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2678,7 +2692,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2686,36 +2700,36 @@ "\n" "Alunperin kirjoittanut Hrvoje NikÅ¡ić .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "Lähetä virheraportit ja kysymykset osoitteeseen .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Muistinvarauspulma\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Poistutaan virheen vuoksi kohteessa %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Kirjoita â€%s --help†saadaksesi lisää valitsimia.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: virheellinen valitsin – â€-n%câ€\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2724,7 +2738,7 @@ "On määritelty sekä --no-clobber että --convert-links -valitsimet, vain " "valitsinta --convert-links käytetään.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, fuzzy, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2733,24 +2747,24 @@ "On määritelty sekä --no-clobber että --convert-links -valitsimet, vain " "valitsinta --convert-links käytetään.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2763,7 +2777,7 @@ "yhdessä argumenttien â€-p†tai â€-r†kanssa. Lisätietoja käsikirjasta.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2774,7 +2788,7 @@ "ladattu sisältö sijoitetaan yhteen määrittelemääsi tiedostoon.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2785,7 +2799,7 @@ "käsikirjasta.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2793,7 +2807,7 @@ "WARC-tuloste ei toimi valitsimen --no-clobber kanssa, --no-clobber otetaan " "pois käytöstä.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2801,12 +2815,12 @@ "WARC-tuloste ei toimi aikaleimauksen kanssa, aikaleimaus otetaan pois " "käytöstä.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC-tuloste ei toimi valitsimen --spider kanssa.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2815,7 +2829,7 @@ "WARC-tuloste ei toimi valitsimen --continue tai --start-pos kanssa, ne " "otetaan pois käytöstä.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2823,7 +2837,7 @@ "Tiivisteen on otettu pois käytöstä; WARC-uudelleenkahdentuma ei löydä " "tietueiden kaksoiskappaleita.\n" -#: src/main.c:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2832,13 +2846,13 @@ "WARC-tuloste ei toimi valitsimen --continue tai --start-pos kanssa, ne " "otetaan pois käytöstä.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2847,17 +2861,17 @@ "Sekä valitsimen --start-pos että valitsimen --continue määrittelyä ei " "suositella; --continue otetaan pois käytöstä.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: VERKKO-OSOITE puuttuu\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2867,7 +2881,7 @@ "kanssa. Valitsin --method odottaa dataa valitsimien --body-data ja --body-" "file kautta" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2876,17 +2890,17 @@ "Metodi on määriteltävä valitsimen --method=HTTPMethod kautta käytettäväksi " "valitsimella --body-data tai --body-file.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Tässä versiossa ei tueta IRI:jä\n" -#: src/main.c:1999 +#: src/main.c:2006 #, fuzzy, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2894,7 +2908,7 @@ "valitsinta -k voidaan käyttää yhdessä valitsimen -O kanssa vain jos " "tulostetaan tavalliseen tiedostoon.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2903,42 +2917,42 @@ "valitsinta -k voidaan käyttää yhdessä valitsimen -O kanssa vain jos " "tulostetaan tavalliseen tiedostoon.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Symbolisen linkin %s poistaminen epäonnistui: %s\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: verkkoasemaosoitteen %s ratkaiseminen epäonnistui\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Tiedostosta %s ei löytynyt verkko-osoitteita.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Tiedoston %s poistaminen epäonnistui: %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2949,7 +2963,7 @@ "Muurikelloaika yhteensä: %s\n" "Noudettu: %d tiedostoa, %s kohteessa %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Haun %s:n tavun kiintiö YLITETTY!\n" @@ -3118,7 +3132,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Ohjelman suoritus jatkuu taustalla, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Tuloste kirjoitetaan tiedostoon %s.\n" @@ -3164,68 +3178,68 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: tiedoston %s tilan ei lukeminen epäonnistui: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "VAROITUS: satunnaislukujen lähde on heikkolaatuinen.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "OpenSSL-versiosi on liian vanha tukemaan TLSv1.1-yhteyskäytäntöä\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: toteuttamaton ’secure-protocol’-valitsinarvo %d\n" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: virheellinen verkko-osoite %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: 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:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Myöntäjän valtuutuksen todentaminen paikallisesti epäonnistui.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Itse allekirjoitettu varmenne kohdattu.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Varmenne ei ole vielä voimassa.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Varmenne on vanhentunut.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3234,7 +3248,7 @@ "%s: varmenteen aiheen vaihtoehtoinen nimi ei täsmää\n" "\tpyydetyn verkkoaseman nimen %s kanssa.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3242,7 +3256,7 @@ " %s: varmenteen yleinen nimi %s ei täsmää pyydetyn verkkoaseman nimeen " "%s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3254,7 +3268,7 @@ "väittää\n" " olevansa (toisin sanoen, se ei todella ole %s).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3307,22 +3321,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Ladataan robots.txt, älä välitä virheistä.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Virhe tulkittaessa välityspalvelimen verkko-osoitetta %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d edelleenohjausta ylitetty.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3330,7 +3344,7 @@ "Luovutetaan.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3402,97 +3416,107 @@ msgid "HTTPS support not compiled in" msgstr "HTTPS-tukea ei ole käännetty koodiin" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Kohdattu puutteellinen tai virheellinen monitavusekvenssi\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Ohjelman suoritus jatkuu taustalla, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Symbolisen linkin %s poistaminen epäonnistui: %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Evästeiden hakeminen kohteelle %s epäonnistui\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Evästeiden hakeminen kohteelle %s epäonnistui\n" +msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Virheellinen säännöllinen lauseke %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Virheellinen säännöllinen lauseke %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Virhe täsmättäessä tiedostoon %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Virhe avattaessa WARC-tiedostoa %s.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Virhe avattaessa GZIP-vuota WARC-tiedostoon.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "WARC-tiedostoon kirjoittaminen epäonnistui.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3501,26 +3525,26 @@ "Avataan WARC-tiedosto %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Virhe avattaessa WARC-tiedostoa %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" "CDX-tiedosto ei luettele alkuperäisiä verkko-osoitteita. (Puuttuva sarake " "'a'.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "CDX-tiedosto ei luettele tarkistussummia. (Puuttuva sarake 'k'.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "CDX-tiedosto ei luettele tietuetunnisteita. (Puuttuva sarake 'u'.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3535,33 +3559,33 @@ "Ladattu %d tietuetta CDX-tiedostosta.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" "Kaksoiskappaledatan eliminointi CDX-tiedostoa %s lukemalla epäonnistui.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Tilapäisen WARC-manifest-tiedoston avaaminen epäonnistui.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Tilapäisen WARC-lokitiedoston avaaminen epäonnistui.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "WARC-tiedoston avaaminen epäonnistui.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "CDX-tiedoston avaus tulostamista varten epäonnistui.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Tilapäisen WARC-tiedoston avaaminen epäonnistui.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Tarkka vastaavuus löytyi CDX-tiedostossa. Tallennetaan revisit-tietue WARC-" @@ -3573,18 +3597,12 @@ #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: tunnistamaton valitsin ’--%s’\n" -#~ msgid "%s: option '-W %s' is ambiguous\n" -#~ msgstr "%s: valitsin ’-W %s’ on moniselitteinen\n" - #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n" #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n" -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "Tiedostoa â€%s†ei noudeta, koska se on jo paikalla.\n" - #~ msgid "idn_decode failed (%d): %s\n" #~ msgstr "idn_decode ei onnistunut (%d): %s\n" @@ -3595,6 +3613,9 @@ #~ "\n" #~ "%s vastaanotettu.\n" +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Tiedostoa â€%s†ei noudeta, koska se on jo paikalla.\n" + #~ msgid "Authorization failed.\n" #~ msgstr "Todentaminen epäonnistui.\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/fr.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/fr.gmo differ diff -Nru wget-1.19.5/po/fr.po wget-1.20.1/po/fr.po --- wget-1.19.5/po/fr.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/fr.po 2018-12-26 20:10:49.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2017-04-30 03:34+0200\n" "Last-Translator: Stéphane Aulery \n" "Language-Team: French \n" @@ -234,17 +234,17 @@ msgid "Unmatched ) or \\)" msgstr ") ou \\) sans correspondance" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Pas d’expression rationnelle précédente" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "impossible de créer le tube" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -310,7 +310,7 @@ msgid "failed: %s.\n" msgstr "échec : %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, 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" @@ -437,12 +437,12 @@ msgid "Length: %s" msgstr "Taille : %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) restant" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s restant" @@ -611,7 +611,7 @@ "Fichier ou répertoire %s inexistants.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s vient de s’annoncer comme existante.\n" @@ -634,17 +634,17 @@ msgid "Data transfer aborted.\n" msgstr "Abandon du transfert des données.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, 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:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(essai : %2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -653,7 +653,7 @@ "%s (%s) — envoi sur la sortie standard %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -662,8 +662,8 @@ "%s (%s) - %s sauvegardé [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Destruction de %s.\n" @@ -763,166 +763,182 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Rejet de %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Rejet de %s.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s non parcouru puisqu’il est exclu ou non inclus.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Erreur — %s ne correspond pas à %s : %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Pas de concordance pour le motif %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Index écrit sous forme HTML dans %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Index écrit sous forme HTML dans %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "Erreur : impossible d’ouvrir le répertoire %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "Erreur : échec d’ouverture du certificat %s : (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Certificat de l’autorité de certification « %s » chargé\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Fichier de liste de révocations de certificat « %s » chargé\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" +"La version d’OpenSSL est trop ancienne pour prendre en charge TLSv1.1\n" + +#: src/gnutls.c:676 #, 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:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Veuillez signaler cette anomalie à \n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "Erreur" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "Avertissement" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s : pas de certificat présenté par %s.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s : le certificat de %s n’est pas d’un émetteur connu.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, 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:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, 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:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Erreur d’initialisation du certificat X.509 : %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Aucun certificat trouvé\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Erreur d’analyse du certificat : %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Le certificat n’est pas encore activé\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Le certificat a expiré\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Le certificat doit être X.509\n" @@ -962,11 +978,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Échec d’écriture de la requête HTTP : %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Pas d’en-tête, HTTP/0.9 supposé" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -975,11 +991,11 @@ "Fichier %s déjà présent ; pas de récupération.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "Échec de gmtime. C’est probablement un bogue.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -987,56 +1003,56 @@ "Impossible de convertir de timestamp au format HTTP. Utilisera l’heure 0 " "comme da te de dernière modification.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Fichier de données BODY %s manquant : %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Réutilisation de la connexion existante à [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Réutilisation de la connexion existante à %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, 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:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s erreur %d : %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Ligne d’état mal formée" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Échec de tunnel du serveur mandataire (« proxy ») : %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Schéma d’authentification inconnu.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Authentification sélectionnée : %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Sauvegarde en : %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1045,24 +1061,24 @@ "Pendant du téléchargement de signature:\n" "%s : %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Valeur pri invalide. Suppose %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1070,42 +1086,42 @@ "Impossible de trouver un digest acceptable pour les ressources Metalink.\n" "Les ignorer.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Désactivation SSL à cause des erreurs rencontrées.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "requête %s transmise, en attente de la réponse… " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Aucune donnée reçue.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Erreur de lecture (%s) dans les en-têtes.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(pas de description)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Emplacement : %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "non indiqué" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [suivant]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1114,7 +1130,7 @@ "Le fichier %s n’a pas été modifier sur le serveur. Téléchargement sauté.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1125,7 +1141,7 @@ "Vous pourriez vouloir ajouter l’option --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1135,59 +1151,59 @@ " Le fichier a déjà été complètement récupéré ; rien à faire.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Taille : " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignoré" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Avertissement : les jokers ne sont pas permis en HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Impossible d’écrire dans %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Attribut nécessaire manquant dans l’en-tête reçu.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Échec d’authentification par identifiant et mot de passe.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Impossible d’écrire dans le fichier WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Impossible d’écrire dans le fichier WARC temporaire.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Incapable d’établir une connexion SSL.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Impossible de supprimer le lien %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "Erreur : redirection (%d) sans destination.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1195,23 +1211,23 @@ "Impossible de trouver les données Metalink dans la réponse HTTP. " "Téléchargement du fichier via HTTP GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Entêtes Metalink trouvées. Passage en mode Metalink.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Le fichier distant n’existe pas — lien mort.\n" -#: src/http.c:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "En-tête de dernière modification incorrect — horodatage ignoré.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1221,16 +1237,16 @@ "récupération.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Le fichier distant est plus récent, récupération.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1240,7 +1256,7 @@ "ressources — récupération en cours.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1249,7 +1265,7 @@ "récupération.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1259,7 +1275,7 @@ "mais le mode récursif est désactivée — pas de récupération.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1267,12 +1283,12 @@ "Le fichier distant existe.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s : %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1281,7 +1297,7 @@ "%s (%s) — envoi vers sortie standard %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1290,58 +1306,58 @@ "%s (%s) — %s sauvegardé [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) — Fermeture de la connexion à l’octet %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) — Erreur de lecture à l’octet %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Qualité de protection « %s » non prise en charge.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algorithme « %s » non pris en charge.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s : impossible de lire %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s : erreur dans %s à la ligne %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1353,7 +1369,7 @@ "« %s »,\n" "ou indiquer un autre fichier avec --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1364,49 +1380,49 @@ "« %s »,\n" "ou indiquer un autre fichier avec --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s : commande --execute %s incorrecte\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s : %s : nombre %s incorrect.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, 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:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s : %s : valeur d’octet %s incorrecte\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s : %s : période de temps %s incorrecte\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1415,28 +1431,28 @@ "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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s : %s : valeur %s incorrecte.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s : %s : en-tête %s incorrect.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s : %s : en-tête WARC %s incorrect.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s : %s : type de progression %s incorrect.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1450,16 +1466,16 @@ msgid "Encoding %s isn't valid\n" msgstr "L’encodage %s est incorrect\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Séquence multioctet incomplète ou incorrecte rencontrée\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Erreur %d (errno) non gérée\n" @@ -1492,12 +1508,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s : %s ; désactivation de la journalisation.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Utilisation : %s [OPTION]… [URL]…\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1506,70 +1522,70 @@ "aussi pour les options au format court.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Démarrage :\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help afficher l’aide-mémoire\n" -#: src/main.c:600 +#: src/main.c:601 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:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Journalisation et fichier d’entrée :\n" -#: src/main.c:608 +#: src/main.c:609 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:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FICHIER accoler les messages au FICHIER\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug afficher beaucoup d’informations de " "débogage\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug afficher la sortie de débogage Watt-32\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr "" " -q, --quiet exécuter en mode silencieux (sans " "sortie)\n" -#: src/main.c:622 +#: src/main.c:623 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:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1577,7 +1593,7 @@ " -nv, --no-verbose arrêter le mode bavard, sans être " "silencieux\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1586,7 +1602,7 @@ " TYPE peut être « bits » par " "exemple\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1594,7 +1610,7 @@ " -i, --input-file=FICHIER télécharger les URL du FICHIER local ou " "dist\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1602,14 +1618,14 @@ " --input-metalink=FICHIER télécharger les files couverts dans le " "FICHIER Metalink local\n" -#: src/main.c:634 +#: src/main.c:635 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:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1618,28 +1634,28 @@ "d’entrée\n" " (-i -F) en relatif par rapport à URL\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FICHIER FICHIER de configuration à utiliser\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" " --no-config ne lire aucun fichier de configuration\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Téléchargement :\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1647,14 +1663,14 @@ " -t, --tries=NOMBRE définir le NOMBRE de tentatives\n" " (0 indique l’absence de limite)\n" -#: src/main.c:651 +#: src/main.c:652 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:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1664,12 +1680,12 @@ "par\n" " des virgules\n" -#: src/main.c:655 +#: src/main.c:656 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:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1678,7 +1694,7 @@ " déjà existants (qui auraient été " "écrasés)\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1686,7 +1702,7 @@ msgstr "" " --no-config ne lire aucun fichier de configuration\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1694,7 +1710,7 @@ " -c, --continue poursuivre le téléchargement d’un\n" " fichier incomplet\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1703,13 +1719,13 @@ "la\n" " POSITION commençant à zéro\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TYPE sélectionner le TYPE de jauge de " "progression\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1718,7 +1734,7 @@ "soit\n" " le mode\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1728,7 +1744,7 @@ "s’ils\n" " sont plus récents que localement\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1738,7 +1754,7 @@ "conditionnelle if-modified-since\n" " en mode timestamping\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1747,21 +1763,21 @@ "à\n" " celle du serveur\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response afficher la réponse du serveur\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider ne rien télécharger\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1769,7 +1785,7 @@ " --dns-servers=ADDRESSES liste des serveurs DNS à contacter " "(séparée par des virgules)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1777,27 +1793,27 @@ " --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:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SECONDE temps d’attente entre les essais\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1805,7 +1821,7 @@ " --waitretry=SECONDE temps d’attente maximal entre les essais\n" # NOTE: Long line -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1815,19 +1831,19 @@ " compris entre 0,5 et 1,5 du temps " "d’attente\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy désactiver le serveur mandataire " "(« proxy »)\n" -#: src/main.c:705 +#: src/main.c:706 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:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1835,17 +1851,17 @@ " --bind-address=ADRESSE lier localement (nom d’hôte ou adresse " "IP)\n" -#: src/main.c:709 +#: src/main.c:710 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:711 +#: src/main.c:712 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:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1853,7 +1869,7 @@ " --restrict-file-names=SE limiter caractères du système " "d’exploitation\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1862,17 +1878,17 @@ "des\n" " fichiers ou répertoires\n" -#: src/main.c:718 +#: src/main.c:719 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:720 +#: src/main.c:721 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:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1883,22 +1899,22 @@ " FAMILLE : IPv6, IPv4 ou " "« none » (aucune)\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password demander les mots de passe\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1916,31 +1932,31 @@ "WGET_ASKPASS \n" " ou the SSH_ASKPASS est used.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr "" " --no-iri désactiver la prise en charge des IRI\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink supprimer le fichier avant de l’écraser\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1948,7 +1964,7 @@ " --keep-badhash conserve les fichiers de somme de " "contrôle qui ne correspondent pas (ajoute .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1956,7 +1972,7 @@ " --metalink-index=NOMBRE Metalink application/metalink4+xml " "metaurl NOMBRE\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1964,7 +1980,7 @@ " --metalink-over-http utiliser les métadonnées Metalink des " "entêtes de réoonse HTTP\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1972,68 +1988,69 @@ " --preferred-location localisation préférée des resources " "Metalink\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr désactiver le stockage des métadonnées " "dans les attributs de fichier étendus\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Répertoires :\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ne pas créer de répertoires\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories forcer la création de répertoires\n" -#: src/main.c:767 +#: src/main.c:768 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:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories utiliser des répertoires au nom du " "protocole\n" -#: src/main.c:771 +#: src/main.c:772 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:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" " --cut-dirs=NOMBRE ignorer NOMBRE composants de répertoire\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Options HTTP :\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=IDENTIFIANT définir l’IDENTIFIANT HTTP\n" -#: src/main.c:781 +#: src/main.c:782 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:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache interdire données mises en cache du " "serveur\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2041,7 +2058,7 @@ " --default-page=NOM modifier le nom de la page par défaut\n" " (normalement « index.html »)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2050,47 +2067,44 @@ "avec\n" " leur extension\n" -#: src/main.c:790 +#: src/main.c:791 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:792 +#: src/main.c:793 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:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=TYPE sélectionner le TYPE de jauge de " -"progression\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect nbre maxi de redirections autorisées par " "page\n" -#: src/main.c:800 +#: src/main.c:801 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:802 +#: src/main.c:803 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:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2098,13 +2112,13 @@ " --referer=URL inclure l’en-tête « Referer: URL » en " "requête\n" -#: src/main.c:806 +#: src/main.c:807 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:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2112,31 +2126,31 @@ " -U, --user-agent=AGENT s’identifier comme AGENT et non Wget/" "VERSION\n" -#: src/main.c:810 +#: src/main.c:811 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:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ne pas utiliser les cookies\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2145,7 +2159,7 @@ "session\n" " (non permanents)\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2153,7 +2167,7 @@ " --post-data=CHAÃŽNE utiliser la méthode POST pour envoyer " "CHAÃŽNE\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2161,14 +2175,14 @@ " --post-file=FICHIER utiliser POST ; envoyer le contenu du " "FICHIER\n" -#: src/main.c:824 +#: src/main.c:825 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:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2176,7 +2190,7 @@ " --body-data=CHAÃŽNE envoyer la CHAÃŽNE comme données.\n" " --method doit être définie\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2184,7 +2198,7 @@ " --body-file=FICHIER envoyer le contenu du FICHIER.\n" " --method doit être définie\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2196,7 +2210,7 @@ " pour les noms de fichiers locaux " "(expérim.)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2204,7 +2218,7 @@ " --content-on-error afficher le contenu reçu après erreurs " "serveur\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2216,11 +2230,11 @@ " HTTP de base sans attendre d’abord la\n" " question du serveur\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Options HTTPS (SSL/TLS) :\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2231,41 +2245,41 @@ "auto,\n" " SSLv2, SSLv3, TLSv1 et PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only ne suivre que les liens HTTPS sécurisé\n" -#: src/main.c:849 +#: src/main.c:850 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:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FICHIER fichier de certificat client\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FICHIER fichier de clef privée\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 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:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2275,13 +2289,13 @@ " certificats d’autorités de " "certification\n" -#: src/main.c:863 +#: src/main.c:864 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:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2298,7 +2312,7 @@ "vérification\n" " les paires\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2308,7 +2322,7 @@ " génération de nombres pseudoaléatoires " "SSL\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2316,7 +2330,7 @@ " --egd-file=FICHIER fichier de socket EGD avec données " "aléatoires\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2326,15 +2340,15 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "Options HSTS :\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts désactiver HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2342,11 +2356,11 @@ " --hsts-file chemin de la base de données HSTS " "(écrasera l’existant)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Options FTP :\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2355,38 +2369,38 @@ "les\n" " fichiers binaires FTP\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=IDENTIFIANT définir l’IDENTIFIANT FTP\n" -#: src/main.c:903 +#: src/main.c:904 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:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing ne pas enlever les fichiers « .listing »\n" -#: src/main.c:907 +#: src/main.c:908 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:909 +#: src/main.c:910 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:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions préserver les droits des fichiers " "distants\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2395,11 +2409,11 @@ " attachés aux liens (pas les " "répertoires)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "Options FTPS :\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2407,7 +2421,7 @@ " --ftps-implicit utiliser implicitement FTPS (port par " "défaut 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2418,7 +2432,7 @@ " lorsque la connexion de données est " "ouverte\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2426,7 +2440,7 @@ " --ftps-clear-data-connection chiffrer le canal de contrôle " "uniquement ; Toutes les données seront en clair\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2434,11 +2448,11 @@ " --ftps-fallback-to-ftp revenir en FTP si FTPS n’est pas pris " "en charge dans le serveur cible\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "options WARC :\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2447,25 +2461,25 @@ "réponse\n" " dans un fichier .warc.gz\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx écrire les fichiers d’index CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2473,18 +2487,18 @@ " --warc-dedup=FICHIER ne pas garder enregistrements du fichier " "CDX\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ne pas calculer les hachages SHA1\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2492,7 +2506,7 @@ " --no-warc-keep-log ne pas garder journal en enregistrement " "WARC\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2502,16 +2516,16 @@ "créés\n" " par l’écriture WARC\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Téléchargement récursif :\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr "" " -r, --recursive activer les téléchargements récursifs\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2519,7 +2533,7 @@ " -l, --level=NOMBRE niveau de récursion maximal\n" " (inf ou 0 pour infini)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2527,7 +2541,7 @@ " --delete-after détruire fichiers locaux après " "téléchargement\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2536,7 +2550,7 @@ " -k, --convert-links transformer les liens en local dans les\n" " fichiers HTML et CSS téléchargés\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2544,7 +2558,7 @@ " --convert-file-only convertie seulement la partie fichier de " "l’URL (courant appelé basename)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2553,7 +2567,7 @@ "un\n" " exemplaire, et en garder au plus N\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2561,7 +2575,7 @@ " -K, --backup-converted sauver fichier X en X_orig avant " "conversion\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2569,7 +2583,7 @@ " -K, --backup-converted sauver fichier X en X.orig avant " "conversion\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2577,7 +2591,7 @@ " -m, --mirror raccourci de -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2586,7 +2600,7 @@ "nécessaires\n" " pour afficher la page HTML\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2594,11 +2608,11 @@ " --strict-comments activer le traitement strict (SGML) des\n" " commentaires HTML\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Acceptation ou rejet récursif :\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2607,7 +2621,7 @@ "par\n" " des virgules\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2616,50 +2630,50 @@ "par\n" " des virgules\n" -#: src/main.c:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYPE type d’expression rationnelle (posix|" "pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TYPE type d’expression rationnelle (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp suivre les liens FTP des documents HTML\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2668,7 +2682,7 @@ "par\n" " des virgules\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2677,21 +2691,21 @@ "par\n" " des virgules\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative ne suivre que les liens relatifs\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTE liste des répertoires permis\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2701,95 +2715,95 @@ "de\n" " l’URL de redirection\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTE liste des répertoires exclus\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "" "Veuillez signaler toutes anomalies ou suggestions à \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Mot de passe pour l’utilisateur %s : " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Mot de passe : " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "impossible de créer le tube\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Login pour « %s%s » : " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Mot de passe pour l’utilisateur « %s%s@%s » : " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc : " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Paramètres régionaux : " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Compilation : " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Lien : " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2798,29 +2812,29 @@ "GNU Wget %s compilé sur %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (environnement)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (utilisateur)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2834,7 +2848,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2842,36 +2856,36 @@ "\n" "Écrit initialement par Hrvoje NikÅ¡ić .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "Veuillez signaler toutes anomalies ou demandes à .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Problème d’allocation de mémoire\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Une erreur dans %s force à quitter\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Utilisez « %s --help » pour obtenir plus de renseignements.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s : option incorrecte — « -n%c »\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2880,7 +2894,7 @@ "--no-clobber et --convert-links ont toutes deux été indiquées, seule --" "convert-links sera utilisée.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2889,24 +2903,24 @@ "--no-clobber et --convert-file-only ont toutes deux été indiquées, seule --" "convert-links-only sera utilisée.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2918,7 +2932,7 @@ "combinaison avec -p ou -r. Consultez le manuel pour plus de précisions.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2929,7 +2943,7 @@ "sera placé dans le fichier unique indiqué.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2940,7 +2954,7 @@ "pour plus de précisions.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2948,7 +2962,7 @@ "La sortie WARC ne fonctionne pas avec --no-clobber, qui sera donc " "désactivée.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2956,12 +2970,12 @@ "La sortie WARC ne fonctionne pas avec l’horodatage, qui sera donc " "désactivé.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "La sortie WARC ne fonctionne pas avec --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2970,7 +2984,7 @@ "La sortie WARC ne fonctionne pas avec --continue ou --start-pos, qui seront " "donc désactivées.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2978,7 +2992,7 @@ "Les hachages sont désactivés ; la déduplication WARC ne trouvera pas les " "enregistrements en double.\n" -#: src/main.c:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2987,12 +3001,12 @@ "La sortie WARC ne fonctionne pas avec --continue ou --start-pos, qui seront " "donc désactivées.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Impossible d’indiquer --ask-password et --password ensemble.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3001,17 +3015,17 @@ "Indiquer à la fois --start-pos et --continue est déconseillé ; --continue " "sera désactivée.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s : URL manquante\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3020,7 +3034,7 @@ "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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3029,17 +3043,17 @@ "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:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, 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:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -3047,7 +3061,7 @@ "-k ou -r ne peuvent être utilisées avec -O qu’en cas de sortie dans un " "fichier ordinaire.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3056,42 +3070,42 @@ "--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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Impossible d’initialiser libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Échec de l’initialisation du canal c-ares\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Lecture de l’adresse IP « %s » échouée\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Aucune URL repérée dans %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Impossible de parser le fichier metalink %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3102,7 +3116,7 @@ "Temps total effectif : %s\n" "Téléchargés : %d fichiers, %s en %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Quota de téléchargement %s dépassé.\n" @@ -3272,7 +3286,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Poursuite en arrière plan, PID %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "La sortie sera écrite vers %s.\n" @@ -3318,73 +3332,73 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s : impossible d’obtenir l’état de %s : %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "Attention : utilisation d’une initialisation aléatoire faible.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" "La version d’OpenSSL est trop ancienne pour prendre en charge TLSv1.1\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s : URL %s incorrecte : %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: 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:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 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:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Récupération d’un certificat autosigné.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Le certificat émis n’est pas encore valable.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Le certificat émis a expiré.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3393,7 +3407,7 @@ "%s : le nom de sujet alternatif du certificat ne correspond pas au\n" "\tnom d’hôte %s demandé.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3401,7 +3415,7 @@ " %s : le nom commun du certificat %s ne correspond pas au nom d’hôte %s " "demandé.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3412,7 +3426,7 @@ " 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:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3466,23 +3480,23 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Chargement de robots.txt ; veuillez ignorer les erreurs.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, 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:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirections dépassant la limite permise.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3490,7 +3504,7 @@ "Abandon.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3562,97 +3576,107 @@ msgid "HTTPS support not compiled in" msgstr "HTTPS non activé lors de la compilation." -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Séquence multioctet incomplète ou incorrecte rencontrée\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Poursuite en arrière plan, PID %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Impossible de supprimer le lien symbolique %s : %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Impossible d’initialiser libcares\n" -#: src/utils.c:865 +#: src/utils.c:871 #, 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:872 +#: src/utils.c:878 #, 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:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Expression rationnelle %s incorrecte, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Expression rationnelle %s incorrecte, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Erreur de correspondance de %s : %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Erreur d’ouverture du fichier WARC %s.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Erreur d’ouverture du flux GZIP vers le fichier WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Erreur d’écriture de l’enregistrement warcinfo vers le fichier WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3661,29 +3685,29 @@ "Ouverture du fichier WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Erreur d’ouverture du fichier WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" "Le fichier CDX ne contient pas les URL d’origine (colonne « a » manquante).\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" "Le fichier CDX ne contient pas les sommes de contrôle (colonne « k » " "manquante).\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" "Le fichier CDX ne contient pas les identifiants d’enregistrement (colonne " "« u » manquante).\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3698,32 +3722,32 @@ "%d enregistrements chargés du CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Impossible de lire le fichier CDX %s pour la déduplication.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Impossible d’ouvrir le fichier de manifeste WARC temporaire.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Impossible d’ouvrir le fichier de journalisation WARC temporaire.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Impossible d’ouvrir le fichier WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Impossible d’ouvrir le fichier CDX pour la sortie.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Impossible d’ouvrir le fichier WARC temporaire.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Correspondance exacte trouvée dans le fichier CDX. Sauvegarde de " Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/ga.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/ga.gmo differ diff -Nru wget-1.19.5/po/ga.po wget-1.20.1/po/ga.po --- wget-1.19.5/po/ga.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/ga.po 2018-12-26 20:10:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2017-01-17 11:59-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -230,17 +230,17 @@ msgid "Unmatched ) or \\)" msgstr ") nó \\) corr" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Ní raibh slonn ionadaíochta ann roimhe seo" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "ní féidir píopa a chruthú" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -304,7 +304,7 @@ msgid "failed: %s.\n" msgstr "teipthe: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, 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" @@ -428,12 +428,12 @@ msgid "Length: %s" msgstr "Fad: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) fágtha" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s fágtha" @@ -605,7 +605,7 @@ "Níl a leithéid de chomhad ná de chomhadlann ann: %s\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "Tá %s ann anois.\n" @@ -629,17 +629,17 @@ msgid "Data transfer aborted.\n" msgstr "Tobscoireadh an t-aistriú sonraí.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Tá comhad %s ann cheana; ní aisghabhfar é.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(iarracht:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -648,7 +648,7 @@ "%s (%s) - scríofa ar stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -657,8 +657,8 @@ "%s (%s) - %s sábháilte [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "%s á bhaint.\n" @@ -757,161 +757,176 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "%s á dhiúltú.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "%s á dhiúltú.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "Ní rachfar isteach i %s toisc go bhfuil eisiata/as an áireamh.\n" + +#: src/ftp.c:2645 #, 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:2683 +#: src/ftp.c:2685 #, 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:2755 +#: src/ftp.c:2757 #, 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:2760 +#: src/ftp.c:2762 #, 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:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "EARRÃID: Ní féidir comhadlann %s a oscailt.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, 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:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Teastas CA '%s' lódáilte\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Lódáladh comhad CRL '%s'\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Tá an leagan de OpenSSL atá agat róshean le tacú le TLSv1.1\n" + +#: src/gnutls.c:676 #, 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:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "EARRÃID" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "RABHADH" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Níor thaispeáin %s teastas ar bith.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Níl eisitheoir aitheanta ag teastas %s.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Aisghaireadh an teastas ag %s.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Chuaigh an teastas ag %s as feidhm.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Earráid agus teastas X509 á thúsú: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Níor aimsíodh aon teastas\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Earráid agus an teastas á pharsáil: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Níl an teastas bailí fós.\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Chuaigh an teastas as feidhm\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Caithfear teastas X.509 a úsáid\n" @@ -951,11 +966,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Theip ar scríobh iarratais HTTP: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Gan cheanntásca, glac le HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -964,11 +979,11 @@ "Tá an comhad %s ann cheana; ní aisghabhfar é.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "theip ar gmtime. Is dócha gur fabht é seo.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -976,55 +991,55 @@ "Ní féidir an stampa ama a thiontú go HTTP. Úsáidfear am athraithe = 0 mar " "chúltaca.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Comhad sonraí BODY %s ar iarraidh: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, 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:2092 +#: src/http.c:2095 #, 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:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Theip ar léamh freagra ón seachfhreastalaí: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s EARRÃID %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Líne stádais míchumtha" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Theip ar thollánú seachfhreastalaí: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Scéim anaithnid fhíordheimhnithe.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Scéim fhíordheimhnithe: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "à shábháil i: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1033,21 +1048,21 @@ "Agus síniú á íoslódáil:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Luach neamhbhailí pri. Glacfar le %d ina ionad.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1055,42 +1070,42 @@ "Níor aimsíodh achoimre inghlactha le haghaidh acmhainní Metalink.\n" "Déanfar neamhshuim orthu.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL á dhíchumasú de bharr earráidí.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "Iarratas %s seolta, ag fanacht le freagra... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Níor glacadh aon sonra.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Earráid (%s) ag léamh na gceanntásc.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(gan cur síos)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Suíomh: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "gan sonrú" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [á leanúint]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1099,7 +1114,7 @@ "Níor athraigh comhad %s ar an bhfreastalaí. Ní íoslódálfar é.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1111,7 +1126,7 @@ "Seans gur mhaith leat an rogha --no-if-modified-since a shonrú.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1121,58 +1136,58 @@ " Bhí an comhad aisghafa ina iomláine cheana; níl faic le déanamh.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Fad: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "rinneadh neamhaird" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Rabhadh: níl saoróga ar fáil i HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ní féidir scríobh i gcomhad %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Fuarthas aitreabúid riachtanach a bhí ar iarraidh ón Cheanntásc.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Theip ar fhíordheimhniú Ainm Úsáideora/Focal Faire.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Ní féidir scríobh sa chomhad WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Ní féidir scríobh i gcomhad sealadach WARC.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Ní féidir ceangal SSL a dhéanamh.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ní féidir %s a dhínascadh (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "EARRÃID: Atreorú (%d) gan suíomh.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1180,24 +1195,24 @@ "Níor aimsíodh na sonraí Metalink sa fhreagra HTTP. Comhad á íoslódáil trí " "HTTP GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 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:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Níl an cianchomhad ann -- nasc briste!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 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:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1207,16 +1222,16 @@ "aisghabhfar é.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Tá an cianchomhad níos nuaí, á aisghabháil.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1226,7 +1241,7 @@ "-- á aisghabháil.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1234,7 +1249,7 @@ "Tá an cianchomhad ann ach níl aon nasc ann -- ní aisghabhfar é.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1244,7 +1259,7 @@ "ach díchumasaíodh athchúrsáil -- ní aisghabhfar é.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1252,12 +1267,12 @@ "Tá an cianchomhad ann.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1266,7 +1281,7 @@ "%s (%s) - scríofa ar stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1275,58 +1290,58 @@ "%s (%s) - %s sábháilte [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Ceangal dúnta ag beart %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, 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:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Cáilíocht cosanta nach dtacaítear léi '%s'.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algartam gan tacaíocht '%s'.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ní féidir %s a léamh (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Earráid i %s, líne %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1336,7 +1351,7 @@ "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:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1346,49 +1361,49 @@ "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:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Ordú neamhbhailí --execute %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Uimhir neamhbhailí %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, 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:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Luach neamhbhailí birt %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Tréimhse neamhbhailí %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1397,28 +1412,28 @@ "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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Luach neamhbhailí %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ceanntásc neamhbhailí %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ceanntásc WARC neamhbhailí %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Cineál neamhbhailí dul chun cinn %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1432,16 +1447,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Níl an t-ionchódú %s bailí\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Chonacthas seicheamh ilbheart neamhiomlán nó neamhbhailí\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Earráid %d gan láimhseáil\n" @@ -1474,12 +1489,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; logáil á díchumasú.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Úsáid: %s [ROGHA]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1488,64 +1503,64 @@ "fhada.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Tosú:\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help taispeáin an chabhair seo\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background rith sa chúlra tar éis tosaithe\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=ORDÚ rith ordú de nós `.wgetrc'\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Logáil agus an t-inchomhad:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=COMHAD logáil teachtaireachtaí i gCOMHAD\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" " -a, --append-output=COMHAD iarcheangail teachtaireachtaí le COMHAD\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug taispeáin go leor eolas dhífhabhtaithe\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug taispeáin eolas dhífhabhtaithe Watt-32\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tostach (gan aschur)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose foclach (seo é an réamhshocrú)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -nv, --no-verbose idir foclach agus tostach\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1553,7 +1568,7 @@ " --report-speed=MODH taispeáin bandaleithead mar MODH, mar shampla " "'bots'\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1561,7 +1576,7 @@ " -i, --input-file=COMHAD íoslódáil URLanna ón CHOMHAD áitiúil nó " "seachtrach\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1569,11 +1584,11 @@ " --input-metalink=COMHAD íoslódáil comhaid clúdaithe sa CHOMHAD " "áitiúil Metalink\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html caith leis an inchomhad mar HTML\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1582,38 +1597,38 @@ "F)\n" " i gcoibhneas le URL\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=COMHAD sonraigh comhad cumraíochta\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-config ná léigh aon chomhad cumraíochta\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Ãoslódáil:\n" -#: src/main.c:649 +#: src/main.c:650 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:651 +#: src/main.c:652 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:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1622,11 +1637,11 @@ " --ignore-tags=LIOSTA clibeanna HTML nach mbactar leo, scartha " "le camóga\n" -#: src/main.c:655 +#: src/main.c:656 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:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1634,20 +1649,20 @@ " -nc, --no-clobber ná híoslódáil comhad a d'fhorscríobhfadh\n" " comhad atá ann cheana\n" -#: src/main.c:660 +#: src/main.c:661 #, 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:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr " -c, --continue atosaigh íoslódáil comhad\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1655,11 +1670,11 @@ " --start-pos=UIMHIR tosaigh ag íoslódáil ó fhritháireamh " "UIMHIR\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=CINEÃL cineál rianaire dul chun cinn\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1667,7 +1682,7 @@ " --show-progress taispeáin barra dul chun cinn, mód " "foclachais ar bith\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1676,7 +1691,7 @@ " -N, --timestamping ná híoslódáil comhad mura bhfuil sé níos\n" " nuaí ná an leagan áitiúil\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1686,7 +1701,7 @@ "modified-since\n" " i mód na stampaí ama\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1695,20 +1710,20 @@ "bhfreastalaí\n" " chun an stampa ama áitiúil a shocrú\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response taispeáin an freagra ón fhreastalaí\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider ná híoslódáil rud ar bith\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1716,7 +1731,7 @@ " --dns-servers=SEOLTAà liosta freastalaithe DNS le húsáid (camóga " "eatarthu)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1724,29 +1739,29 @@ " --bind-dns-address=SEOLADH ceangail réiteoir DNS le SEOLADH " "(óstainm/IP) ar an óstríomhaire áitiúil\n" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr " --dns-timeout=SOIC seal fanachta DNS = SOIC\n" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=SOIC seal fanachta ceangailte = SOIC\n" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SOIC seal fanachta léimh = SOIC\n" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SOICINDà fan SOICINDà idir íoslódálacha\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr " --waitretry=SOICINDà fan 1...SOICINDà idir atrialacha\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1754,15 +1769,15 @@ " --random-wait fan ó 0.5*WAIT...1.5*WAIT soicind idir " "íoslódálacha\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy ná húsáid seachfhreastalaí\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=UIMHIR socraigh cuóta íoslódála\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1770,15 +1785,15 @@ " --bind-address=SEOLADH ceangail le SEOLADH (óstainm/IP) ar an " "óstach áitiúil\n" -#: src/main.c:709 +#: src/main.c:710 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:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache ná cuir cuardaigh DNS i dtaisce\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1786,7 +1801,7 @@ " --restrict-file-names=OS ná húsáid carachtair nach dtacaítear leo ar " "an OS\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1794,15 +1809,15 @@ " --ignore-case ná bac le cás agus comhaid/comhadlanna á " "meaitseáil\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only ceangail le seoltaí IPv4 amháin\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only ceangail le seoltaí IPv6 amháin\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1811,22 +1826,22 @@ " --prefer-family=CLANN ceangail ar dtús le seoltaí ón CHLANN,\n" " IPv6, IPv4, nó \"none\".\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password faigh focail fhaire ón úsáideoir\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1843,29 +1858,29 @@ "WGET_ASKPASS\n" " nó SSH_ASKPASS.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri múch tacaíocht do IRI\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink scrios comhaid sula bhforscríobhfar iad\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1873,7 +1888,7 @@ " --keep-badhash coinnigh comhaid fiú mura meaitseálann an " "tsuim sheiceála (agus cuir .badhash leis an ainm)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1881,7 +1896,7 @@ " --metalink-index=UIMHIR Orduimhir Metalink application/" "metalink4+xml\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1889,7 +1904,7 @@ " --metalink-over-http úsáid meiteashonraí Metalink ó " "cheanntásca an fhreagra HTTP\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1897,40 +1912,41 @@ " --preferred-location do rogha áite le haghaidh acmhainní " "Metalink\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr ná stóráil meiteashonraí in aitreabúidí " "breisithe\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Comhadlanna:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ná cruthaigh comhadlanna\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories cruthaigh comhadlanna i gcónaí\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ná cruthaigh comhadlanna óstacha\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories úsáid ainm an phrótacail i gcomhadlanna\n" -#: src/main.c:771 +#: src/main.c:772 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:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1938,25 +1954,25 @@ " --cut-dirs=UIMHIR déan neamhshuim ar UIMHIR comhpháirt den " "chomhadlann i gcéin\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Roghanna HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 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:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=FF socraigh an focal faire http\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache ná ceadaigh sonraí curtha i dtaisce ag an " "bhfreastalaí\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1965,7 +1981,7 @@ "réamhshocraithe\n" " ('index.html' de ghnáth.)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1973,40 +1989,39 @@ " -E, --adjust-extension sábháil cáipéisí HTML/CSS le hiarmhíreanna " "cuí\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length déan neamhaird den réimse 'Content-Length'\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=TEAGHRÃN cuir TEAGHRÃN sna ceanntásca\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=CINEÃL cineál rianaire dul chun cinn\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect uasmhéid atreoraithe do gach leathanach\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=ÚSÃIDEOIR socraigh ÚSÃIDEOIR an tseachfhreastalaí\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=FF socraigh focal faire don seachfhreastalaí\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2014,11 +2029,11 @@ " --referer=URL cuir ceanntásc 'Referer: URL' san iarracht " "HTTP\n" -#: src/main.c:806 +#: src/main.c:807 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:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2026,7 +2041,7 @@ " -U, --user-agent=AINM tú féin a chur in aithne mar AINM vs. Wget/" "LEAGAN\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2034,23 +2049,23 @@ " --no-http-keep-alive díchumasaigh keep-alive HTTP (ceangail " "sheasmhacha)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ná húsáid fianáin\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2058,7 +2073,7 @@ " --keep-session-cookies lódáil agus sábháil fianáin (sealadacha) an " "tseisiúin\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2066,20 +2081,20 @@ " --post-data=TEAGHRÃN úsáid an modh POST; seol TEAGHRÃN mar na " "sonraí\n" -#: src/main.c:822 +#: src/main.c:823 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:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod úsáid modh \"HTTPMethod\" san iarratas\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2087,7 +2102,7 @@ " --body-data=TEAGHRÃN seol TEAGHRÃN mar na sonraí; ní mór --method " "a shonrú\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2095,7 +2110,7 @@ " --body-file=COMHAD seol ábhar an CHOMHAID; ní mór --method a " "shonrú\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2105,7 +2120,7 @@ " --content-disposition géill do cheanntásc Content-Disposition agus\n" " ainmneacha áitiúla á roghnú (TURGNAMH)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2113,7 +2128,7 @@ " --content-on-error taispeáin an t-aschur a fuarthas i gcás " "earráide\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2123,11 +2138,11 @@ " --auth-no-challenge Seol bunfhaisnéis fhíordheimhnithe HTTP\n" " gan fanacht le dúshlán ón fhreastalaí\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Roghanna HTTPS (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2137,40 +2152,40 @@ " --secure-protocol=PR roghnaigh prótacal slán: auto, SSLv2,\n" " SSLv3, TLSv1 nó PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only ná lean ach nascanna HTTPS\n" -#: src/main.c:849 +#: src/main.c:850 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:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=COMHAD comhad teastais an chliaint\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=COMHAD comhad don eochair phríobháideach\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 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:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2178,11 +2193,11 @@ " --ca-directory=COMHADLN comhadlann ina gcoinnítear an liosta " "haiseáilte de CAnna\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=COMHAD comhad ina bhfuil burla CRLanna\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2199,7 +2214,7 @@ "an\n" " acmhainn i gcéin a dheimhniú\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2207,7 +2222,7 @@ " --random-file=COMHAD comhad ina bhfuil sonraí randamacha chun an " "SSL PRNG a shíolrú\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2215,7 +2230,7 @@ " --egd-file=COMHAD comhad a ainmníonn an soicéad EGD le sonraí " "randamacha\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2225,15 +2240,15 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "Roghanna HSTS:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts díchumasaigh HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2241,11 +2256,11 @@ " --hsts-file cosán go dtí an bunachar sonraí HSTS " "(sáraíonn seo an réamhshocrú)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Roghanna FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2253,35 +2268,35 @@ " --ftp-stmlf úsáid formáid Stream_LF le haghaidh gach " "comhaid dhénártha FTP\n" -#: src/main.c:901 +#: src/main.c:902 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:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=FF socraigh an focal faire ftp\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ná bain comhaid '.listing'\n" -#: src/main.c:907 +#: src/main.c:908 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:909 +#: src/main.c:910 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:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions caomhnaigh ceadanna an chomhaid i gcéin\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2289,11 +2304,11 @@ " --retr-symlinks faigh na comhaid a nasctar leo, agus á " "athchúrsáil\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "Roghanna FTPS:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2301,7 +2316,7 @@ " --ftps-implicit úsáid FTPS intuigthe (port " "réamhshocraithe 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2311,7 +2326,7 @@ "tosaíodh sa cheangal rialaithe nuair\n" " a osclófar ceangal nua sonraí\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2319,7 +2334,7 @@ " --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:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2327,11 +2342,11 @@ " --ftps-fallback-to-ftp úsáid FTP mar thacachumas mura " "dtacaíonn an freastalaí le FTPS\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Roghanna WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2339,45 +2354,45 @@ " --warc-file=COMHAD sábháil sonraí an iarratais/fhreagra i " "gcomhad .warc.gz\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx scríobh comhad innéacsaithe CDX\n" -#: src/main.c:941 +#: src/main.c:942 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:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ná ríomh haiseanna SHA1\n" -#: src/main.c:949 +#: src/main.c:950 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:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2386,15 +2401,15 @@ " --warc-tempdir=COMHADLANN áit ina gcruthóidh an scríbhneoir WARC " "comhaid shealadacha\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Ãoslódáil athchúrsach:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive íoslódáil go hathchúrsach\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2402,14 +2417,14 @@ " -l, --level=UIMHIR doimhneacht athchúrsála is mó (inf nó 0 = gan " "teorainn)\n" -#: src/main.c:962 +#: src/main.c:963 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:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2417,7 +2432,7 @@ msgstr "" " -k, --convert-links nasc le comhaid áitiúla i HTML/CSS íoslódáilte\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2425,7 +2440,7 @@ " --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:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2433,7 +2448,7 @@ " --backups=N sula scríobhtar comhad, rothlaigh suas le " "N comhad cúltaca\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2441,7 +2456,7 @@ " -K, --backup-converted déan cúltaca mar X_orig sula dtiontaítear comhad " "X\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2449,14 +2464,14 @@ " -K, --backup-converted déan cúltaca mar X.orig sula dtiontaítear comhad " "X\n" -#: src/main.c:979 +#: src/main.c:980 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:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2464,7 +2479,7 @@ " -p, --page-requisites faigh gach íomhá, srl. ag teastáil chun " "leathanach HTML a thaispeáint\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2472,11 +2487,11 @@ " --strict-comments láimhseáil dhocht de nótaí tráchta HTML (.i. mar " "SGML)\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Glacadh/diúltú athchúrsach:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2484,7 +2499,7 @@ " -A, --accept=LIOSTA iarmhíreanna inghlactha, scartha le " "camóga\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2492,47 +2507,47 @@ " -R, --reject=LIOSTA iarmhíreanna diúltaithe, scartha le " "camóga\n" -#: src/main.c:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 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:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=CINEÃL cineál an tsloinn ionadaíochta (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 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:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2540,7 +2555,7 @@ " --follow-tags=LIOSTA clibeanna HTML le leanúint, scartha le " "camóga\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2548,20 +2563,20 @@ " --ignore-tags=LIOSTA clibeanna HTML nach mbactar leo, scartha " "le camóga\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative ná lean ach naisc choibhneasta\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LIOSTA comhadlanna ceadaithe\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2571,89 +2586,89 @@ "dheireanach\n" "den URL atreoraithe\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LIOSTA comhadlanna neamhcheadaithe\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Seol tuairiscí ar fhabhtanna agus moltaí chuig \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Focal faire le haghaidh %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Focal faire: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Ní féidir píopa a chruthú\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Ainm úsáideora le haghaidh '%s%s': " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Focal faire le haghaidh '%s%s@%s': " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc" -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Logchaighdeán: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Tiomsú: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Nasc: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2662,29 +2677,29 @@ "GNU Wget %s tógtha ar %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (úsáideoir)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2698,7 +2713,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2706,39 +2721,39 @@ "\n" "Scríofa ar dtús ag Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "" "Seol tuairiscí ar fhabhtanna agus ceisteanna chuig .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Fadhb agus cuimhne á leithdháileadh\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "à scor mar gheall ar earráid i %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, 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:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: rogha neamhcheadaithe -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2747,7 +2762,7 @@ "Sonraíodh --no-clobber agus --convert-links. Úsáidfear --convert-links " "amháin.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2756,23 +2771,23 @@ "Sonraíodh --no-clobber agus --convert-file-only. Úsáidfear --convert-file-" "only amháin.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2785,7 +2800,7 @@ "fháil.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2795,7 +2810,7 @@ "íoslódáilte go léir sa chomhad a roghnaigh tú.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2805,7 +2820,7 @@ "lámhleabhar chun tuilleadh eolais a fháil.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2813,19 +2828,19 @@ "Ní fheidhmíonn aschur WARC leis an rogha --no-clobber; díchumasófar --no-" "clobber.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, 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:1706 +#: src/main.c:1707 #, 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:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2834,14 +2849,14 @@ "Ní fheidhmíonn aschur WARC in éineacht le --continue nó --start-pos; " "díchumasófar iad.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, 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:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2850,12 +2865,12 @@ "Ní fheidhmíonn aschur WARC in éineacht le --continue nó --start-pos; " "díchumasófar iad.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2864,17 +2879,17 @@ "Ní mholtar duit --start-pos agus --continue a úsáid le chéile; díchumasófar " "--continue.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL ar iarraidh\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2883,7 +2898,7 @@ "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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2892,17 +2907,17 @@ "Caithfidh tú modh a roghnú le --method=HTTPMethod a úsáidfar in éineacht le " "--body-data nó --body-file.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, 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:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2910,7 +2925,7 @@ "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:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2919,42 +2934,42 @@ "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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Níorbh fhéidir libcares a thúsú\n" -#: src/main.c:2022 +#: src/main.c:2029 #, 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:2045 +#: src/main.c:2052 #, 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:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Níor aimsíodh aon URL i %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, 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:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2965,7 +2980,7 @@ "Am iomlán (clog balla): %s\n" "Ãoslódáilte: %d comhad, %s i %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Sáraíodh cuóta íoslódála %s!\n" @@ -3132,7 +3147,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "à leanúint sa chúlra, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Scríobhfar an t-aschur i %s.\n" @@ -3177,64 +3192,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: ní féidir %s a stat: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "RABHADH: síol lag randamach in úsáid.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "Tá an leagan de OpenSSL atá agat róshean le tacú le TLSv1.1\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: URL neamhbhailí %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: 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:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 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:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Teastas féinsínithe.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Níl an teastas eisithe bailí fós.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Tá an teastas imithe as feidhm.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3243,7 +3258,7 @@ "%s: níl aon ainm malartach ar ábhar an teastais ann a mheaitseálann\n" "\tan t-óstainm iarrtha %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3251,7 +3266,7 @@ " %s: níl ainm coitianta an teastais %s comhoiriúnach leis an óstainm " "iarrtha %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3261,7 +3276,7 @@ " %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:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3311,22 +3326,22 @@ 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:912 +#: src/retr.c:928 #, 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:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "níos mó ná %d atreorú.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3334,7 +3349,7 @@ "à éirí as.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3415,97 +3430,107 @@ msgid "HTTPS support not compiled in" msgstr "Níor tógadh an clár seo le tacaíocht HTTPS" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Chonacthas seicheamh ilbheart neamhiomlán nó neamhbhailí\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "à leanúint sa chúlra, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Níorbh fhéidir libcares a thúsú\n" -#: src/utils.c:865 +#: src/utils.c:871 #, 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:872 +#: src/utils.c:878 #, 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:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Slonn ionadaíochta neamhbhailí %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Slonn ionadaíochta neamhbhailí %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Earráid agus %s á mheaitseáil: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Earráid agus comhad WARC %s á oscailt.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Earráid agus sruth GZIP á oscailt go comhad WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Earráid agus taifead warcinfo á scríobh i gcomhad WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3514,24 +3539,24 @@ "Comhad WARC %s á oscailt.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Earráid agus comhad WARC %s á oscailt.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Níl na bunURLanna sa chomhad CDX. (Colún 'a' ar iarraidh.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Níl na suimeanna seiceála sa chomhad CDX. (Colún 'k' ar iarraidh.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "Níl aitheantais na dtaifead sa chomhad CDX. (Colún 'u' ar iarraidh.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3555,32 +3580,32 @@ "Lódáladh %d taifead ó CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Níorbh fhéidir comhad CDX %s a léamh chun taifid dúbailte a bhaint.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Níorbh fhéidir comhad sealadach don lastliosta WARC a oscailt.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Níorbh fhéidir logchomhad sealadach WARC a oscailt.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Níorbh fhéidir comhad WARC a oscailt.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Níorbh fhéidir comhad CDX a oscailt le scríobh ann.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Níorbh fhéidir comhad sealadach WARC a oscailt.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Aimsíodh toradh beacht sa chomhad CDX. Taifead athchuairte á shábháil le " diff -Nru wget-1.19.5/po/gl.po wget-1.20.1/po/gl.po --- wget-1.19.5/po/gl.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/gl.po 2018-12-26 20:10:49.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: wget 1.14\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2012-11-11 23:30+0100\n" "Last-Translator: Leandro Regueiro \n" "Language-Team: Galician \n" @@ -247,18 +247,18 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 #, fuzzy msgid "No previous regular expression" msgstr "Expresión regular non válida %s, %s\n" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -322,7 +322,7 @@ msgid "failed: %s.\n" msgstr "fallou: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" @@ -446,12 +446,12 @@ msgid "Length: %s" msgstr "Lonxitude: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", quedan %s (%s)" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", quedan %s" @@ -617,7 +617,7 @@ "Non hai tal ficheiro ou directorio %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "" @@ -640,17 +640,17 @@ msgid "Data transfer aborted.\n" msgstr "Transferencia de datos interrompida.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, 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:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(intento:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -659,7 +659,7 @@ "%s (%s) - escrito en stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -668,8 +668,8 @@ "%s (%s) - gardouse %s [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Retirando %s.\n" @@ -769,161 +769,175 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Rexeitando %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Rexeitando %s.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "Non se ha descender a %s porque está excluído ou non incluído.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Produciuse un erro ao comparar %s contra %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Non coincide co patron %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Escrito un índice en HTML en %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Escrito un índice en HTML en %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERRO: non é posíbel abrir o directorio %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, 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:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Non se puideron carga-los certificados de %s\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ERRO" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "AVISO" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" -msgstr "" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" +msgstr "%s: Revogouse o certificado de %s.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Revogouse o certificado de %s.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Revogouse o certificado de %s.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Produciuse un erro ao inicializar o certificado X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Non se atopou ningún certificado\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Produciuse un erro ao analizar o certificado: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "O certificado aínda non está activado\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "O certificado caducou\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -963,11 +977,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Produciuse un erro ao escribir unha petición HTTP: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Non hai cabeceiras, asúmese HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -976,133 +990,133 @@ "O ficheiro %s xa está aí, non se ha descargar.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Reutilizando a conexión existente con [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Reutilizando a conexión existente con %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Produciuse un erro ao ler a resposta do proxy: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRO %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Liña de estado mal formada" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Sistema de autenticación descoñecido.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Sistema de autenticación descoñecido.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Gardando en: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Desactivando SSL debido aos erros encontrados.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "Petición %s enviada, agardando unha resposta... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Non se recibiron datos.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Erro ao ler (%s) nas cabeceiras.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(sen descrición)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Localización: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "non especificado" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [seguíndoo]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1110,7 +1124,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1120,80 +1134,80 @@ " O ficheiro xa está completo; non hai nada que facer.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Lonxitude: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignorado" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Aviso: comodíns non compatíbeis en HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Non é posíbel escribir en %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Non é posíbel escribir no ficheiro WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Non é posíbel escribir no ficheiro WARC temporal.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Non foi posíbel establecer a conexión SSL.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Non é posíbel desligar %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redirección (%d) sen destino.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "O ficheiro remoto non exite -- ligazón rota!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Falta a cabeceira Last-modified -- marcas de tempo desactivadas.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Cabeceira Last-modified incorrecta -- ignorouse a marca de tempo.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1203,16 +1217,16 @@ "descarga.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "O ficheiro remoto é máis novo, descargando.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1222,7 +1236,7 @@ "descargando.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1231,14 +1245,14 @@ "descarga.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1246,12 +1260,12 @@ "O ficheiro remoto existe.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1260,7 +1274,7 @@ "%s (%s) - escrito en stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1269,58 +1283,58 @@ "%s (%s) - gardouse %s [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexión pechada no byte %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Erro de lectura no byte %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Esquema %s non compatíbel" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Non é posíbel ler %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Erro en %s na liña %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1328,7 +1342,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1336,75 +1350,75 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Orde --execute non válida %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Número %s non válido.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Valor de byte %s non válido\n" -#: src/init.c:1379 +#: src/init.c:1373 #, 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:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Valor %s non válido.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Cabeceira %s non válida.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Cabeceira WARC %s non válida.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Tipo de progreso %s non válido.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1418,16 +1432,16 @@ msgid "Encoding %s isn't valid\n" msgstr "A codificación %s non é válida\n" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "" @@ -1460,12 +1474,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; desactivando o rexistro.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uso: %s [OPCIÓN]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1473,130 +1487,130 @@ "Os argumentos obrigatorios nas opcións longas tamén o son nas curtas.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Inicio:\n" -#: src/main.c:596 +#: src/main.c:597 #, 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:598 +#: src/main.c:599 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help mostra esta axuda.\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:602 +#: src/main.c:603 #, 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Ficheiros de rexistro e de entrada:\n" -#: src/main.c:608 +#: src/main.c:609 #, 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:610 +#: src/main.c:611 #, 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:613 +#: src/main.c:614 #, 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:617 +#: src/main.c:618 #, 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:620 +#: src/main.c:621 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:622 +#: src/main.c:623 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -h, --help mostra esta axuda.\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:634 +#: src/main.c:635 #, 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:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:639 +#: src/main.c:640 #, 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:641 +#: src/main.c:642 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Descarga:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:651 +#: src/main.c:652 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" @@ -1604,7 +1618,7 @@ " --retry-connrefused reintentar incluso se se rexeita a " "conexión.\n" -#: src/main.c:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1613,200 +1627,200 @@ " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:655 +#: src/main.c:656 #, 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:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:660 +#: src/main.c:661 #, 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:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 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:679 +#: src/main.c:680 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response mostrar a resposta do servidor.\n" -#: src/main.c:681 +#: src/main.c:682 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider non descargar nada.\n" -#: src/main.c:683 +#: src/main.c:684 #, fuzzy msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -w, --wait=SEGUNDOS agarda SEGUNDOS entre descargas.\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:691 +#: src/main.c:692 #, 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:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:695 +#: src/main.c:696 #, 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:697 +#: src/main.c:698 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEGUNDOS agarda SEGUNDOS entre descargas.\n" -#: src/main.c:699 +#: src/main.c:700 #, 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:701 +#: src/main.c:702 #, 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:703 +#: src/main.c:704 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:711 +#: src/main.c:712 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:715 +#: src/main.c:716 #, 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:718 +#: src/main.c:719 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only conectar só a enderezos IPv4.\n" -#: src/main.c:720 +#: src/main.c:721 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only conectar só a enderezos IPv6.\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:726 +#: src/main.c:727 #, 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:728 +#: src/main.c:729 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --ask-password solicitar os contrasinais.\n" -#: src/main.c:730 +#: src/main.c:731 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --ask-password solicitar os contrasinais.\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1817,235 +1831,234 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:743 +#: src/main.c:744 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 -#, fuzzy +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" -msgstr " --no-iri desactivar a compatibilidade IRI.\n" +msgstr "" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Directorios:\n" -#: src/main.c:763 +#: src/main.c:764 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories non crear directorios.\n" -#: src/main.c:765 +#: src/main.c:766 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories forzar a creación de directorios.\n" -#: src/main.c:767 +#: src/main.c:768 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nd, --no-directories non crear directorios.\n" -#: src/main.c:769 +#: src/main.c:770 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr " -x, --force-directories forzar a creación de directorios.\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Opcións de HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 #, 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:781 +#: src/main.c:782 #, 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:783 +#: src/main.c:784 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --spider non descargar nada.\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:792 +#: src/main.c:793 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=CADEA inserir CADEA entre as cabeceiras.\n" -#: src/main.c:795 +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:800 +#: src/main.c:801 #, 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:802 +#: src/main.c:803 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --ask-password solicitar os contrasinais.\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:806 +#: src/main.c:807 #, 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:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:812 +#: src/main.c:813 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:814 +#: src/main.c:815 #, fuzzy msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:816 +#: src/main.c:817 #, fuzzy msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:818 +#: src/main.c:819 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:820 +#: src/main.c:821 #, 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:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 #, 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:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2053,13 +2066,13 @@ "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2067,70 +2080,70 @@ " challenge\n" msgstr "" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opcións de HTTPS (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 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:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:851 +#: src/main.c:852 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr "" " --config=FICHEIRO Especificar o ficheiro de configuración a " "usar.\n" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:855 +#: src/main.c:856 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr "" " --config=FICHEIRO Especificar o ficheiro de configuración a " "usar.\n" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:859 +#: src/main.c:860 #, 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:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:863 +#: src/main.c:864 #, 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:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2140,19 +2153,19 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2162,231 +2175,231 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 #, fuzzy msgid "HSTS options:\n" msgstr "Opcións de HTTP:\n" -#: src/main.c:888 +#: src/main.c:889 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Opcións de FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:901 +#: src/main.c:902 #, 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:903 +#: src/main.c:904 #, 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:905 +#: src/main.c:906 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing non retirar os ficheiros «.listing».\n" -#: src/main.c:907 +#: src/main.c:908 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:911 +#: src/main.c:912 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " -S, --server-response mostrar a resposta do servidor.\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:918 +#: src/main.c:919 #, fuzzy msgid "FTPS options:\n" msgstr "Opcións de FTP:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Opcións WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --header=CADEA inserir CADEA entre as cabeceiras.\n" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:939 +#: src/main.c:940 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider non descargar nada.\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Descarga recursiva:\n" -#: src/main.c:958 +#: src/main.c:959 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive especificar a descarga recursiva.\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:962 +#: src/main.c:963 #, fuzzy msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --spider non descargar nada.\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:989 +#: src/main.c:990 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2395,7 +2408,7 @@ " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:991 +#: src/main.c:992 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2404,23 +2417,23 @@ " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:1004 +#: src/main.c:1005 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2428,7 +2441,7 @@ " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:1006 +#: src/main.c:1007 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" @@ -2436,12 +2449,12 @@ " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:1010 +#: src/main.c:1011 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2450,7 +2463,7 @@ " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:1012 +#: src/main.c:1013 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2459,111 +2472,111 @@ " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:1016 +#: src/main.c:1017 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -h, --help mostra esta axuda.\n" -#: src/main.c:1018 +#: src/main.c:1019 #, 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:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:1023 +#: src/main.c:1024 #, 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:1025 +#: src/main.c:1026 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -nd, --no-directories non crear directorios.\n" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Envíe informes de fallo e suxestións a .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Contrasinal do usuario %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Contrasinal: " -#: src/main.c:1103 +#: src/main.c:1104 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "Non é posíbel escribir no ficheiro WARC.\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Contrasinal do usuario %s: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "" -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Ligazón: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2572,29 +2585,29 @@ "GNU Wget %s compilouse en %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (usuario)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2011 Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2608,7 +2621,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2616,67 +2629,67 @@ "\n" "Escrito orixinalmente por Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "Envíe informes de fallo e preguntas a .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Execute «%s --help» para obter máis información.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opción inaceptábel -- «-n%c»\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2684,155 +2697,155 @@ "\n" msgstr "" -#: src/main.c:1666 +#: src/main.c:1667 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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: falta o URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, 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:1999 +#: src/main.c:2006 #, 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:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, 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:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Non se atoparon URLs en %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Non é posíbel eliminar %s: %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2840,7 +2853,7 @@ "Downloaded: %d files, %s in %s (%s)\n" msgstr "" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "SUPEROUSE a cota de descarga de %s!\n" @@ -3007,7 +3020,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Continuando en segundo plano, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Vaise escribir a saída en %s.\n" @@ -3052,76 +3065,76 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: non é posíbel obter información de %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: URL %s non válido: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "Non foi posíbel sementar PRNG; considere empregar --random-file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Encontrouse un certificado autoasinado.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3129,7 +3142,7 @@ " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3180,22 +3193,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Cargando robots.txt; ignore os erros.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, 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:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "Superáronse %d redireccións.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3203,7 +3216,7 @@ "Abandonando.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3275,124 +3288,133 @@ msgid "HTTPS support not compiled in" msgstr "Non se compilou con compatibilidade para HTTPS" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Continuando en segundo plano, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, 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:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, 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:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Expresión regular non válida %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Expresión regular non válida %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Produciuse un erro ao comparar %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 #, fuzzy msgid "Error writing warcinfo record to WARC file.\n" msgstr "Non é posíbel escribir no ficheiro WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, fuzzy, c-format msgid "Error opening WARC file %s.\n" msgstr "Produciuse un erro ao analizar o certificado: %s\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3403,37 +3425,37 @@ msgstr[0] "" msgstr[1] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 #, fuzzy msgid "Could not open temporary WARC manifest file.\n" msgstr "Non é posíbel escribir no ficheiro WARC temporal.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 #, fuzzy msgid "Could not open temporary WARC log file.\n" msgstr "Non é posíbel escribir no ficheiro WARC temporal.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 #, fuzzy msgid "Could not open WARC file.\n" msgstr "Non é posíbel escribir no ficheiro WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 #, fuzzy msgid "Could not open CDX file for output.\n" msgstr "Non se puido atopar un servidor proxy.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 #, fuzzy msgid "Could not open temporary WARC file.\n" msgstr "Non é posíbel escribir no ficheiro WARC temporal.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" @@ -3443,18 +3465,12 @@ #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: opción «--%s» non recoñecida\n" -#~ msgid "%s: option '-W %s' is ambiguous\n" -#~ msgstr "%s: a opción «-W %s» é ambigua\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 "File `%s' already there; not retrieving.\n" -#~ msgstr "O ficheiro «%s» xa está aí, non se ha descargar.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Fallo na autorización.\n" @@ -3468,6 +3484,9 @@ #~ "\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 "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 -Nru wget-1.19.5/po/he.po wget-1.20.1/po/he.po --- wget-1.19.5/po/he.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/he.po 2018-12-26 20:10:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: wget 1.8.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2002-02-03 20:08+0200\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" @@ -230,17 +230,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -315,7 +315,7 @@ msgid "failed: %s.\n" msgstr "" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" @@ -442,12 +442,12 @@ msgid "Length: %s" msgstr "%s :êøåà" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr "" @@ -617,7 +617,7 @@ ".íéîéé÷ äé÷éú åà õáå÷ åðéà `%s'\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "" @@ -644,17 +644,17 @@ msgid "Data transfer aborted.\n" msgstr "ä÷ñôåä íéðåúð úøáòä\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr ".åúåà êåùîì êøåö ïéà ,ïàë øáë `%s' õáå÷\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(%2d 'ñî ïåéñð)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -662,7 +662,7 @@ msgstr "" # I give up! -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -671,8 +671,8 @@ "%s (%s) - `%s' saved [%ld]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr ".%s ÷çåî\n" @@ -762,160 +762,174 @@ msgid "Not descending to %s as it is excluded/not-included.\n" msgstr ".äîéùøäî äàöåä åà äììëð àìù íåùî `%s'-ì ñðëéäìî òðîð\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr ".äçãð `%s'\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr ".äçãð `%s'\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" + +#: src/ftp.c:2645 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "`%s'-ì äáéúëá (%s) äì÷ú\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr ".`%s' úéðáúì úåîàúä ïéà\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "`%s'-ì äáúëð íéúá %ld ìãåâáå HTML èîøåôá íéöá÷ úîéùø\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "`%s'-ì äáúëð HTML èîøåôá íéöá÷ úîéùø\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "%s-î (certificates) øåùéà úåéåú úðéòèá äì÷ú\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr " . úáåúëì øåôéùì úåòöäå (bugs) äì÷ú éçååéã åçìù\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "`%s'-ì äáéúëá (%s) äì÷ú\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -956,150 +970,150 @@ msgid "Failed writing HTTP request: %s.\n" msgstr ".HTTP úééðô ìù äçéìùá (%s) äì÷ú\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1620 +#: src/http.c:1623 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr ".åúåà êåùîì êøåö ïéà ,ïàë øáë `%s' õáå÷\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2087 +#: src/http.c:2090 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr ".%s:%hu-ì øåáéçá ùîúùäì êéùîî\n" -#: src/http.c:2092 +#: src/http.c:2095 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr ".%s:%hu-ì øåáéçá ùîúùäì êéùîî\n" -#: src/http.c:2158 +#: src/http.c:2161 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr ".HTTP úééðô ìù äçéìùá (%s) äì÷ú\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "áöîä úøåù ìù éåâù äðáî" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr ".úøëåî-éúìá úåîéà úèéù\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr ".úøëåî-éúìá úåîéà úèéù\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 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:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "...äáåùú úìá÷ì ïéúîî ,äçìùð %s úééðô " -#: src/http.c:3392 +#: src/http.c:3395 #, fuzzy msgid "No data received.\n" msgstr "èì÷ éðåúð åìá÷úä àì" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr ".úåøúåë úàéø÷ úòá (%s) úì÷ú\n" -#: src/http.c:3608 +#: src/http.c:3611 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:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "%s :øúàì áåúéð éåðéù%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "unspecified" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " øçà á÷åò" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1107,7 +1121,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1119,81 +1133,81 @@ # 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:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Length: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignored" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr ".HTTP-á íéëîúð íðéà (wildcards) äììëä éåú :äøäæà\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4387 +#: src/http.c:4380 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr ".`%s' úáéúëá (%s) äì÷ú\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr ".`%s' úáéúëá (%s) äì÷ú\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr ".(SSL) çèáåàî øù÷ õåøò íé÷äì ïúéð àì\n" -#: src/http.c:4426 +#: src/http.c:4432 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr ".`%s' úáéúëá (%s) äì÷ú\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr ".øúà íù àìì áåúéð (%d) éåðéù :äì÷ú\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr ".úåðéîæ åéäé àì ïîæ úåîéúç -- äàöîð àì ïåøçà éåðéù ïîæ úøúåë\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr ".ïîæä úîéúçî íìòúî -- äéåâù ïåøçà éåðéù ïîæ úøúåë\n" -#: src/http.c:4572 +#: src/http.c:4580 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1202,16 +1216,16 @@ ".êùîéé àì õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò åðéà úøùá õáå÷\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr ".êùîéé õáå÷ä -- (%ld :éîå÷î õáå÷) ääæ åðéà ìãåâ\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr ".êùîéé õáå÷ä ,øúåé éðëãò ÷çåøî õáå÷\n" -#: src/http.c:4607 +#: src/http.c:4615 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1219,33 +1233,33 @@ "\n" msgstr ".êùîéé õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò ÷çåøî õáå÷\n" -#: src/http.c:4613 +#: src/http.c:4621 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr ".êùîéé àì õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò åðéà ÷çåøî õáå÷\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4628 +#: src/http.c:4636 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr ".êùîéé õáå÷ä ,øúåé éðëãò ÷çåøî õáå÷\n" -#: src/http.c:4637 +#: src/http.c:4645 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1253,7 +1267,7 @@ msgstr "" # Come on, are they serious?? -#: src/http.c:4688 +#: src/http.c:4696 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1262,59 +1276,59 @@ "%s (%s) - `%s' saved [%ld/%ld]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr ".øâñð øåáéçä ,%s-á (%s) íéúá %ld éøçà äì÷ú " -#: src/http.c:4772 +#: src/http.c:4780 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr ".%s-á %s áö÷á åìá÷úðù íéúá %ld éøçà (%s) äàéø÷ úì÷ú" -#: src/http.c:4781 +#: src/http.c:4789 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr ".%s-á %s áö÷á åìá÷úðù íéúá %ld/%ld éøçà (%s) äàéø÷ úì÷ú " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" -#: src/init.c:585 +#: src/init.c:579 #, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr ".%s úéðëú é\"ò %s õáå÷ úçéúôá (%s) äì÷ú\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr ".%s úéðëú øåáò äéåâù %s õáå÷á %d äøåù\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1322,7 +1336,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1330,75 +1344,75 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: ùîúùîä ìù ïäå úëøòîä ìù ïä wgetrc õáå÷ë ùîùî `%s' :äøäæà\n" -#: src/init.c:983 +#: src/init.c:977 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: %s äéåâù äãå÷ô\n" -#: src/init.c:1043 +#: src/init.c:1037 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: ãáìá off åà on íéëøò úìá÷î %s äàøåä\n" -#: src/init.c:1076 +#: src/init.c:1070 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" -#: src/init.c:1096 +#: src/init.c:1090 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1379 +#: src/init.c:1373 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1515 +#: src/init.c:1509 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1536 +#: src/init.c:1530 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1602 +#: src/init.c:1596 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1410,16 +1424,16 @@ msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "" @@ -1450,12 +1464,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "%s [ïééôàî]... [URL]... :ùåîéù ïôåà\n" -#: src/main.c:592 +#: src/main.c:593 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1465,297 +1479,297 @@ ".íéøö÷ íéðééôàîì íâ íééçøëä ,íéëåøà íéðééôàîì íééçøëää íéèðîåâøà\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:653 +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:660 +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 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:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1766,212 +1780,212 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:761 +#: src/main.c:762 #, fuzzy msgid "Directories:\n" msgstr " äé÷éú" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:795 +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1979,13 +1993,13 @@ "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1993,58 +2007,58 @@ " challenge\n" msgstr "" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:844 +#: src/main.c:845 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:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2054,19 +2068,19 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2076,400 +2090,400 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr " . úáåúëì øåôéùì úåòöäå (bugs) äì÷ú éçååéã åçìù\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr ".ìéòôî úåôúúùä àìì úùøäî íéöá÷ úëéùî ,%s àñøéâ GNU Wget úéðëú\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "" -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "" -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "" -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2479,7 +2493,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 #, fuzzy msgid "" "\n" @@ -2488,66 +2502,66 @@ "\n" ".Hrvoje Niksic é\"ò øå÷îá äáúëð åæ úéðëú\n" -#: src/main.c:1337 +#: src/main.c:1338 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr " . úáåúëì øåôéùì úåòöäå (bugs) äì÷ú éçååéã åçìù\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr ".øúåé áø òãéî úâöäì `%s --help' ùé÷äì äñð\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: `-n%c' éåâù ïééôàî\n" -#: src/main.c:1584 +#: src/main.c:1585 #, fuzzy, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr ".`--debug' ïééôàîá äëéîú íò äúðáð àì %s úéðëúä\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr ".äæ úà äæ íéøúåñ quiet-å verbose\n" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr ".äæ úà äæ íéøúåñ ïåøçà ïåëãò ïîæ íåùéøå íéîéé÷ íéöá÷ ìò äøéîù\n" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2555,152 +2569,152 @@ "\n" msgstr "" -#: src/main.c:1666 +#: src/main.c:1667 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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: øñç URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr ".%s-á URL óà àöîð àì\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "`%s' ÷åçîì ïåéñðá (%s) äì÷ú\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "%s-î (certificates) øåùéà úåéåú úðéòèá äì÷ú\n" -#: src/main.c:2257 +#: src/main.c:2264 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2711,7 +2725,7 @@ "--%s-- äòùá íééúñä\n" "íéúá %s ,íéöá÷ %d åëùîð\n" -#: src/main.c:2271 +#: src/main.c:2278 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "!(íéúá %s) äëéùî úìáâîî äâéøç\n" @@ -2877,7 +2891,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr ".ò÷øá êéùîî\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr ".`%s'-ì áúëéé èìô\n" @@ -2922,75 +2936,75 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s úéðëúá %s õáå÷ì äùéâá (%s) äì÷ú\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr ".%s äàøåäá `%s' éåâù êøò\n" +msgstr "" -#: src/openssl.c:636 +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2998,7 +3012,7 @@ " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3047,22 +3061,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr ".äàéâù úåòãåäî íìòúäì àð ;robots.txt õáå÷ ïòåè\n" -#: src/retr.c:912 +#: src/retr.c:928 #, fuzzy, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "`%s'-ì äáéúëá (%s) äì÷ú\n" -#: src/retr.c:924 +#: src/retr.c:940 #, fuzzy, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr ".HTTP úåéäì áééç :%s äùøåî úøù\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, fuzzy, c-format msgid "%d redirections exceeded.\n" msgstr ".%s úéðëúá úéìâòî äééðôä äúìâúä\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3070,7 +3084,7 @@ "!òðëð éðà\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3139,120 +3153,129 @@ msgid "HTTPS support not compiled in" msgstr ".`--debug' ïééôàîá äëéîú íò äúðáð àì %s úéðëúä\n" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:503 +#: src/utils.c:506 #, fuzzy, c-format msgid "Continuing in background, pid %d.\n" msgstr ".ò÷øá êéùîî\n" -#: src/utils.c:554 +#: src/utils.c:557 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "`%s' éìåáîéñ øåùé÷ ú÷éçîá (%s) äì÷ú\n" -#: src/utils.c:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" +msgstr "%s-î (certificates) øåùéà úåéåú úðéòèá äì÷ú\n" -#: src/utils.c:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" +msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" +msgstr "%s-î (certificates) øåùéà úåéåú úðéòèá äì÷ú\n" -#: src/utils.c:923 +#: src/utils.c:929 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" +msgstr "%s-î (certificates) øåùéà úåéåú úðéòèá äì÷ú\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "`%s'-ì äáéúëá (%s) äì÷ú\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3263,60 +3286,36 @@ msgstr[0] "" msgstr[1] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 #, fuzzy msgid "Could not open CDX file for output.\n" msgstr ".äùøåî úøù àöîð àì\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n" - -#, fuzzy -#~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s úéðëú é\"ò øëåî åðéà `--%s' ïééôàî\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" - -#, fuzzy -#~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n" - -#, fuzzy -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr ".åúåà êåùîì êøåö ïéà ,ïàë øáë `%s' õáå÷\n" - #~ msgid "Error in Set-Cookie, field `%s'" #~ msgstr "éåâù Set-Cookie úøúåë ìù `%s' äãù" @@ -3339,6 +3338,12 @@ #~ 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 "àöîð àì çøàî áùçî" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/hr.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/hr.gmo differ diff -Nru wget-1.19.5/po/hr.po wget-1.20.1/po/hr.po --- wget-1.19.5/po/hr.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/hr.po 2018-12-26 20:10:49.000000000 +0000 @@ -1,29 +1,20 @@ # Translation of wget to Croatian. -# Copyright (C) 2015 Free Software Foundation, Inc. +# Copyright (C) 2018 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # -# -# bp, nekoliko noticija -# ovo je ista verzija wget 1.14 po kao 2012. od TK. Samo je nekoliko rijeÄi -# izmjenjeno. Dodani su novi msgid-ovi i popravljeni su fuzzies. -# U sljedećoj verziji bit će viÅ¡e izmjena, nakon konzultacije s -# lingvistima, i hrvatskim TP Älanovima. -# Zahvaljujem prijaÅ¡njim prevoditeljima, jer je na njihovom trudu, -# napravljena i ova dopuna. -# # Hrvoje Niksic , 2005. # Marko KareÅ¡in , 2010-2011. # David Dubrović , 2010-2011. # Domagoj Margan , 2010-2011. # Vedran Miletić , 2010-2011. # Tomislav Krznar , 2012. -# Božidar Putanec , 2016, 2017. +# Božidar Putanec , 2016, 2017, 2018. msgid "" msgstr "" -"Project-Id-Version: GNU wget-1.18.109\n" +"Project-Id-Version: GNU wget-1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-02-18 13:29-0800\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-13 20:19-0800\n" "Last-Translator: Božidar Putanec \n" "Language-Team: Croatian \n" "Language: hr\n" @@ -33,7 +24,7 @@ "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.9\n" +"X-Generator: Poedit 2.2\n" #: lib/error.c:195 msgid "Unknown system error" @@ -41,23 +32,23 @@ #: lib/gai_strerror.c:57 msgid "Address family for hostname not supported" -msgstr "Obitelj adresa za ime raÄunala nije podržana" +msgstr "Ova obitelj adresa za ime hosta nije podržana" #: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" -msgstr "Privremena greÅ¡ka razluÄivanja imena" +msgstr "Privremena greÅ¡ka u rjeÅ¡avanju imena" #: lib/gai_strerror.c:59 msgid "Bad value for ai_flags" -msgstr "LoÅ¡a vrijednost za ‘ai_flags’" +msgstr "LoÅ¡a vrijednost za ai_flags" #: lib/gai_strerror.c:60 msgid "Non-recoverable failure in name resolution" -msgstr "Nepopravljiv neuspjeh razluÄivanja imena" +msgstr "Nepopravljiv neuspjeh u rjeÅ¡avanju imena" #: lib/gai_strerror.c:61 msgid "ai_family not supported" -msgstr "‘ai_family’ nije podržana" +msgstr "ai_family nije podržana" #: lib/gai_strerror.c:62 msgid "Memory allocation failure" @@ -65,7 +56,7 @@ #: lib/gai_strerror.c:63 msgid "No address associated with hostname" -msgstr "Nijedna adresa nije pridružena raÄunalu" +msgstr "Nijedna adresa nije pridružena imenu hosta" #: lib/gai_strerror.c:64 msgid "Name or service not known" @@ -73,11 +64,11 @@ #: lib/gai_strerror.c:65 msgid "Servname not supported for ai_socktype" -msgstr "Naziv usluge nije podržan za ‘ai_socktype’" +msgstr "Ime servera (servname) nije podržano za ai_socktype" #: lib/gai_strerror.c:66 msgid "ai_socktype not supported" -msgstr "‘ai_socktype’ nije podržan" +msgstr "nepodržani ai_socktype" #: lib/gai_strerror.c:67 msgid "System error" @@ -93,7 +84,7 @@ #: lib/gai_strerror.c:71 msgid "Request canceled" -msgstr "Zahtjev otkazan" +msgstr "Zahtjev je otkazan" #: lib/gai_strerror.c:72 msgid "Request not canceled" @@ -105,45 +96,45 @@ #: lib/gai_strerror.c:74 msgid "Interrupted by a signal" -msgstr "Prekinut signalom" +msgstr "Prekinuto sa signalom" #: lib/gai_strerror.c:75 msgid "Parameter string not correctly encoded" -msgstr "Parametar nije pravilno kodiran" +msgstr "String s parametrima nije pravilno kodiran" #: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Nepoznata greÅ¡ka" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: opcija ‘%s’ je viÅ¡eznaÄna\n" +msgstr "%s: opcija „%s%s“ je dvosmislena\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: opcija ‘%s’ je viÅ¡eznaÄna; mogućnosti:" +msgstr "%s: opcija „%s%s“ je dvosmislena; moguće varijante su:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: nepoznata opcija ‘%c%s’\n" +msgstr "%s: neprepoznata opcija „%s%s“\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: opcija ‘%c%s’ ne dopuÅ¡ta argument\n" +msgstr "%s: opcija „%s%s“ ne dopuÅ¡ta argument\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: opcija „--%s“ zahtijeva argument\n" +msgstr "%s: opcija „%s%s“ zahtijeva argument\n" #: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: neispravna opcija -- ‘%c’\n" +msgstr "%s: nevaljana opcija -- „%c“\n" #: lib/getopt.c:636 lib/getopt.c:682 #, c-format @@ -189,15 +180,15 @@ #: lib/regcomp.c:141 msgid "Invalid regular expression" -msgstr "Neispravan regularni izraz" +msgstr "Nevaljani regularni izraz" #: lib/regcomp.c:144 msgid "Invalid collation character" -msgstr "Neispravan znak razvrstavanja" +msgstr "Nevaljani znak razvrstavanja" #: lib/regcomp.c:147 msgid "Invalid character class name" -msgstr "Neispravno ime razreda znakova" +msgstr "Nevaljano ime razreda znakova" #: lib/regcomp.c:150 msgid "Trailing backslash" @@ -205,27 +196,27 @@ #: lib/regcomp.c:153 msgid "Invalid back reference" -msgstr "Neispravna povratna referencija" +msgstr "Nevaljana povratna referencija" #: lib/regcomp.c:156 msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Manjka pȃr za: [, [^, [:, [., or [=" +msgstr "Nesparena: [, [^, [:, [., ili [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" -msgstr "Manjka pȃr za: ( ili \\(" +msgstr "Nesparena: ( ili \\(" #: lib/regcomp.c:162 msgid "Unmatched \\{" -msgstr "Manjka pȃr za: \\{" +msgstr "Nesparena: \\{" #: lib/regcomp.c:165 msgid "Invalid content of \\{\\}" -msgstr "Neispravan sadržaj \\{\\}" +msgstr "Nevaljani sadržaj u \\{\\}" #: lib/regcomp.c:168 msgid "Invalid range end" -msgstr "Neispravan kraj raspona" +msgstr "Nevaljani kraj raspona" #: lib/regcomp.c:171 msgid "Memory exhausted" @@ -233,11 +224,11 @@ #: lib/regcomp.c:174 msgid "Invalid preceding regular expression" -msgstr "Neispravan prethodni regularni izraz" +msgstr "Nevaljani prethodni regularni izraz" #: lib/regcomp.c:177 msgid "Premature end of regular expression" -msgstr "Preuranjen kraj regularnog izraza" +msgstr "Preuranjeni kraj regularnog izraza" #: lib/regcomp.c:180 msgid "Regular expression too big" @@ -245,33 +236,33 @@ #: lib/regcomp.c:183 msgid "Unmatched ) or \\)" -msgstr "Manjka pȃr za: ) ili \\)" +msgstr "Nesparena ) ili \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Nedostaje prethodni regularni izraz" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" -msgstr "ne mogu napraviti cijev" +msgstr "nije moguće napraviti cijev" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" -msgstr "%s potproces nije uspio" +msgstr "neuspjeÅ¡ni %s potproces" #: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" -msgstr "‘_open_osfhandle’ nije uspio" +msgstr "_open_osfhandle() zavrÅ¡ila je s neuspjehom" #: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" -msgstr "ne mogu vratiti fd %d: dup2 nije uspio" +msgstr "nije moguće vratiti fd %d: dup2() je zavrÅ¡ila s neuspjehom" #: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317 #, c-format @@ -281,7 +272,7 @@ #: lib/wait-process.c:274 lib/wait-process.c:346 #, c-format msgid "%s subprocess got fatal signal %d" -msgstr "%s potproces je dobio fatalni signal %d" +msgstr "%s potproces je primio fatalni signal %d" #: lib/xalloc-die.c:34 msgid "memory exhausted" @@ -290,7 +281,7 @@ #: 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" +msgstr "%s: bind adresa %s ne može se razrijeÅ¡iti; bind se iskljuÄuje\n" #: src/connect.c:281 #, c-format @@ -310,38 +301,38 @@ #: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" -msgstr "setsockopt SO_RCVBUF nije uspjelo: %s\n" +msgstr "neuspjeÅ¡ni setsockopt SO_RCVBUF: %s\n" #: src/connect.c:356 msgid "connected.\n" -msgstr "spojen.\n" +msgstr "spajanje je uspostavljeno\n" #: src/connect.c:375 src/host.c:914 src/host.c:952 #, c-format msgid "failed: %s.\n" -msgstr "neuspjeÅ¡no: %s.\n" +msgstr "neuspjeh: %s\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" -msgstr "%s: adresa raÄunala %s ne može se razrijeÅ¡iti\n" +msgstr "%s: adresa hosta %s ne može se razrijeÅ¡iti\n" #: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" -msgstr "setsockopt SO_REUSEADDR nije uspjelo: %s\n" +msgstr "neuspjeÅ¡ni setsockopt SO_REUSEADDR: %s\n" #: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" -"Otvoreno je previÅ¡e fd datoteka. Izbor (select) se može rabiti ako je fd >=" -"%d\n" +"Otvoreno je previÅ¡e datoteÄnih deskriptora (fd)\n" +"Nije moguće rabiti select ako je fd >=%d\n" #: src/convert.c:198 #, c-format msgid "Converted links in %d files in %s seconds.\n" -msgstr "Poveznice u %d datoteka pretvorene su u %s sekundi.\n" +msgstr "Pretvorene su poveznice u %d datoteka u %s sekundi\n" #: src/convert.c:227 #, c-format @@ -350,12 +341,12 @@ #: src/convert.c:240 msgid "nothing to do.\n" -msgstr "nema posla.\n" +msgstr "nema niÅ¡ta za raditi\n" #: src/convert.c:248 src/convert.c:272 #, c-format msgid "Cannot convert links in %s: %s\n" -msgstr "Poveznice u %s ne mogu se pretvoriti: %s\n" +msgstr "Nije moguće pretvoriti poveznice u %s: %s\n" #: src/convert.c:263 #, c-format @@ -375,12 +366,12 @@ #: 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" +msgstr "GreÅ¡ka u sintaksi Set-Cookie“: %s na poziciji %d\n" #: 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" +msgstr "KolaÄić iz %s pokuÅ¡ao je postaviti domenu na " #: src/cookies.c:774 src/spider.c:92 #, c-format @@ -390,7 +381,7 @@ #: 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" +msgstr "Nije moguće otvoriti datoteku s kolaÄićima %s: %s\n" #: src/cookies.c:1383 #, c-format @@ -404,7 +395,8 @@ #: src/ftp-ls.c:1045 msgid "Unsupported listing type, trying Unix listing parser.\n" -msgstr "Ova vrsta ftp ‘listing’ nije podržana, pokuÅ¡avam s Unix analizom.\n" +msgstr "" +"Ova vrsta ftp listinga nije podržana -- pokuÅ¡ava se raÅ¡Älamba s Unix alatom\n" #: src/ftp-ls.c:1096 src/ftp-ls.c:1098 #, c-format @@ -414,12 +406,12 @@ #: src/ftp-ls.c:1123 #, c-format msgid "time unknown " -msgstr "vrijeme nepoznato " +msgstr "nepoznato vrijeme " #: src/ftp-ls.c:1127 #, c-format msgid "File " -msgstr "Datoteka " +msgstr "Datoteka " #: src/ftp-ls.c:1130 #, c-format @@ -446,23 +438,24 @@ msgid "Length: %s" msgstr "Duljina: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) preostaje" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s preostaje" #: src/ftp.c:238 msgid " (unauthoritative)\n" -msgstr " (nemjerodavan)\n" +msgstr " (nije mjerodavan)\n" #: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." -msgstr "SSL se ne može inicirati. Bit će onemogućen." +msgstr "" +"SSL nije moguće inicijalizirati -- neće biti omogućen (bit će onemogućen)" #: src/ftp.c:485 #, c-format @@ -473,41 +466,41 @@ #: 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" +msgstr "GreÅ¡ka u odgovoru servera -- kontrolna veza se zatvara\n" #: src/ftp.c:511 msgid "Error in server greeting.\n" -msgstr "GreÅ¡ka u pozdravu poslužitelja.\n" +msgstr "GreÅ¡ka u pozdravu servera\n" #: 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" +msgstr "Pisanje nije uspjelo -- kontrolna veza se zatvara\n" #: src/ftp.c:524 msgid "The server refuses login.\n" -msgstr "Poslužitelj odbija prijavu.\n" +msgstr "Server odbija prijavu\n" #: src/ftp.c:530 msgid "Login incorrect.\n" -msgstr "NetoÄna prijava.\n" +msgstr "NetoÄna prijava\n" #: src/ftp.c:536 msgid "Logged in!\n" -msgstr "Prijavljen!\n" +msgstr "Prijava je uspjela!\n" #: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" -msgstr "Poslužitelj nije prihvatio ‘PBSZ 0’ naredbu.\n" +msgstr "Server nije prihvatio „PBSZ 0“ naredbu\n" #: 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" +msgstr "Server nije prihvatio „PROT %c“ naredbu\n" #: 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" +msgstr "GreÅ¡ka na serveru -- nije moguće otkriti vrstu sustava\n" #: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " @@ -520,19 +513,19 @@ #: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" -msgstr "Nepoznata vrsta „%c“, kontrolna veza se zatvara.\n" +msgstr "Nepoznata vrsta „%c“ -- kontrolna veza se zatvara\n" #: src/ftp.c:749 msgid "done. " -msgstr "gotovo." +msgstr "gotovo. " #: src/ftp.c:755 msgid "==> CWD not needed.\n" -msgstr "==> CWD nije potreban.\n" +msgstr "==> CWD nije potreban\n" #: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" -msgstr "Interna greÅ¡ka! Nemoguća sekcija dohvaćena u getftp()" +msgstr "**Interna greÅ¡ka**: dohvaćena je logiÄki nemoguća sekcija u getftp()" #: src/ftp.c:940 #, c-format @@ -551,38 +544,38 @@ "No such directory %s.\n" "\n" msgstr "" -"Direktorij %s ne postoji.\n" +"Direktorij %s ne postoji\n" "\n" #: src/ftp.c:991 msgid "==> CWD not required.\n" -msgstr "==> CWD nije potreban.\n" +msgstr "==> CWD nije potreban\n" #: src/ftp.c:1034 msgid "File has already been retrieved.\n" -msgstr "Datoteka je već preuzeta.\n" +msgstr "Datoteka je već preuzeta\n" #: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" -msgstr "Nije moguće zapoÄeti PASV prijenos.\n" +msgstr "Nije moguće inicijalizirati PASV prijenos\n" #: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" -msgstr "Nije moguće obraditi PASV odgovor.\n" +msgstr "Nije moguće raÅ¡Älaniti PASV odgovor\n" #: 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" +msgstr "nije moguće spajanje na %s port %d: %s\n" #: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" -msgstr "GreÅ¡ka povezivanja (%s).\n" +msgstr "GreÅ¡ka povezivanja (%s)\n" #: src/ftp.c:1151 msgid "Invalid PORT.\n" -msgstr "Neispravan PORT.\n" +msgstr "Nevaljani PORT\n" #: src/ftp.c:1197 msgid "" @@ -590,17 +583,17 @@ "REST failed, starting from scratch.\n" msgstr "" "\n" -"REST nije uspio, zapoÄinje ispoÄetka.\n" +"REST naredba nije uspjela; zapoÄinje ispoÄetka\n" #: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" -msgstr "Datoteka %s postoji.\n" +msgstr "Datoteka %s postoji\n" #: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" -msgstr "Nema takve datoteke %s.\n" +msgstr "Nema takve datoteke %s\n" #: src/ftp.c:1296 #, c-format @@ -608,7 +601,7 @@ "No such file %s.\n" "\n" msgstr "" -"Nema takve datoteke %s.\n" +"Nema takve datoteke %s\n" "\n" #: src/ftp.c:1346 @@ -617,18 +610,18 @@ "No such file or directory %s.\n" "\n" msgstr "" -"Nema takve datoteke ili direktorija %s.\n" +"Nema takve datoteke ili direktorija %s\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" -msgstr "%s se nenadano pojavio.\n" +msgstr "%s se nenadano pojavio\n" #: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" -msgstr "%s: %s, kontrolna veza se zatvara.\n" +msgstr "%s: %s -- kontrolna veza se zatvara\n" #: src/ftp.c:1606 #, c-format @@ -637,23 +630,23 @@ #: src/ftp.c:1621 msgid "Control connection closed.\n" -msgstr "Kontrolna veza je prekinuta.\n" +msgstr "Kontrolna veza je prekinuta\n" #: src/ftp.c:1639 msgid "Data transfer aborted.\n" -msgstr "Prijenos podataka je prekinut.\n" +msgstr "Prijenos podataka je prekinut\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" -msgstr "Datoteka %s već postoji; ponovno se ne preuzima.\n" +msgstr "Datoteka %s već postoji -- ne preuzima se\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" -msgstr "(pok:%2d)" +msgstr "(pokuÅ¡aj:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -662,7 +655,7 @@ "%s (%s) - zapisano na standardni izlaz %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -671,33 +664,31 @@ "%s (%s) - %s spremljeno [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" -msgstr "Uklanja se %s.\n" +msgstr "Uklanja se %s\n" #: src/ftp.c:2157 #, c-format msgid "Using %s as listing tmp file.\n" -msgstr "%s se koristi kao privremeni popis datoteka.\n" +msgstr "%s se koristi kao privremeni popis datoteka (listing)\n" #: src/ftp.c:2174 #, c-format msgid "Removed %s.\n" -msgstr "Uklonjeno %s.\n" +msgstr "Uklonjen je %s\n" #: src/ftp.c:2213 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" -msgstr "Dubina rekurzije %d prelazi najveću dozvoljenu dubinu %d.\n" +msgstr "Dubina rekurzije %d prekoraÄila je maksimalnu dubinu %d\n" #: src/ftp.c:2283 #, 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" +msgstr "Lokalna datoteka %s novija je od one udaljene -- ne nepreuzima se\n" #: src/ftp.c:2291 #, c-format @@ -705,7 +696,7 @@ "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "" -"Datoteka na poslužitelju je novija od lokalne datoteke %s -- preuzima se.\n" +"Datoteka na serveru je novija od lokalne datoteke %s -- preuzima se\n" "\n" #: src/ftp.c:2298 @@ -714,12 +705,12 @@ "The sizes do not match (local %s) -- retrieving.\n" "\n" msgstr "" -"VeliÄine se ne slažu (lokalno %s) -- preuzima se.\n" +"VeliÄine se ne slažu (lokalno %s) -- preuzima se\n" "\n" #: src/ftp.c:2316 msgid "Invalid name of the symlink, skipping.\n" -msgstr "Neispravno ime simboliÄke veze, preskoÄena.\n" +msgstr "Nevaljano ime simboliÄke veze -- preskaÄe\n" #: src/ftp.c:2333 #, c-format @@ -733,202 +724,218 @@ #: src/ftp.c:2342 #, c-format msgid "Creating symlink %s -> %s\n" -msgstr "Napravljena simboliÄka veza %s -> %s\n" +msgstr "Kreira se simboliÄka veza %s -> %s\n" #: src/ftp.c:2352 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" -msgstr "SimboliÄke veze nisu podržane, preskoÄena veza %s.\n" +msgstr "SimboliÄke veze nisu podržane -- preskaÄe se simveza %s\n" #: src/ftp.c:2367 #, c-format msgid "Skipping directory %s.\n" -msgstr "PreskoÄen direktorij %s.\n" +msgstr "PreskaÄe se direktorij %s\n" #: src/ftp.c:2380 #, c-format msgid "%s: unknown/unsupported file type.\n" -msgstr "%s: nepoznata ili nepodržana vrsta datoteke.\n" +msgstr "%s: nepoznata ili nepodržana vrsta datoteke\n" #: src/ftp.c:2404 #, c-format msgid "Failed to set permissions for %s.\n" -msgstr "Nije uspjelo postaviti dopuÅ¡tenja za %s\n" +msgstr "Nije uspjelo postaviti prava pristupa za %s\n" #: src/ftp.c:2425 #, c-format msgid "%s: corrupt time-stamp.\n" -msgstr "%s: neispravna vremenska oznaka.\n" +msgstr "%s: oÅ¡tećena vremenska oznaka\n" #: src/ftp.c:2449 #, 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" +msgstr "Direktoriji neće biti preueti jer je dubina %d (maksimum je %d)\n" #: src/ftp.c:2500 #, 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" +msgstr "Ne silazi se u %s jer nije ukljuÄen ili je iskljuÄen\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" -msgstr "Odbijam %s.\n" +msgstr "Odbija se %s\n" + +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Odbija se %s (nevaljani unos)\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s je iskljuÄen ili nije ukljuÄen u regularnom izrazu\n" -#: src/ftp.c:2627 +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" -msgstr "GreÅ¡ka usporeÄ‘ivanja %s sa %s: %s\n" +msgstr "GreÅ¡ka pri usporeÄ‘ivanju %s sa %s: %s.\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" -msgstr "Nema podudaranja s uzorkom %s.\n" +msgstr "Nema podudaranja s uzorkom %s\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" -msgstr "Upisan HTML-iziran indeks u %s [%s].\n" +msgstr "Indeks u HTML formatu zapisan je u %s [%s]\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" -msgstr "Upisan HTML-iziran indeks u %s.\n" +msgstr "Indeks u HTML formatu zapisan je u %s\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" -msgstr "GREÅ KA: Direktorij %s se ne može otvoriti.\n" +msgstr "GREÅ KA: direktorij %s ne može se otvoriti.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" -msgstr "GREÅ KA: Neuspjelo otvaranje certifikata %s: (%d).\n" +msgstr "GREÅ KA: nije uspjelo otvaranje certifikata %s: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" -msgstr "UÄitan CA certifikat ‘%s’\n" +msgstr "UÄitani je CA certifikat „%s“\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" -msgstr "GREÅ KA: Neuspjeh pri uÄitavanju CRL datoteke ‘%s’: (%d)\n" +msgstr "GREÅ KA: nije uspjelo uÄitati CRL datoteke „%s“: (%d).\n" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" -msgstr "UÄitana CRL datoteka ‘%s’\n" +msgstr "UÄitana je CRL datoteka „%s“\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "VaÅ¡a OpenSSL inaÄica je prestara i ne podržava TLS 1.3\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: vrijednost %d opcije ‘secure-protocol’ nije implementiran\n" +msgstr "GnuTLS: vrijednost %u opcije „secure-protocol“ nije implementirana\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Izvijestite o ovom problemu (na engleskom) na \n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" -msgstr "GnuTLS: vrijednost %d opcije ‘secure-protocol’ nije implementiran\n" +msgstr "GnuTLS: vrijednost %d opcije „secure-protocol“ nije implementirana\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: nije moguće direktno postaviti prio string; postavlja se zadani " +"prioritet\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "GREÅ KA" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "UPOZORENJE" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" -msgstr "%s: %s nije predoÄio certifikat.\n" +msgstr "%s: %s nije predoÄio certifikat\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" -msgstr "%s: Certifikat %s nije pouzdan.\n" +msgstr "%s: certifikat %s nije pouzdan\n" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" -msgstr "%s: Certifikat %s nema poznatog izdavatelja.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" +msgstr "%s: certifikat od %s nije izdan od poznatoga izdavatelja\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" -msgstr "%s: Certifikat %s je ukinut.\n" +msgstr "%s: certifikat od %s je opozvan\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" -msgstr "%s: Potpisnik certifikata %s nije CA.\n" +msgstr "%s: potpisnik certifikata od %s nije bio CA\n" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, 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" +msgstr "%s: certifikat %s je potpisan s nesigurnim algoritmom\n" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" -msgstr "%s: Certifikat %s joÅ¡ nije aktiviran.\n" +msgstr "%s: certifikat %s joÅ¡ nije aktiviran\n" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" -msgstr "%s: Certifikat %s je istekao.\n" +msgstr "%s: certifikat %s viÅ¡e ne vrijedi (istekao je)\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" -msgstr "GreÅ¡ka pri inicijaliziranju X509 certifikata: %s\n" +msgstr "GreÅ¡ka pri inicijalizaciji X509 certifikata: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" -msgstr "Certifikat nije pronaÄ‘en\n" +msgstr "Nijedan certifikat nije pronaÄ‘en\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" -msgstr "GreÅ¡ka pri obradi certifikata: %s\n" +msgstr "GreÅ¡ka pri raÅ¡Älambi certifikata: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Certifikat joÅ¡ nije aktiviran\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" -msgstr "Certifikat je istekao\n" +msgstr "Certifikat viÅ¡e ne vrijedi (istekao je)\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" -msgstr "Vlasnik certifikata ne odgovara imenu raÄunala %s\n" +msgstr "Vlasnik certifikata ne podudara se s imenom hosta „%s“\n" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Certifikat mora biti X.509\n" #: src/host.c:156 msgid "Error in handling the address list.\n" -msgstr "PogreÅ¡ka pri obradi popisa adresa.\n" +msgstr "PogreÅ¡ka pri obradi popisa adresa\n" #: src/host.c:367 msgid "Unknown host" @@ -938,49 +945,51 @@ #: src/host.c:849 #, c-format msgid "Resolving %s... " -msgstr "Tražim %s... " +msgstr "Traži se %s... " #: src/host.c:925 msgid "failed: No IPv4/IPv6 addresses for host.\n" -msgstr "neuspjeh: Nema IPv4 ili IPv6 adresa za raÄunalo.\n" +msgstr "neuspjeh: Nema ni IPv4 ni IPv6 adresa za hosta\n" #: src/host.c:955 msgid "failed: timed out.\n" -msgstr "neuspjeh: vrijeme je isteklo.\n" +msgstr "neuspjeh: vrijeme je isteklo\n" #: 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" +msgstr "%s: nepotpuni hyperlink %s se ne može razrijeÅ¡iti\n" #: src/html-url.c:939 #, c-format msgid "%s: Invalid URL %s: %s\n" -msgstr "%s: Neispravan URL %s: %s\n" +msgstr "%s: nevaljani URL %s: %s\n" #: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" -msgstr "NeuspjeÅ¡no slanje HTTP zahtjeva: %s.\n" +msgstr "GreÅ¡ka pri pisanju HTTP zahtjeva: %s\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" -msgstr "Nema zaglavlja, pretpostavljam HTTP/0.9" +msgstr "Nema zaglavlja; pretpostavlja se HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "" -"Datoteka %s već postoji; ponovno se ne preuzima.\n" +"Datoteka %s već postoji -- ne preuzima \n" +"\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" -msgstr "neuspjeh ‘gmtime’. Vjerojatno se radi o greÅ¡kici (bug).\n" +msgstr "" +"gmtime() zavrÅ¡ila je neuspjeÅ¡no -- to je vjerojatno greÅ¡ka u programu\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -989,294 +998,293 @@ "upisati\n" " kao zadnja izmjena\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" -msgstr "Nedostaju podaci iz ‘BODY’ datoteke %s: %s\n" +msgstr "Nema datoteke s BODY podacima %s: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" -msgstr "Nova uporaba postojeće veze prema [%s]:%d.\n" +msgstr "Nova uporaba postojeće veze prema [%s]:%d\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" -msgstr "Nova uporaba postojeće veze prema %s:%d.\n" +msgstr "Nova uporaba postojeće veze prema %s:%d\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" -msgstr "NeuspjeÅ¡no Äitanje odgovora proxy poslužitelja: %s.\n" +msgstr "" +"Nije uspjelo proÄitati odgovor proxy-a: %s.\n" +" \n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s GREÅ KA %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Deformirana status-vrpca" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" -msgstr "NeuspjeÅ¡no tuneliranje kroz ‘proxy’ poslužitelj: %s" +msgstr "Nije uspjelo tuneliranje kroz proxy server: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" -msgstr "Nepoznata metoda autentifikacije.\n" +msgstr "Nepoznata metoda autentifikacije\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Odabrana autentifikacija: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Spremanje u: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" "Pri preuzimanju potpisa:\n" -"%s: %s.\n" +"%s: %s\n" -#: src/http.c:2830 +#: src/http.c:2833 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" +"Nemoguće je proÄitati potpise iz privremene datoteke -- preskaÄe se.\n" +" \n" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -"Nemoguće je napraviti privremenu datoteku. PreskoÄeno preuzimanje potpisa.\n" +"Nemoguće je napraviti privremenu datoteku -- preskaÄe se 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" -msgstr "Neispravna ‘pri’ vrijednost. Postavljena na %d.\n" +msgstr "Nevaljana „pri“ vrijednost -- uzima se da je %d\n" # digest > hash -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -"Nije moguće pronaći prihvatljivi kontrolni zbroj za Metalink resursa.\n" -"Zanemaruje se.\n" +"Nije moguće pronaći prihvatljivu kontrolnu sumu za Metalink resurse.\n" +"Ignoriraju se.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" -msgstr "SSL se iskljuÄuje zbog pronaÄ‘enih greÅ¡aka.\n" +msgstr "Onemogućuje se SSL zbog nastalih greÅ¡aka\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " -msgstr "%s zahtjev poslan, Äekanje odgovora... " +msgstr "%s zahtjev je poslan, Äeka se odgovor... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" -msgstr "Podaci nisu primljeni.\n" +msgstr "Nikakvi podaci nisu primljeni\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" -msgstr "GreÅ¡ka Äitanja (%s) u zaglavljima.\n" +msgstr "GreÅ¡ka Äitanja (%s) u zaglavljima\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(bez opisa)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" -msgstr "Položaj: %s%s\n" +msgstr "Lokacija: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" -msgstr "nedefinirano" +msgstr "nespecificirano" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" -msgstr " [pratim]" +msgstr " [prati se]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -"Datoteka %s nije izmijenjena na poslužitelju. PropuÅ¡ta se preuzimanje.\n" +"Datoteka %s nije izmijenjena na serveru -- preuzimanje se propuÅ¡ta\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" "You might want to add --no-if-modified-since option.\n" "\n" msgstr "" -"Poslužitelj je zanemario ‘If-Modified-Since’ zaglavlje za datoteku %s.\n" -"PokuÅ¡ajte dodati ‘--no-if-modified-since’ opciju.\n" +"Server je zanemario If-Modified-Since zaglavlje za datoteku %s.\n" +"PokuÅ¡ajte dodati opciju --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" "\n" msgstr "" "\n" -" Datoteka je već u potpunosti preuzeta; nema posla.\n" +" Datoteka je već u potpunosti preuzeta; nema niÅ¡ta za raditi.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Duljina: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" -msgstr "zanemareno" +msgstr "ignorirano" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" -msgstr "Upozorenje: HTTP ne podržava viÅ¡eznaÄnike (wildcards).\n" +msgstr "Upozorenje: HTTP ne podržava viÅ¡eznaÄnike (wildcards)\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" -msgstr "" -"‘Spider’ je omogućen. Provjerite postoji li datoteka na poslužitelju.\n" +msgstr "Spider je omogućen. Provjerite postoji li datoteka na serveru.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" -msgstr "Nije moguće pisati u %s (%s).\n" +msgstr "Nije moguće pisati u %s (%s)\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" -msgstr "Obvezni atribut nedostaje u preuzetom zaglavlju.\n" +msgstr "Obvezni atribut nedostaje u preuzetom zaglavlju\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" -msgstr "Autentifikacija korisnik/lozinka nije uspjela.\n" +msgstr "Autentifikacija korisnik/lozinka nije uspjela\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" -msgstr "U WARC datoteku se ne može pisati.\n" +msgstr "U WARC datoteku se ne može pisati\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" -msgstr "U privremenu WARC datoteku se ne može pisati.\n" +msgstr "U privremenu WARC datoteku se ne može pisati\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" -msgstr "SSL veza se ne može uspostaviti.\n" +msgstr "Nije moguće uspostaviti SSL vezu\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" -msgstr "Veza %s (%s) se ne može ukloniti.\n" +msgstr "Veza %s (%s) se ne može ukloniti\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "GREÅ KA: Preusmjeravanje (%d) bez cilja (adrese).\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -"Nema Metalink podataka u HTTP odgovoru. Preuzimanje datoteke pomoću HTTP " +"Nema Metalink podataka u HTTP odgovoru. Datoteka se preuzima pomoću HTTP " "GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" -msgstr "NaÄ‘eno je Metalink zaglavlje. Prelazim na Metalink naÄin.\n" +msgstr "NaÄ‘eno je Metalink zaglavlje. Prelazi se na Metalink naÄin rada.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" -msgstr "Datoteka ne postoji na poslužitelju -- neispravni ‘hyperlink’!!!\n" +msgstr "Datoteka ne postoji na serveru -- neispravni hyperlink!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" -msgstr "" -"Nedostaje ‘Last-modified’ zaglavlje -- vremenske oznake su iskljuÄene.\n" +msgstr "Nedostaje Last-modified zaglavlje -- vremenske oznake se iskljuÄuju\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" -msgstr "" -"Neispravno ‘Last-modified’ zaglavlje -- vremenska oznaka je zanemarena.\n" +msgstr "Nevaljano Last-modified zaglavlje -- vremenska oznaka se ignorira\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "" -"Datoteka na poslužitelju nije novija od lokalne datoteke %s\n" -" -- ne preuzima se.\n" +"Lokalna datoteka %s je novija od one na serveru -- ne preuzima se\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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" +msgstr "VeliÄine se ne slažu (lokalno %s) -- ponovno se preuzima\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" -msgstr "Datoteka na poslužitelju je novija, preuzima se ponovno.\n" +msgstr "Datoteka na serveru je novija -- preuzima se\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" "\n" msgstr "" -"Datoteka na poslužitelju postoji i moguće je da sadrži veze na ostale " -"resurse\n" -" -- preuzima se.\n" +"Udaljena datoteka postoji; možda sadrži veze na ostale resurse -- preuzima " +"se\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" -"Datoteka na poslužitelju postoji ali nema nikakvih veza -- ne preuzima se.\n" +"Datoteka na serveru postoji, ali nema nikakvih veza -- ne preuzima se\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -"Datoteka na poslužitelju postoji i može sadržavati daljnje poveznice,\n" -"ali rekurzija je onemogućena -- ne preuzima se.\n" +"Datoteka na serveru postoji i može sadržavati daljnje poveznice,\n" +"ali rekurzija je onemogućena -- ne preuzima se\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" msgstr "" -"Datoteka na poslužitelju postoji.\n" +"Datoteka na serveru postoji\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1285,7 +1293,7 @@ "%s (%s) - zapisano na standardni izlaz %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1294,207 +1302,208 @@ "%s (%s) - %s spremljeno [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " -msgstr "%s (%s) - Veza zatvorena na bajtu %s. " +msgstr "%s (%s) - Veza zatvorena na bajtu %s " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." -msgstr "%s (%s) - GreÅ¡ka Äitanja na bajtu %s (%s)." +msgstr "%s (%s) - GreÅ¡ka Äitanja na bajtu %s (%s)" -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " -msgstr "%s (%s) - GreÅ¡ka Äitanja na bajtu %s/%s (%s). " +msgstr "%s (%s) - GreÅ¡ka Äitanja na bajtu %s/%s (%s) " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" -msgstr "Nepodržana kvaliteta zaÅ¡tite ‘%s’.\n" +msgstr "Nepodržana kvaliteta zaÅ¡tite „%s“\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" -msgstr "Nepodržan algoritam ‘%s’.\n" +msgstr "Nepodržani algoritam „%s“\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, 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" +msgstr "" +"%s: WGETRC pokazuje na %s a kojem nije moguće pristupiti zbog greÅ¡ke: %s\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" -msgstr "%s: Ne mogu proÄitati %s (%s).\n" +msgstr "%s: nije moguće proÄitati %s (%s)\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" -msgstr "%s: GreÅ¡ka u %s u retku %d.\n" +msgstr "%s: greÅ¡ka u %s u retku %d\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" -msgstr "%s: SintaktiÄka greÅ¡ka u %s u retku %d.\n" +msgstr "%s: sintaktiÄka greÅ¡ka u %s u retku %d\n" # c-format -#: src/init.c:713 +#: src/init.c:706 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" -msgstr "%s: Nepoznata naredba %s u %s u retku %d.\n" +msgstr "%s: nepoznata naredba %s u %s u retku %d\n" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" "'%s',\n" "or specify a different file using --config.\n" msgstr "" -"Obrada wgetrc datoteke sustava (varijabla okoline SYSTEM_WGETRC) nije\n" -" uspjela. Molim provjerite ‘%s’,\n" -" ili navedite drugu datoteku opcijom --config.\n" +"Nije uspjelo raÅ¡Älaniti datoteku sustava wgetrc (SYSTEM_WGETRC). Provjerite\n" +"„%s“\n" +"ili navedite neku drugu datoteku s --config opcijom.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" "'%s',\n" "or specify a different file using --config.\n" msgstr "" -"Obrada wgetrc datoteke sustava nije uspjela. Molim\n" -" provjerite ‘%s’,\n" -" ili navedite drugu datoteku opcijom --config.\n" +"Nije uspjelo raÅ¡Älaniti datoteku sustava wgetrc (SYSTEM_WGETRC). Provjerite\n" +"„%s“\n" +"ili navedite neku drugu datoteku s --config opcijom.\n" # c-format -#: src/init.c:783 +#: src/init.c:776 #, 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" +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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" -msgstr "%s: PogreÅ¡na naredba ‘%s’ u ‘--execute’.\n" +msgstr "%s: nevaljana naredba --execute %s\n" # c-format -#: src/init.c:1043 +#: src/init.c:1037 #, 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" +msgstr "%s: %s: nevaljana logiÄka varijabla %s -- koristite „on“ ili „off“\n" # c-format -#: src/init.c:1076 +#: src/init.c:1070 #, 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" +msgstr "%s: %s: nevaljani %s -- koristite „on“ , „off“ ili „quiet“\n" # c-format -#: src/init.c:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" -msgstr "%s: %s: Neispravan broj %s.\n" +msgstr "%s: %s: nevaljani broj %s\n" -#: src/init.c:1178 +#: src/init.c:1172 #, 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:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" -msgstr "%s: %s: Neispravna vrijednost bajta %s\n" +msgstr "%s: %s: nevaljana vrijednost bajta %s\n" # c-format -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" -msgstr "%s: %s: Neispravan vremenski period %s\n" +msgstr "%s: %s: nevaljani vremenski period %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -"use-askpass zahtijeva ili znakovni niz ili postavku okoliÅ¡nih varijabli " -"WGET_ASKPASS ili SSH_ASKPASS.\n" +"use-askpass zahtijeva string ili postavljenu varijablu okoline\n" +"WGET_ASKPASS ili SSH_ASKPASS\n" # c-format -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" -msgstr "%s: %s: Neispravna vrijednost %s.\n" +msgstr "%s: %s: nevaljana vrijednost %s\n" # c-format -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" -msgstr "%s: %s: Neispravno zaglavlje %s.\n" +msgstr "%s: %s: nevaljano zaglavlje %s\n" # c-format -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" -msgstr "%s: %s: Neispravno WARC zaglavlje %s.\n" +msgstr "%s: %s: nevaljano WARC zaglavlje %s\n" # c-format -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" -msgstr "%s: %s: Neispravna vrsta napretka %s.\n" +msgstr "%s: %s: nevaljana vrsta progresa %s\n" # c-format -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "" -"%s: %s: Neispravno ograniÄenje %s,\n" -" koristite [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" +"%s: %s: nevaljano ograniÄenje %s;\n" +" koristite [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii]\n" "\n" #: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" -msgstr "Kodiranje %s nije ispravno\n" +msgstr "Kodiranje %s nije valjano\n" -#: src/iri.c:139 src/url.c:1571 +#: 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" +msgstr "Konverzija iz %s u %s nije podržana\n" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" -msgstr "PronaÄ‘en nepotpun ili neispravan viÅ¡ebajtni niz\n" +msgstr "PronaÄ‘ena je nepotpuna ili nevaljana viÅ¡ebajtna sekvencija\n" # Weird, we got an unspecified error -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "NeobraÄ‘ena greÅ¡ka %d\n" #: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" -msgstr "locale_to_utf8: ‘locale’ nije instaliran\n" +msgstr "locale_to_utf8(): locale nije instaliran\n" #: 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" +msgstr "idn_encode() je zavrÅ¡ila neuspjeÅ¡no (%d): %s\n" #: 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" +"Nije uspjela konverzija u mala slova: %d: %s\n" "\n" #: src/log.c:931 src/log.c:950 @@ -1504,179 +1513,180 @@ "Redirecting output to %s.\n" msgstr "" "\n" -"Izlaz je preusmjeruje na %s.\n" +"Izlaz je preusmjeruje na %s\n" # log > bilježiti u dnevnik > dnevniÄiti # logging > dnevniÄenje #: src/log.c:943 #, c-format msgid "%s: %s; disabling logging.\n" -msgstr "%s: %s; dnevniÄenje (bilježenje u dnevnik) je onemogućeno.\n" +msgstr "%s: %s; dnevniÄenje (bilježenje u dnevnik) se onemogućuje\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uporaba: %s [OPCIJA]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 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" +msgstr "" +"Obvezni argumenti dugaÄkih opcija obvezni su takoÄ‘er i za kratke opcije.\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Pokretanje:\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help ova prikazana pomoć\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" -" -b, --background nakon pokretanja nastavi rad u pozadini\n" +" -b, --background nakon pokretanja nastavlja rad u " +"pozadini\n" -#: src/main.c:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "DnevniÄka (dnevnik) i ulazna datoteka:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" -msgstr " -o, --output-file=DNEVNIK poruke bilježiti u DNEVNIK\n" +msgstr " -o, --output-file=DNEVNIK poruke bilježi u DNEVNIK\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" -msgstr "" -" -a, --append-output=DNEVNIK poruke dopisivati na kraj DNEVNIKA\n" +msgstr " -a, --append-output=DNEVNIK poruke dopisuje na kraj DNEVNIKA\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -" -d, --debug ispiÅ¡i puno podataka za debugiranje\n" +" -d, --debug ispiÅ¡e puno podataka za debugiranje\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -" --wdebug ispiÅ¡i Watt-32 poruke za debugiranje\n" +" --wdebug ispiÅ¡e Watt-32 poruke za debugiranje\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tihi rad (bez ispisa)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose opÅ¡iran ispis (zadano)\n" -#: src/main.c:624 +#: src/main.c:625 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:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -" --report-speed=VRSTA VRSTA je Å¡irina pojasa. VRSTA može biti " +" --report-speed=VRSTA VRSTA je Å¡irina pojasa; VRSTA može biti " "bits\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -" -i, --input-file=DATOTEKA preuzmi URL-ove navedene u DATOTECI\n" +" -i, --input-file=DATOTEKA preuzme URL-ove navedene u DATOTECI\n" " (lokalna ili vanjska DATOTEKA)\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -" --input-metalink=DATOTEKA preuzmi URL-ove navedene u lokalnoj\n" -" Metalink DATOTECI\n" +" --input-metalink=DATOTEKA preuzme datoteke sadržane u\n" +" lokalnoj Metalink DATOTECI\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" -msgstr " -F, --force-html tretiraj ulaznu datoteku kao HTML\n" +msgstr " -F, --force-html tretira 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:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -" -B, --base=URL poveznice u HTML ulaznoj datoteci (-i -" -"F)\n" -" razrijeÅ¡i koristeći URL kao " -"referenciju\n" +" -B, --base=URL razrijeÅ¡i poveznice u HTML ulaznoj " +"datoteci\n" +" (-i -F) koristeći URL kao referenciju\n" -#: src/main.c:639 +#: src/main.c:640 +#, fuzzy msgid " --config=FILE specify config file to use\n" msgstr "" -" --config=DATOTEKA DATOTEKA sa zadanom konfiguracijom\n" +" --config=DATOTEKA za konfiguraciju se rabi ova\n" +" konfiguracijska DATOTEKA\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" -" --no-config ignoriraj sve datoteke s konfiguracijom\n" +" --no-config ignorira sve konfiguracijske datoteke\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -" --rejected-log=DATOTEKA razloge za odbijanje URL bilježiti u " +" --rejected-log=DATOTEKA razloge za URL odbijenicu bilježi u " "DATOTEKU\n" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Preuzimanje:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -" -t, --tries=BROJ BROJ pokuÅ¡aja preuzimanja (0 bez " -"ograniÄenja)\n" +" -t, --tries=BROJ maksimalni BROJ pokuÅ¡aja preuzimanja\n" +" (0 = nema ograniÄenja)\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -" --retry-connrefused ponovi pokuÅ¡aj iako je spajanje odbijeno\n" +" --retry-connrefused ponovo pokuÅ¡a ako je spajanje odbijeno\n" -#: src/main.c:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=POPIS zarezom odvojen POPIS zanemarenih\n" -" HTML tagova\n" +" --retry-on-http-error=POPIS zarezom odvojeni POPIS HTTP greÅ¡ki\n" +" za ponovni pokuÅ¡aj\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" -msgstr " -O, --output-document=DATOTEKA dokumente spremaj u DATOTEKU\n" +msgstr " -O, --output-document=DATOTEKA dokumente sprema u DATOTEKU\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1684,15 +1694,15 @@ " -nc, --no-clobber preskoÄi preuzimanja koja bi mogla\n" " prebrisati postojeće datoteke\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -" --no-config ignoriraj sve datoteke s konfiguracijom\n" +" --no-netrc ne pokuÅ¡ava dobiti verifikaciju iz ." +"netrc\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1700,112 +1710,110 @@ " -c, --continue nastavi s preuzimanjem djelomiÄno\n" " preuzete datoteke\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -" --start-pos=POZICIJA zapoÄni preuzimanje od POZICIJE (0 = " +" --start-pos=POZICIJA zapoÄne preuzimati od POZICIJE (0 = " "poÄetak)\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -" --progress=VRSTA VRSTA je indikator progresa preuzimanja\n" +" --progress=VRSTA indikator progresa preuzimanja je VRSTA\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" -msgstr "" -" --show-progress progres preuzimanja je uvijek vidljiv\n" +msgstr " --show-progress traka progresa je uvijek vidljiva\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -" -N, --timestamping preuzimaj samo datoteke novije od " +" -N, --timestamping preuzima samo datoteke novije od " "lokalnih\n" # ‘--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:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -" --no-if-modified-since ne koristi uvjet ‘if-modified-since’\n" -" zajedno s ‘--timestamping’ opcijom\n" +" --no-if-modified-since ne koristi uvjet if-modified-since\n" +" zajedno s --timestamping opcijom\n" -#: src/main.c:676 +#: src/main.c:677 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 ne kopirati vremensku oznaku " -"datoteke\n" -" s poslužitelja na lokalnu datoteku\n" +" --no-use-server-timestamps ne kopira vremensku oznaku datoteke iz\n" +" one na serveru na lokalnu datoteku\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" -msgstr " -S, --server-response prikaži odgovor poslužitelja\n" +msgstr " -S, --server-response ispiÅ¡e odgovor servera\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:681 +#: src/main.c:682 msgid " --spider don't download anything\n" -msgstr " --spider ne preuzimaj niÅ¡ta\n" +msgstr " --spider niÅ¡ta ne preuzima\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -" -T, --timeout=SECONDS sva tajmaut vremena postavi na\n" -" SECONDS sekundi\n" +" -T, --timeout=SECONDS sva tajmaut vremena postavlja\n" +" na SECONDS sekundi\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -" --dns-servers=ADRESE popis DNS poslužitelja za " -"propitkivanje (rastavljeni zarezima)\n" +" --dns-servers=ADRESE popis DNS servera za propitati\n" +" (zarezima odvojenih)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -" --bind-address=ADRESA poveži DNS rjeÅ¡avaÄ na ADRESU (ime ili " -"IP) lokalnog raÄunala\n" +" --bind-address=ADRESA poveži DNS tražitelj na ADRESU\n" +" (ime raÄunala ili IP) lokalnog " +"raÄunala\n" # timeout > vremensko ograniÄenje -#: src/main.c:691 +#: src/main.c:692 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" +" --dns-timeout=SECS ograniÄi odgovor DNS-a na SECS sekundi\n" -#: src/main.c:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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" +" --read-timeout=SECS ograniÄi tajmaut za Äitanje na SECS " +"sekundi\n" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=VRIJEME priÄekaj VRIJEME sekunda izmeÄ‘u " "preuzimanja\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1813,7 +1821,7 @@ " --waitretry=VRIJEME pauza 1..VRIJEME sekundi izmeÄ‘u\n" " pokuÅ¡aja preuzimanja\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1822,86 +1830,89 @@ " izmeÄ‘u pokuÅ¡aja preuzimanja\n" # Don’t use proxies, even if the appropriate *_proxy environment variable is defined. -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" -msgstr " --no-proxy ne koristi proxy poslužitelje\n" +msgstr " --no-proxy eksplicitno ne koristi proxy\n" # The value can be specified in bytes (default), kilobytes (with ‘k’ suffix), or megabytes (with ‘m’ suffix). -#: src/main.c:705 +#: src/main.c:706 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:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -" --bind-address=ADRESA spoji lokalno raÄunalo na ADRESU\n" -" (ime raÄunala ili IP)\n" +" --bind-address=ADRESA poveži na ADRESU (ime raÄunala ili IP)\n" +" lokalnog raÄunala\n" # Limit the download speed to no more than rate bytes per second. -#: src/main.c:709 +#: src/main.c:710 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" +" --limit-rate=BRZINA brzina preuzimanja je ograniÄena\n" +" na BRZINU bajta po sekundi\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" -msgstr " --no-dns-cache ne pamti rezultate DNS upita\n" +msgstr " --no-dns-cache ne sprema rezultate upita DNS-u\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -" --restrict-file-names=OS znakove u nazivima datoteka ograniÄi na\n" -" one koji su dopuÅ¡teni u navedenom OS-u\n" +" --restrict-file-names=OS znakove u nazivima datoteka ograniÄi\n" +" na one koje dopuÅ¡ta navedeni OS\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -" --ignore-case zanemari veliÄinu slova pri traženju\n" +" --ignore-case ignorira veliÄinu slova pri traženju\n" " datoteka ili direktorija\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" -msgstr " -4, --inet4-only spajaj se samo na IPv4 adrese\n" +msgstr " -4, --inet4-only spaja se samo na IPv4 adrese\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" -msgstr " -6, --inet6-only spajaj se samo na IPv6 adrese\n" +msgstr " -6, --inet6-only spaja se samo na IPv6 adrese\n" # ‘--prefer-family=none/IPv4/IPv6’ -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" " --prefer-family=VRSTA prednost imaju adrese specificirane " -"vrste;\n" +"VRSTE;\n" " VRSTA je jedna od IPv6, IPv4 ili none\n" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" -msgstr " --user=KORISNIK http i ftp korisnik je KORISNIK\n" +msgstr "" +" --user=KORISNIK postavlja korisnika za http i za ftp\n" +" na KORISNIK\n" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" -msgstr " --password=LOZINKA http i ftp lozinka je LOZINKA\n" +msgstr "" +" --password=LOZINKA postavlja lozinku za http i za ftp\n" +" na LOZINKA\n" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" -msgstr " --ask-password pitaj za lozinku\n" +msgstr " --ask-password pita za lozinku\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1911,55 +1922,52 @@ "SSH_ASKPASS \n" " environment variable is used.\n" msgstr "" -" --use-askpass=NAREDBA specificiraj ovjerenog rukovatelja za " -"prijavu \n" -" korisnika i lozinku. Ako NAREDBA " -"nije \n" -" specificirana WGET_ASKPASS ili the " -"SSH_ASKPASS \n" -" rabi okoliÅ¡nu varijablu.\n" +" --use-askpass=NAREDBA specificira ovjerenog rukovatelja za\n" +" prijavu korisnika i lozinku; ako " +"NAREDBA\n" +" nije specificirana, WGET_ASKPASS ili\n" +" SSH_ASKPASS rabi okoliÅ¡nu varijablu\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" -msgstr " --no-iri iskljuÄi IRI podrÅ¡ku\n" +msgstr " --no-iri iskljuÄuje IRI podrÅ¡ku\n" -#: src/main.c:739 +#: src/main.c:740 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" +" --local-encoding=KÔD koristi KÔD kao lokalno kodiranje za IRI\n" -#: src/main.c:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" -" --unlink ukloni datoteke prije prepisivanja\n" +" --unlink ukloni datoteku prije prepisivanja\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -" --keep-badhash zadrži datoteke Äiji se kontrolni brojevi " -"ne podudaraju\n" -" (pridodaj ." -"badhash)\n" +" --keep-badhash zadrži datoteke Äije se kontrolne sume\n" +" ne podudaraju (pridoda .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -" --metalink-index=BROJ Redni BROJ metalink aplikacije/" -"metalink4+xml metaurl\n" +" --metalink-index=BROJ Metalink aplikacija/metalink4+xml " +"metaurl\n" +" redni BROJ\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1968,150 +1976,153 @@ "zaglavlja\n" " HTTP-ovog odgovora\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -" --preferred-location poželjna lokacija za Metalink resurse\n" +" --preferred-location željena 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:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -" --no-xattr iskljuÄi pohranu meta podataka u " -"proÅ¡irene atribute datoteka\n" +" --no-xattr iskljuÄuje pohranu meta podataka\n" +" u proÅ¡irene atribute datoteka\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Direktoriji:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" -msgstr " -nd, --no-directories ne pravi direktorije\n" +msgstr " -nd, --no-directories ne kreira direktorije\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" -msgstr " -x, --force-directories prinudno pravi direktorije\n" +msgstr " -x, --force-directories prisiljava kreiranje direktorija\n" # Disable generation of host-prefixed directories -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" -msgstr " -nH, --no-host-directories ne pravi direktorije poslužitelja\n" +msgstr "" +" -nH, --no-host-directories ne duplicira (lokalno) direktorije hosta\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories koristi ime protokola u direktorijima\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" -msgstr " -P, --directory-prefix=PREFIKS spremi datoteke u PREFIKS/..\n" +msgstr "" +" -P, --directory-prefix=PREFIKS spremi datoteke u PREFIKS/..\n" +" zadano je „.“ tj. radni direktorij\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -" --cut-dirs=BROJ zanemari BROJ razina putanje " -"poslužitelja\n" +" --cut-dirs=BROJ ignorira BROJ komponenti direktorija\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP opcije:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=KORISNIK http korisnik je KORISNIK\n" -#: src/main.c:781 +#: src/main.c:782 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:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" -" --no-cache sprijeÄi preuzimanje ‘cached’ datoteka\n" -" s poslužitelja\n" +" --no-cache sprijeÄava preuzimanje podataka\n" +" iz predmemorije servera\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:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -" --default-page=IME promijeni zadano ime stranice na IME\n" -" (to je obiÄno ‘index.html’)\n" +" --default-page=IME mijenja zadano ime stranice na IME\n" +" (to je obiÄno „index.html“)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -" -E, --adjust-extension spremi HTML/CSS dokumente s ispravnim\n" -" sufiksima\n" +" -E, --adjust-extension sprema HTML/CSS dokumente s\n" +" ispravnim sufiksima\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -" --ignore-length zanemari ‘Content-Length’ polje " +" --ignore-length zanemari polje „Content-Length“ " "zaglavlja\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -" --header=NIZ umetni znakovni NIZ meÄ‘u zaglavlja\n" +" --header=STRING umetne znakovni STRING meÄ‘u zaglavlja\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=VRSTA VRSTA je indikator progresa preuzimanja\n" +" --compression=VRSTA odaberite auto ili gzip ili none " +"(zadano)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maksimalni broj preusmjeravanja\n" " dopuÅ¡tenih po stranici\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -" --proxy-user=KORISNIK korisnik proxy poslužitelja je KORISNIK\n" +" --proxy-user=KORISNIK postavlja KORISNIKA za proxy korisnika\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -" --proxy-password=LOZINKA lozinka proxy poslužitelja je LOZINKA\n" +" --proxy-password=LOZINKA postavlja LOZINKU za proxy lozinku\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -" --referer=URL ukljuÄi ‘Referer: URL’ zaglavlje\n" +" --referer=URL ukljuÄi „Referer: URL“ zaglavlje\n" " u HTTP zahtjev\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" -msgstr " --save-headers spremi HTTP zaglavlja u datoteku\n" +msgstr " --save-headers sprema HTTP zaglavlja u datoteku\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -" -U, --user-agent=AGENT identificiraj se kao AGENT umjesto\n" +" -U, --user-agent=AGENT identificira se kao AGENT umjesto\n" " kao Wget/INAÄŒICA\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2119,160 +2130,162 @@ " --no-http-keep-alive onemogući HTTP keep-alive (postojanu " "vezu)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ne koristi kolaÄiće\n" -#: src/main.c:814 +#: src/main.c:815 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" +" --load-cookies=DATOTEKA prije sesije uÄita kolaÄiće iz DATOTEKE\n" # ali ne i „session cookies“ -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -" --save-cookies=DATOTEKA nakon sesije spremi kolaÄiće u DATOTEKU\n" +" --save-cookies=DATOTEKA nakon sesije sprema kolaÄiće u DATOTEKU\n" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -" --keep-session-cookies uÄitaj i spremi kolaÄiće (privremene) " +" --keep-session-cookies uÄita i spremi (ne trajne) kolaÄiće " "sesije\n" -#: src/main.c:820 +#: src/main.c:821 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" +" --post-data=STRING POST metodom poÅ¡alje STRING kao podatke\n" -#: src/main.c:822 +#: src/main.c:823 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" +" --post-file=DATOTEKA POST metodom poÅ¡alje sadržaj iz DATOTEKE\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -" --method=HTTPMethod upotrijebi metodu „HTTPMethod“ u " -"zaglavlju\n" +" --method=HTTPMethod u zahtjevu koristi metodu „HTTPMethod“\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -" --body-data=TEKST poÅ¡alji TEKST kao podatke.\n" -" Opcija ‘--method’ MORA se upotrijebiti\n" +" --body-data=TEKST poÅ¡alje TEKST kao podatke;\n" +" opciju --method morate nužno " +"primijeniti\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -" --body-file=DATOTEKA poÅ¡alji sadržaj iz DATOTEKE.\n" -" Opcija ‘--method’ MORA se upotrijebiti\n" +" --body-file=DATOTEKA poÅ¡alje sadržaj DATOTEKE;\n" +" opciju --method morate nužno " +"primijeniti\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" " choosing local file names " "(EXPERIMENTAL)\n" msgstr "" -" --content-disposition poÅ¡tuj ‘Content-Disposition’ zaglavlje " -"za\n" +" --content-disposition poÅ¡tuje zaglavlje Content-Disposition za\n" " odabir lokalnih naziva datoteka\n" -" (EKSPERIMENTALNO)\n" +" (opcija je zasad EKSPERIMENTALNA)\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:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -" --content-on-error prihvati primljeni sadržaj iako\n" -" poslužitelj javlja greÅ¡ku\n" +" --content-on-error prihvaća primljeni sadržaj iako\n" +" server javlja greÅ¡ku\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" " without first waiting for the server's\n" " challenge\n" msgstr "" -" --auth-no-challenge ‘Basic HTTP authentication’ podatke " -"poÅ¡alji\n" -" bez Äekanja na upit na poslužitelja\n" +" --auth-no-challenge poÅ¡alje Basic HTTP authentication " +"podatke\n" +" bez Äekanja na izazov/upit servera\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) opcije:\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -" --secure-protocol=PR izaberi sigurnosni protokol, jedan od\n" -" auto, SSLv2, SSLv3 ili TLSv1\n" +" --secure-protocol=PR odaberite jedan sigurnosni PR protokol:\n" +" auto, SSLv2, SSLv3, TLSv1,\n" +" TLSv1_1, TLSv1_2 ili PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only prati samo sigurne HTTPS veze\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" -msgstr "" -" --no-check-certificate ne provjeravaj certifikat poslužitelja\n" +msgstr " --no-check-certificate ne provjerava certifikat servera\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=DATOTEKA DATOTEKA sa certifikatom klijenta\n" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -" --certificate-type=VRSTA VRSTA certifikata klijenta, PEM ili DER\n" +" --certificate-type=VRSTA VRSTA certifikata klijenta -- PEM ili " +"DER\n" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=DATOTEKA DATOTEKA s privatnim kljuÄem\n" -#: src/main.c:857 +#: src/main.c:858 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" +" --private-key-type=VRSTA VRSTA privatnog kljuÄa -- PEM ili DER\n" # CA > certificate authorities -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" -msgstr " --ca-certificate=DATOTEKA DATOTEKA sadrži listu CA-ova\n" +msgstr "" +" --ca-certificate=DATOTEKA DATOTEKA koja sadrži svežanj CA-ova\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -" --ca-directory=DIR direktorij u kojem su pohranjeni CA-ovi\n" +" --ca-directory=DIR direktorij DIR s hash listom CA-ova\n" # CRL > Certificate Revocation List -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" -msgstr " --crl-file=DATOTEKA DATOTEKA sadrži listu CRL-ova\n" +msgstr "" +" --crl-file=DATOTEKA DATOTEKA koja sadrži svežanj CRL-ova\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2281,36 +2294,33 @@ "verify\n" " peer against\n" msgstr "" -" --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" -" of base64 encoded sha256 hashes preceded " -"by\n" -" 'sha256//' and separated by ';', to " -"verify\n" -" peer against\n" +" --pinnedpubkey=FILE/HASHES datoteka FILE s javnim kljuÄen (PEM/DER)\n" +" ili bilo koji broj sha256 na base64\n" +" Å¡ifriranih HASHES kojima prethodi\n" +" „sha256//“ odvojenih s „;“ za\n" +" verifikaciju sugovornika (peer)\n" # Pseudo-Random Number Generator > PRNG -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -" --random-file=DATOTEKA DATOTEKA s nasumiÄnim podacima za " -"iniciranje\n" -" ‘SSL PRNG’ (generatora pseudo " -"sluÄajnih\n" -" brojeva)\n" +" --random-file=DATOTEKA DATOTEKA s nasumiÄnim podacima za\n" +" inicijalizaciju SSL PRNG (generatora " +"pseudo\n" +" sluÄajnih brojeva)\n" # EGD: the Entropy Gathering Daemon -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -" --egd-file=DATOTEKA DATOTEKA s nazivom EGD utiÄnice s " -"nasumiÄnim\n" -" podacima\n" +" --egd-file=DATOTEKA DATOTEKA koja naznaÄuje EGD utiÄnicu\n" +" s nasumiÄnim podacima\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2319,190 +2329,194 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=STRING Izravno postavlja prioritet-string ili " +"cypher\n" +" list string (OpenSSL) -- pripazite, jer ta\n" +" opcija poniÅ¡tava --secure-procol; format i\n" +" sintaksa stringa zavisi od SSL/TLS metode\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" -msgstr "HTTP opcije:\n" +msgstr "HSTS opcije:\n" # HSTS (HTTP Strict Transport Security, RFC 6797) -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr "" -" --no-hsts ne koristi HSTS\n" -" (HTTP Strict Transport Security)\n" +" --no-hsts iskljuÄuje HSTS (ignorira\n" +" Strict-Transport-Security zaglavlja)\n" # ‘--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:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -" --hsts-file=DATOTEKA DATOTEKA je HSTS baza podataka (ukida " -"zadanu)\n" +" --hsts-file=DATOTEKA HSTS baza podataka je DATOTEKA\n" +" (ukida zadanu ~/.wget-hsts)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP opcije:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -" --ftp-stmlf koristi Stream_LF format za sve binarne " -"FTP\n" -" datoteke\n" +" --ftp-stmlf koristi Stream_LF format za\n" +" sve binarne FTP datoteke\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=KORISNIK ftp korisnik je KORISNIK\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" -msgstr " --ftp-password=LOZINKA ftp lozinka je LOZINKA\n" +msgstr " --ftp-password=LOZINKA postavlja ftp lozinku na LOZINKA\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" -msgstr " --no-remove-listing ne uklanjaj ‘.listing’ datoteke\n" +msgstr " --no-remove-listing ne uklanja „.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:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -" --no-glob ne koristi viÅ¡eznaÄnike za nazive\n" -" FTP datoteka\n" +" --no-glob iskljuÄuje upotrebu viÅ¡eznaÄnika\n" +" u nazivima FTP datoteka\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -" --no-passive-ftp onemogući „pasivni“ naÄin prijenosa\n" +" --no-passive-ftp iskljuÄuje „pasivni“ naÄin prijenosa\n" +" (tj. koristi se samo „aktivni“ naÄin)\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -" --preserve-permissions oÄuvaj dopuÅ¡tanja udaljene datoteke\n" +" --preserve-permissions saÄuva prava pristupa udaljene datoteke\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -" --retr-symlinks pri rekurziji, preuzmi datoteke na koje\n" +" --retr-symlinks pri rekurziji preuzima datoteke na koje\n" " pokazuju veze (ali ne direktorije)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTPS opcije:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -" --ftps-implicit bezuvjetno koristi FTPS\n" -" (zadani port je 990)\n" -"\n" +" --ftps-implicit koristi implicitni FTPS (zadani port je " +"990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -" --ftps-resume-ssl obnovi SSL/TLS sesiju zapoÄetu u\n" -" kontrolnom kanalu pri otvaranju\n" -" podatkovnog kanala\n" +" --ftps-resume-ssl obnovi SSL/TLS sesiju zapoÄetu u " +"kontrolnom\n" +" kanalu pri otvaranju podatkovne veze\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -" --ftps-clear-data-connection samo je kontrolni kanal Å¡ifriran;\n" +" --ftps-clear-data-connection Å¡ifrira samo je kontrolni kanal;\n" " podaci se ne Å¡ifriraju\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -" --ftps-fallback-to-ftp koristi FTP ako ciljani poslužitelj\n" -" ne podržava FTPS\n" +" --ftps-fallback-to-ftp ako ciljani server ne podržava FTPS,\n" +" koristi se FTP\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC opcije:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -" --warc-file=DATOTEKA spremi podatke o zahtjevima i odgovorima\n" -" u .warc.gz DATOTEKU\n" +" --warc-file=DATOTEKA sprema podatke o zahtjevima i odgovorima\n" +" u WARC DATOTEKU .warc.gz\n" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" -msgstr "" -" --warc-header=NIZ umetni znakovni NIZ u warcinfo zapis\n" +msgstr " --warc-header=STRING umetni STRING u warcinfo zapis\n" -#: src/main.c:937 +#: src/main.c:938 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" +" --warc-max-size=BROJ postavlja maksimalnu veliÄinu\n" +" WARC datoteka na BROJ\n" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" -msgstr " --warc-cdx piÅ¡i CDX datoteke indeksa.\n" +msgstr " --warc-cdx zapisuje indeksne datoteke CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -" --warc-dedup=DATOTEKA ne spremaj zapise s liste ove CDX " -"DATOTEKE\n" -"\n" +" --warc-dedup=DATOTEKA ne sprema zapise na popisu\n" +" u ovoj CDX DATOTECI\n" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" -msgstr " --no-warc-compression ne sažimaj WARC datoteke s GZIP\n" +msgstr " --no-warc-compression ne sažima WARC datoteke s GZIP\n" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" -msgstr " --no-warc-digests ne raÄunaj SHA1 kontrolne sume\n" +msgstr " --no-warc-digests ne izraÄunava SHA1 kontrolne sume\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -" --no-warc-keep-log ne spremaj dnevniÄku datoteku (dnevnik)\n" -" u WARC zapis\n" +" --no-warc-keep-log ne sprema dnevniÄku datoteku u WARC " +"zapis\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -" --warc-tempdir=DIREKTORIJ DIREKTORIJ za privremene WARC-ove " -"datoteke\n" +" --warc-tempdir=DIREKTORIJ DIREKTORIJ je lokacija za privremene\n" +" datoteke koje stvara WARC pisar\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekurzivno preuzimanje:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" -msgstr " -r, --recursive rekurzivno preuzimanje.\n" +msgstr "" +" -r, --recursive specificira rekurzivno preuzimanje\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2511,16 +2525,16 @@ " (inf ili 0 za neograniÄenu dubinu)\n" # Note that ‘--delete-after’ deletes files on the local machine. -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -" --delete-after nakon preuzimanja izbriÅ¡i datoteke\n" -" na lokalnom raÄunalu\n" +" --delete-after nakon preuzimanja izbriÅ¡e lokalne " +"datoteke\n" # After the download is complete, convert the links in the document to make them suitable for local viewing -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2530,49 +2544,47 @@ "u\n" " tako da ukazuju na lokalne datoteke\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" " --convert-file-only pretvori samo datoteÄni dio URL-a\n" -" (inaÄe znan kao " -"osnovno ime)\n" +" (inaÄe poznat kao basename)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -" --backups=N prije zapisivanja datoteke X, zadrži do " -"N\n" -" sigurnosnih kopija\n" +" --backups=N prije zapisivanja datoteke X zadrži do N\n" +" sigurnosnih kopija (osiguranja)\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -" -K, --backup-converted prije pretvaranja datoteke X, spremi\n" -" njenu kopiju kao X_orig\n" +" -K, --backup-converted prije konverzije datoteke X\n" +" spremi njenu kopiju kao X_orig\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -" -K, --backup-converted prije pretvaranja datoteke X,\n" +" -K, --backup-converted prije konverzije datoteke X\n" " spremi njenu kopiju kao X_orig\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -" -m, --mirror parametar ekvivalentan izrazu:\n" +" -m, --mirror --mirror je ekvivalentno nizu opcija:\n" " -N -r -l inf --no-remove-listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2580,239 +2592,237 @@ " -p, --page-requisites preuzmi sve slike i sve Å¡to je potrebno\n" " za prikaz HTML stranice\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -" --strict-comments HTML komentare strogo obraditi\n" +" --strict-comments striktna obrada HTML komentara\n" " u skladu sa SGML\n" -#: src/main.c:987 +#: src/main.c:988 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:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -" -A, --accept=POPIS zarezom odvojen POPIS prihvaćenih " +" -A, --accept=POPIS zarezom odvojeni POPIS prihvaćenih " "sufiksa\n" -" (vrste datoteka)\n" +" (vrste datoteka)\n" # Specify comma-separated lists of file name suffixes or patterns to # accept or reject {Types of Files}). -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -" -R, --reject=POPIS zarezom odvojen POPIS odbijenih sufiksa\n" +" -R, --reject=POPIS zarezom odvojeni POPIS odbijenih sufiksa\n" # REGIZR, zaÅ¡to ne REGIZ, kraće i lakÅ¡e izgovoriti; ili jednostavno prihvatiti regex! -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -" --accept-regex=REGIZ regularni izraz REGIZ poduraran s\n" -" prihvaćenim URL-ovima\n" +" --accept-regex=REGIZ regularni izraz REGIZ poduraran s\n" +" prihvaćenim URL-ovima\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -" --reject-regex=REGIZ regularni izraz REGIZ podudaran s\n" -" odbijenim URL-ovima.\n" +" --reject-regex=REGIZ regularni izraz REGIZ podudaran s\n" +" odbijenim URL-ovima\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -" --regex-type=VRSTA VRSTA regularnog izraza (posix|pcre)\n" +" --regex-type=VRSTA VRSTA regularnog izraza (posix ili pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" -msgstr " --regex-type=VRSTA VRSTA regularnog izraza (posix)\n" +msgstr " --regex-type=VRSTA VRSTA regularnog izraza (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -" -D, --domains=POPIS zarezom odvojen POPIS prihvaćenih " -"domena\n" +" -D, --domains=POPIS zarezom odvojen POPIS prihvaćenih domena\n" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -" --exclude-domains=POPIS zarezom odvojen POPIS iskljuÄenih " -"domena\n" +" --exclude-domains=POPIS zarezom odvojen POPIS odbijenih domena\n" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" -msgstr "" -" --follow-ftp prati FTP veze iz HTML dokumenata\n" +msgstr " --follow-ftp prati FTP veze iz HTML dokumenata\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -" --follow-tags=POPIS zarezom odvojen POPIS praćenih HTML " +" --follow-tags=POPIS zarezom odvojen POPIS praćenih HTML " "tagova\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -" --ignore-tags=POPIS zarezom odvojen POPIS zanemarenih\n" -" HTML tagova\n" +" --ignore-tags=POPIS zarezom odvojen POPIS\n" +" ignoriranih HTML tagova\n" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -" -H, --span-hosts tijekom rekurzije posjeti i\n" -" strane poslužitelje\n" +" -H, --span-hosts tijekom rekurzije posjeti i strane " +"servere\n" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" -msgstr " -L, --relative prati samo relativne veze\n" +msgstr " -L, --relative prati samo relativne veze\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=POPIS POPIS dopuÅ¡tenih direktorija\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -" --trust-server-names koristi ime navedeno u zadnjoj\n" -" komponenti URL preusmjerenja\n" +" --trust-server-names pri preusmjeravanju, za lokalno ime " +"datoteke\n" +" rabi se posljedna komponenta URL-ovog\n" +" preusmjerenja\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=POPIS POPIS iskljuÄenih direktorija\n" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" -msgstr " -np, --no-parent ne ulazi u naddirektorij\n" +msgstr "" +" -np, --no-parent ne penje se u viÅ¡i (parent) direktorij\n" -#: src/main.c:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions 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" +"GreÅ¡ke u programu i prijedloge (na engleskom) javite na \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"i/ili otvorite diskusiju na\n" +"https://savannah.gnu.org/bugs/?func=additem&group=wget\n" +"PogreÅ¡ke u prijevodu i vaÅ¡e prijedloge javite na \n" -#: src/main.c:1034 +#: src/main.c:1035 #, 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" +msgstr "GNU Wget %s, program za neinteraktivno preuzimanje s mreže.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Lozinka za korisnika %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Lozinka: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" -msgstr "Ne mogu napraviti cijev\n" +msgstr "Nije moguće napraviti cijev\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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" +"PogreÅ¡ka pri inicijalizaciji procesa (spawn file actions)\n" +"za use-askpass: %d\n" -#: src/main.c:1120 +#: src/main.c:1121 #, 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" +msgstr "PogreÅ¡na postavka procesa (spawn file actions) za use-askpass: %d\n" -#: src/main.c:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " -msgstr "Korisnik (ime) za ‘%s%s’: " +msgstr "Korisnik (ime) za „%s%s“: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " -msgstr "Lozinka za korisnika ‘%s%s@%s’: " +msgstr "Lozinka za „%s%s@%s“: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Locale: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " -msgstr "Kompiliranje: " +msgstr "Compile: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " -msgstr "Povezivanje: " +msgstr "Link: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -"GNU Wget %s izgraÄ‘en na %s.\n" +"GNU Wget %s izgraÄ‘en na %s\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (okolina)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (korisnik)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2826,7 +2836,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2834,99 +2844,97 @@ "\n" "Izvorno napisao Hrvoje NikÅ¡ić .\n" -#: src/main.c:1337 +#: src/main.c:1338 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" +"GreÅ¡ke u programu i vaÅ¡a pitanja (na engleskom) javite na .\n" +"PogreÅ¡ke u prijevodu i vaÅ¡e prijedloge javite na .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" -msgstr "Problem dodjele memorije\n" +msgstr "Problem pri dodjeli memorije\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Prekid rada zbog greÅ¡ke u %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" -msgstr "„%s --help“ za pomoć i dodatne opcije.\n" +msgstr "PokuÅ¡ajte s „%s --help“ za pomoć i dodatne opcije\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" -msgstr "%s: nedozvoljena opcija -- „-n%c“\n" +msgstr "%s: nedopuÅ¡tena opcija -- „-n%c“\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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" +"PodrÅ¡ka za debugiranje nije ugraÄ‘ena (kompilirana)\n" +"parametar --debug se ignorira\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" "Navedene su istovremeno opcije --no-clobber i --convert-links;\n" -"--no-clobber se zanemaruje\n" +"--no-clobber se ignorira\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -"Navedene su istovremeno opcije --no-clobber i --convert-file-only ;\n" -" samo --convert-file-only će se koristiti.\n" +"Navedene su istovremeno opcije --no-clobber i --convert-file-only;\n" +"--no-clobber se ignorira\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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" +msgstr "Istovremeno se ne može biti opÅ¡iran i neopÅ¡iran\n" -#: src/main.c:1638 +#: src/main.c:1639 #, 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" +"Istovremeno se ne može oznaÄiti vrijeme a pritom ne brisati stare datoteke\n" -#: src/main.c:1647 +#: src/main.c:1648 #, 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" +msgstr "Opcije --inet4-only i --inet6-only ne mogu se zajedno koristiti\n" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" "with -p or -r. See the manual for details.\n" "\n" msgstr "" -"Opcije -k ili --convert-file-only i -O ne smiju se zajedno koristiti ako je " -"navedeno viÅ¡e URL-ova,\n" -"ili u kombinaciji sa -p ili -r. Pogledajte upute za viÅ¡e pojedinosti.\n" +"Opcije -k ili --convert-file-only i -O ne mogu se zajedno koristiti ako je\n" +"navedeno viÅ¡e URL-ova, ili u kombinaciji sa -p ili -r.\n" +"Pogledajte upute za viÅ¡e pojedinosti.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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 "" -"UPOZORENJE: kombiniranjem -O sa -r ili -p sav preuzeti sadržaj će biti\n" +"UPOZORENJE: kombiniranjem -O s -r ili -p sav preuzeti sadržaj će biti\n" "spremljen u jednu datoteku koju ste naveli.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2936,156 +2944,155 @@ "Pogledajte upute za viÅ¡e pojedinosti.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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" +msgstr "WARC izlaz ne radi uz --no-clobber; no-clobber će se onemogućiti\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -"WARC izlaz ne radi s vremenskim oznakama; vremensko oznaÄavanje se " -"onemogućuje.\n" +"WARC izlaz ne radi s vremenskim oznakama; vremenske oznake će se " +"onemogućiti\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" -msgstr "WARC izlaz ne radi uz ‘--spider’ opciju.\n" +msgstr "WARC izlaz ne radi uz --spider opciju\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"WARC izlaz ne radi uz ‘--continue’ ili ‘--start-pos’; obje opcije se " -"onemogućuju.\n" +"WARC izlaz ne radi uz --continue ili --start-pos; obje opcije će se " +"onemogućiti\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:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -"WARC-kontrolni zbrojevi su onemogućeni; WARC deduplikacija neće pronaći " -"duplikate zapisa.\n" +"WARC-kontrolne sume su onemogućene;\n" +"WARC deduplikacija neće pronaći duplikate zapisa\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"WARC izlaz ne radi uz ‘--continue’ ili ‘--start-pos’; obje opcije se " -"onemogućuju.\n" +"Kompresija ne radi uz opcije --continue ili --start-pos, te se ignoriraju\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" -msgstr "Istovremeno se ne smije upotrijebiti --ask-password i --password.\n" +msgstr "Istovremeno se ne smije upotrijebiti --ask-password i --password\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" "Istovremena upotreba --start-pos i --continue se ne preporuÄuje;\n" -" --continue se onesposobljuje.\n" +"opcija --continue će se onemogućiti\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: nedostaje URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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" +msgstr "Ne možete upotrijebiti --post-data i --post-file istovremeno\n" -#: src/main.c:1820 +#: src/main.c:1827 #, 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 "" -"Ne smije se upotrijebiti --post-data ili --post-file zajedno s --method.\n" -" --method oÄekuje --body-data i --body-file opcije\n" +"Ne možete upotrijebiti --post-data ili --post-file zajedno s --method;\n" +"--method oÄekuje opcije --body-data i --body-file\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" "Metodu morate navesti s --method=HTTPMethod za upotrebu s --body-data\n" -" ili --body-file.\n" +"ili --body-file.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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" +msgstr "Istovremeno ne možete navesti --body-data i --body-file\n" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" -msgstr "Ova inaÄica nema podrÅ¡ku za IRI\n" +msgstr "Ova inaÄica ne podržava IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, 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" +"-k ili -r može se koristiti sa -O samo kod ispisa u regularnu datoteku\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -"--convert-links or --convert-file-only mogu se koristiti samo za ispis u " -"regularnu datoteku.\n" +"--convert-links or --convert-file-only mogu se koristiti samo za ispis u\n" +"regularnu datoteku\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" -msgstr "Nije uspjelo inicijalizirati ‘libcares’\n" +msgstr "Nije uspjelo inicijalizirati libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" -msgstr "Nije uspjelo inicijalizirati ‘c-ares’ kanal\n" +msgstr "Nije uspjelo inicijalizirati c-ares kanal\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" -msgstr "Nije uspjelo razrijeÅ¡iti IP adresu ‘%s’\n" +msgstr "Nije uspjelo raÅ¡Älaniti IP adresu „%s“\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" -msgstr "Nije uspjelo postaviti DNS poslužitelj(e) '%s' (%d)\n" +msgstr "Nije uspjelo postaviti DNS server(e) „%s“ (%d)\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" -msgstr "Nijedan URL nije pronaÄ‘en u %s.\n" +msgstr "Nijedan URL nije pronaÄ‘en u %s\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" -msgstr "Metalink datoteka %s ne može se raÅ¡Älaniti.\n" +msgstr "Nije moguće raÅ¡Älaniti metalink datoteku %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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" +msgstr "Nije bilo moguće preuzeti sve resurse iz %s\n" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3096,14 +3103,14 @@ "Ukupno vrijeme od poÄetka: %s\n" "Preuzeto: %d datoteka, %s u %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" -msgstr "OgraniÄenje preuzimanja od %s je PREKORAÄŒENO!\n" +msgstr "PREKORAÄŒENA je kvota od %s preuzimanja!\n" #: src/metalink.c:93 msgid "-O not supported for metalink download. Ignoring.\n" -msgstr "-O nije podržan za metalink prezimanje. Zanemaruje se.\n" +msgstr "-O nije podržan za metalink prezimanje -- ignorira se\n" #: src/metalink.c:172 #, c-format @@ -3122,7 +3129,7 @@ #: src/metalink.c:184 msgid "Rejecting metalink file. Unsafe name.\n" -msgstr "Odbija se metalink datoteka. Nepouzdano ime.\n" +msgstr "Odbija se metalink datoteka -- nepouzdano ime\n" #: src/metalink.c:238 #, c-format @@ -3132,70 +3139,70 @@ #: src/metalink.c:251 #, c-format msgid "Rejecting metaurl file %s. Unsafe name.\n" -msgstr "Odbija se metaurl datoteka %s. Nepouzdano ime.\n" +msgstr "Odbija se metaurl datoteka %s -- nepouzdano ime\n" #: src/metalink.c:268 #, c-format msgid "Failed to download %s. Skipping metaurl.\n" -msgstr "Neuspjelo preuzimanje %s. PreskaÄem metaurl.\n" +msgstr "Nije uspjelo preuzimanje %s -- preskaÄe se metaurl\n" #: src/metalink.c:285 #, c-format msgid "Unable to parse metaurl file %s.\n" -msgstr "Metaurl datoteka %s ne može se raÅ¡Älaniti.\n" +msgstr "Metaurl datoteka %s ne može se raÅ¡Älaniti\n" #: src/metalink.c:354 msgid "Metaurls processing returned with error.\n" -msgstr "Obrada metaurl-ova uzvraća s pogreÅ¡kom.\n" +msgstr "Obrada metaurl-ova je zavrÅ¡ila s pogreÅ¡kom\n" #: src/metalink.c:386 #, c-format msgid "Resource type %s not supported, ignoring...\n" -msgstr "Resurs tipa %s nije podržan, zanemaruju se...\n" +msgstr "Resurs tipa %s nije podržan -- ignorira se...\n" #: src/metalink.c:509 msgid "Could not open downloaded file.\n" -msgstr "Ne mogu otvoriti preuzetu datoteku.\n" +msgstr "Nije moguće otvoriti preuzetu datoteku\n" #: src/metalink.c:514 #, c-format msgid "Computing size for %s\n" -msgstr "RaÄunam veliÄinu za %s\n" +msgstr "RaÄuna se veliÄina za %s\n" #: src/metalink.c:519 msgid "File size not declared. Skipping check.\n" -msgstr "VeliÄina datoteke nije objavljena. PreskaÄem provjeru.\n" +msgstr "VeliÄina datoteke nije objavljena -- provjera se preskaÄe\n" #: src/metalink.c:527 msgid "Could not get downloaded file's size.\n" -msgstr "Ne mogu dobiti veliÄinu preuzetu datoteku.\n" +msgstr "Nije moguće dobiti veliÄinu preuzete datoteke\n" #: src/metalink.c:539 #, c-format msgid "Size mismatch for file %s.\n" -msgstr "Ne podudaranje veliÄine za datoteku %s.\n" +msgstr "Ne podudaranje veliÄine za datoteku %s\n" #: src/metalink.c:547 msgid "Size matches.\n" -msgstr "Ne podudaranje veliÄina.\n" +msgstr "Podudaranje veliÄina\n" #: src/metalink.c:600 #, c-format msgid "Computing checksum for %s\n" -msgstr "RaÄunam kontrolni zbroj za %s\n" +msgstr "IzaÄunava se kontrolne suma za %s\n" #: src/metalink.c:678 msgid "Checksum matches.\n" -msgstr "Kontrolni zbrojevi se podudaraju.\n" +msgstr "Kontrolne sume se podudaraju\n" #: src/metalink.c:683 #, c-format msgid "Checksum mismatch for file %s.\n" -msgstr "Kontrolni zbroj se ne podudara za datoteku %s.\n" +msgstr "Kontrolna suma se ne podudara za datoteku %s\n" #: src/metalink.c:722 msgid "Could not open downloaded file for signature verification.\n" -msgstr "Ne mogu otvoriti preuzetu datoteku za provjeru potpisa.\n" +msgstr "Nije moguće otvoriti preuzetu datoteku za provjeru potpisa\n" #: src/metalink.c:780 #, c-format @@ -3213,24 +3220,24 @@ #: src/metalink.c:821 msgid "Signature validation succeeded.\n" -msgstr "Potpis je uspjeÅ¡no uvjeren.\n" +msgstr "Potpis je uspjeÅ¡no ovjeren\n" #: src/metalink.c:829 msgid "Invalid signature. Rejecting resource.\n" -msgstr "Neispravan potpis. Odbijam resurs.\n" +msgstr "Nevaljani potpis -- resurs se odbija\n" #: src/metalink.c:838 msgid "Data matches signature, but signature is not trusted.\n" -msgstr "Podaci se podudaraju s potpisom, ali potpis nije vjerodostojan.\n" +msgstr "Podaci se podudaraju s potpisom, ali potpis nije vjerodostojan\n" #: src/metalink.c:865 msgid "No checksums found.\n" -msgstr "Kontrolni zbroj nije pronaÄ‘en\n" +msgstr "Kontrolna suma nije pronaÄ‘ena\n" #: src/metalink.c:871 #, c-format msgid "Failed to download %s. Skipping resource.\n" -msgstr "Neuspjelo preuzimanje %s. PreskaÄem resurs.\n" +msgstr "Nije uspjelo preuzimanje %s -- resurs se preskaÄe\n" #: src/metalink.c:878 #, c-format @@ -3240,7 +3247,7 @@ #: src/metalink.c:885 #, c-format msgid "File %s retrieved but checksum does not match. \n" -msgstr "Datoteka %s je uÄitana, ali kontrolni zbroj se ne podudara. \n" +msgstr "Datoteka %s je uÄitana, ali kontrolna suma se ne podudara. \n" #: src/metalink.c:894 #, c-format @@ -3250,42 +3257,43 @@ #: src/metalink.c:1113 #, c-format msgid "Renaming %s to %s.\n" -msgstr "Preimenujem %s u %s.\n" +msgstr "%s se preimenuje u %s\n" #: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" -msgstr "Nastavljam raditi u pozadini.\n" +msgstr "Rad se nastavlja u pozadini\n" #: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" -msgstr "Nastavljam raditi u pozadini, pid %lu.\n" +msgstr "Rad se nastavlja u pozadini, PID %lu\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" -msgstr "Izlazni podaci bit će spremljeni u %s.\n" +msgstr "Izlazni podaci bit će spremljeni u %s\n" #: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" -msgstr "pogreÅ¡ka u fake_fork_child()\n" +msgstr "fake_fork_child() je zavrÅ¡ila neuspjeÅ¡no\n" #: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" -msgstr "pogreÅ¡ka u fake_fork()\n" +msgstr "fake_fork() je zavrÅ¡ila neuspjeÅ¡no\n" #: src/mswindows.c:460 src/mswindows.c:467 #, c-format msgid "%s: Couldn't find usable socket driver.\n" -msgstr "%s: Nije moguće pronaći upotrebljiv upravljaÄ (driver) utiÄnice.\n" +msgstr "%s: nije moguće pronaći upotrebljivi driver utiÄnice\n" #: src/mswindows.c:647 #, 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" +msgstr "" +"ioctl() je zavrÅ¡ila neuspjeÅ¡no -- utiÄnica se ne može postaviti da blokira\n" #: src/netrc.c:371 #, c-format @@ -3297,114 +3305,110 @@ #: src/netrc.c:412 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" -msgstr "%s: %s:%d: nepoznat simbol „%s“\n" +msgstr "%s: %s:%d: nepoznati simbol „%s“\n" #: src/netrc.c:496 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" -msgstr "Uporaba: %s NETRC [RAÄŒUNALO]\n" +msgstr "Uporaba: %s NETRC [HOSTNAME]\n" #: src/netrc.c:514 #, c-format msgid "%s: cannot stat %s: %s\n" -msgstr "%s: ne može se dobiti ‘stat’ %s: %s\n" +msgstr "%s: ne može se dobiti status od %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" -msgstr "" -"UPOZORENJE: generator sluÄajnih brojeva iniciran je sa slabim sjemenom.\n" +msgstr "UPOZORENJE: generator sluÄajnih brojeva koristi slabo sjeme\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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" +"PRNG (generator pseudo sluÄajnih brojeva nije inicijaliziran;\n" +"razmislite o koriÅ¡tenju opcije --random-file\n" -#: src/openssl.c:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "VaÅ¡a OpenSSL inaÄica je prestara i ne podržava TLSv1.1\n" +msgstr "VaÅ¡a OpenSSL inaÄica je prestara i ne podržava TLS 1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" -msgstr "OpenSSL: vrijednost opcije %d „secure-protocol“ nije implementiran\n" +msgstr "OpenSSL: vrijednost opcije %d „secure-protocol“ nije implementirana\n" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: Neispravan URL %s: %s\n" +msgstr "OpenSSL: nevaljana cipher lista: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: 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" +"UPOZORENJE: PRNG (generator pseudo sluÄajnih brojeva) nije bilo moguće\n" +"inicijalizirati; pokuÅ¡ajte upotrijebiti opciju --random-file\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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" +msgstr "%s: nije moguće provjeriti certifikat od %s koji je izdao %s:\n" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" -msgstr " Nema mogućnosti lokalno provjeriti autoritet izdavatelja.\n" +msgstr " Nema mogućnosti lokalno provjeriti autoritet izdavatelja\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" -msgstr " PronaÄ‘en samopotpisan certifikat.\n" +msgstr " PronaÄ‘en je samopotpisan certifikat\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" -msgstr " Izdani certifikat joÅ¡ nije valjan.\n" +msgstr " Izdani certifikat joÅ¡ nije važeći\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" -msgstr " Izdani certifikat je istekao.\n" +msgstr " Izdani certifikat viÅ¡e ne vrijedi (istekao je)\n" # nitko od alternativnih naziva navedenih u certifikatu # odgovara traženom ime domaćina abc -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" "%s: nijedan od alternativnih naziva navedenih u certifikatu ne odgovara\n" -" traženom imenu raÄunala %s.\n" +" traženom imenu raÄunala %s\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -" %s: ‘common name’ certifikata %s ne odgovara traženom imenu raÄunala " -"%s.\n" +" %s: common name certifikata %s ne odgovara traženom imenu hosta %s\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" " This may be an indication that the host is not who it claims to be\n" " (that is, it is not the real %s).\n" msgstr "" -" %s: ‘common name’ certifikata nije valjano (sadrži znak NUL).\n" -" To može biti znak da raÄunalo nije ono za koje se predstavlja\n" +" %s: common name certifikata nije valjan (sadrži znak NUL).\n" +" To može biti znak da host nije onaj za koga se predstavlja\n" " (to jest, da nije stvarni %s).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" -msgstr "Za nesigurno povezivanje na %s koristite „--no-check-certificate“.\n" +msgstr "Za nesigurno povezivanje na %s koristite „--no-check-certificate“\n" #: src/progress.c:244 #, c-format @@ -3413,14 +3417,13 @@ "%*s[ skipping %sK ]" msgstr "" "\n" -"%*s[ preskaÄem %sK ]" +"%*s[ preskaÄe se %sK ]" #: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" -"Neispravno specificiran dot-stil indikatora progresa %s; ostaje " -"neizmjenjen.\n" +"Nevaljano specificirani dot-stil indikatora progresa %s; ostaje neizmjenjen\n" # # FIXME: this is not "ETA" but simply "still %s" or "%s remaining" #. TRANSLATORS: "ETA" is English-centric, but this must @@ -3428,7 +3431,7 @@ #: src/progress.c:857 #, c-format msgid " eta %s" -msgstr " joÅ¡ %s" +msgstr " ETA %s" #: src/progress.c:1147 msgid " in " @@ -3437,12 +3440,12 @@ #: 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" +msgstr "Frekvencija REALTIME clock se ne može odrediti: %s\n" #: 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" +msgstr "%s bit će uklonjen, jer je trebao biti odbijen\n" #: src/res.c:394 #, c-format @@ -3451,37 +3454,37 @@ #: src/res.c:553 msgid "Loading robots.txt; please ignore errors.\n" -msgstr "UÄitava se robots.txt; molim zanemarite greÅ¡ke.\n" +msgstr "UÄitava se robots.txt; molimo ignorirajte greÅ¡ke\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" -msgstr "GreÅ¡ka pri obradi URL-a proxy poslužitelja %s: %s.\n" +msgstr "GreÅ¡ka pri obradi proxy URL-a %s: %s\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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" +msgstr "GreÅ¡ka u proxy URL adresi %s: mora biti HTTP\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" -msgstr "%d: prekoraÄen je broj preusmjerenja.\n" +msgstr "%d: prekoraÄen je broj preusmjerenja\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" msgstr "" -"Odustajem.\n" +"ZavrÅ¡eno.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" msgstr "" -"PokuÅ¡avam ponovo.\n" +"PokuÅ¡ava se ponovno.\n" "\n" #: src/spider.c:75 @@ -3489,7 +3492,7 @@ "Found no broken links.\n" "\n" msgstr "" -"Nijedna nevažeća veza nije pronaÄ‘ena.\n" +"Nijedna nevažeća veza nije pronaÄ‘ena\n" "\n" #: src/spider.c:82 @@ -3501,13 +3504,13 @@ "Found %d broken links.\n" "\n" msgstr[0] "" -"PronaÄ‘ena %d nevažeća veza.\n" +"PronaÄ‘ena je %d nevažeća veza.\n" "\n" msgstr[1] "" -"PronaÄ‘ene %d nevažeće veze.\n" +"PronaÄ‘ene su %d nevažeće veze.\n" "\n" msgstr[2] "" -"PronaÄ‘eno %d nevažećih veza.\n" +"PronaÄ‘eno je %d nevažećih veza.\n" "\n" #: src/url.c:674 @@ -3525,15 +3528,15 @@ #: src/url.c:680 msgid "Invalid host name" -msgstr "Neispravno ime raÄunala" +msgstr "Nevaljano ime hosta" #: src/url.c:682 msgid "Bad port number" -msgstr "Neispravan broj porta" +msgstr "Nevaljani broj porta" #: src/url.c:684 msgid "Invalid user name" -msgstr "Neispravno korisniÄko ime" +msgstr "Nevaljano korisniÄko ime" #: src/url.c:686 msgid "Unterminated IPv6 numeric address" @@ -3545,133 +3548,145 @@ #: src/url.c:690 msgid "Invalid IPv6 numeric address" -msgstr "Neispravna IPv6 numeriÄka adresa" +msgstr "Nevaljana IPv6 numeriÄka adresa" #: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "HTTPS podrÅ¡ka nije ukljuÄena pri kompiliranju" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "PronaÄ‘en nepotpun ili neispravan viÅ¡ebajtni niz\n" +msgstr "PronaÄ‘ena je viÅ¡ebajtna sekvencija koja se ne može konvertirati\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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" +"%s: %s: nije uspjelo dodijeliti dosta memorije; nema dovoljno memorije\n" -#: src/utils.c:131 +#: src/utils.c:134 #, 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" +msgstr "%s: %s: nije uspjelo dodijeliti %ld bajtova; nema dovoljno memorije\n" -#: src/utils.c:351 +#: src/utils.c:354 #, 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" +"%s: aprintf(): meÄ‘uspremnik teksta je prevelik (%d bajtova) -- rad prekida " +"se\n" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" -msgstr "Nastavljam rad u pozadini, pid %d.\n" +msgstr "Rad se nastavlja u pozadini, PID %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nije uspjelo ukloniti simboliÄku vezu %s: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Nije uspjelo inicijalizirati ‘libcares’\n" +msgstr "Otvoriti datoteku %s s Fopen() nije uspjelo\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Nije uspjelo postaviti dopuÅ¡tenja za %s\n" +msgstr "Nije uspjelo dobiti prava pristupa za datoteku %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Nije uspjelo postaviti dopuÅ¡tenja za %s\n" +msgstr "Dobiti prava pristupa za datoteku %s sa stat() nije uspjelo\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Datoteka %s promijenila se od zadnje provjere;\n" +"sigurnosna provjera nije uspjela" -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Nije uspjelo razrijeÅ¡iti IP adresu ‘%s’\n" +msgstr "Datoteku %s nije uspjelo otvoriti zbog: %s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Nije uspjelo postaviti dopuÅ¡tenja za %s\n" +msgstr "Dobiti prava pristupa za datoteku %s nije uspjelo zbog greÅ¡ke: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"PokuÅ¡ava se otvoriti datoteka %s koja se je promijenila od zadnje provjere;\n" +"sigurnosna provjera nije uspjela" + +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Nevaljani regularni izraz %s, PCRE greÅ¡ka %d\n" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" -msgstr "Neispravan regularni izraz %s, %s\n" +msgstr "Nevaljani regularni izraz %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" -msgstr "GreÅ¡ka pri traženju %s: %d\n" +msgstr "GreÅ¡ka pri usporedbi %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "PreskaÄe se kljuÄ pogreÅ¡ne veliÄine (%d/%d): %s\n" + +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "GreÅ¡ka pri dupliciranju deskriptora WARC datoteke\n" -#: src/warc.c:223 +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" -msgstr "GreÅ¡ka otvaranja GZIP protoka u WARC datoteci.\n" +msgstr "GreÅ¡ka otvaranja GZIP stream u WARC datoteci\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" -msgstr "GreÅ¡ka u pisanju warcinfo zapisa u WARC datoteku.\n" +msgstr "GreÅ¡ka u pisanju warcinfo zapisa u WARC datoteku\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -"Otvaranje WARC datoteke %s.\n" +"Otvara se WARC datoteka %s\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" -msgstr "GreÅ¡ka pri otvaranju WARC datoteke %s.\n" +msgstr "GreÅ¡ka pri otvaranju WARC datoteke %s\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -"U CDX datoteci nema popisa originalnih URL-ova . (Nedostaje stupac ‘a’.)\n" +"U CDX datoteci nema popisa originalnih URL-ova. (Nedostaje stupac „a“)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" -msgstr "" -"U CDX datoteci nema popisa kontrolnih zbrojeva. (Nedostaje stupac ‘k’.)\n" +msgstr "U CDX datoteci nema popisa kontrolnih suma. (Nedostaje stupac „k“)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" -msgstr "U CDX datoteci nema popisa identifikatora . (Nedostaje stupac ‘u’.)\n" +msgstr "U CDX datoteci nema popisa identifikatora. (Nedostaje stupac „u“)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3684,45 +3699,45 @@ msgstr[2] "UÄitano je %d zapisa iz CDX\n" # deduplication > eliminira duplikate, pametno dupliciranje -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" -msgstr "CDX datoteka %s se ne može proÄitati za deduplikaciju.\n" +msgstr "CDX datoteka %s se ne može proÄitati za deduplikaciju\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" -msgstr "Privremena WARC manifest datoteka se ne može otvoriti.\n" +msgstr "Privremena WARC manifest datoteka se ne može otvoriti\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" -msgstr "Privremena WARC dnevniÄka datoteka (dnevnik) se ne može otvoriti.\n" +msgstr "Privremena WARC dnevniÄka datoteka (dnevnik) se ne može otvoriti\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" -msgstr "WARC datoteka se ne može otvoriti.\n" +msgstr "WARC datoteka se ne može otvoriti\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" -msgstr "CDX datoteka se ne može otvoriti za ispis.\n" +msgstr "CDX datoteka se ne može otvoriti za ispis\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" -msgstr "Privremena WARC datoteka se ne može otvoriti.\n" +msgstr "Privremena WARC datoteka se ne može otvoriti\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -"PronaÄ‘eno toÄno podudaranje u CDX datoteci. PronaÄ‘eni zapis spremljen u " -"WARC.\n" +"PronaÄ‘eno toÄno podudaranje u CDX datoteci; pronaÄ‘eni zapis sprema se u " +"WARC\n" #~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: opcija ‘--%s’ ne dopuÅ¡ta 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" +#~ msgstr "%s: opcija „-W %s“ je dvosmislena\n" #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: opcija „-W %s“ ne dopuÅ¡ta argument\n" @@ -3731,7 +3746,7 @@ #~ 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" +#~ msgstr "Datoteka „%s“ već postoji -- ne preuzima se\n" #~ msgid "Invalid UTF-8 sequence: %s\n" #~ msgstr "Neispravna UTF-8 sekvencija: %s\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/hu.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/hu.gmo differ diff -Nru wget-1.19.5/po/hu.po wget-1.20.1/po/hu.po --- wget-1.19.5/po/hu.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/hu.po 2018-12-26 20:10:50.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2018-01-21 15:13+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -234,17 +234,17 @@ msgid "Unmatched ) or \\)" msgstr "Pár nélküli ) vagy \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Nincs elÅ‘zÅ‘ reguláris kifejezés" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "nem hozható létre adatcsatorna" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -308,7 +308,7 @@ msgid "failed: %s.\n" msgstr "sikertelen: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: a gépcím (%s) nem oldható fel\n" @@ -435,12 +435,12 @@ msgid "Length: %s" msgstr "Hossz: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) van hátra" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s van hátra" @@ -611,7 +611,7 @@ "Nincs ilyen fájl vagy könyvtár: %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s létrejött.\n" @@ -634,17 +634,17 @@ msgid "Data transfer aborted.\n" msgstr "Adatátvitel megszakítva.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, 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:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(próba:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -653,7 +653,7 @@ "%s (%s) -- szabványos kimenetre írva %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -662,8 +662,8 @@ "%s (%s) -- %s mentve [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "%s eltávolítása.\n" @@ -761,160 +761,176 @@ msgstr "" "A következÅ‘be belépés kihagyva: %s, mert ki van zárva/nincs kijelölve.\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "%s visszautasítása.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "%s visszautasítása.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" +"A következÅ‘be belépés kihagyva: %s, mert ki van zárva/nincs kijelölve.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Hiba %s és %s illesztésekor: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Nincs találat a mintához (%s).\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "A HTML-esített index kiírva a(z) %s[%s] fájlba.\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "A HTML-esített index kiírva a(z) %s fájlba.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "HIBA: Nem lehet megnyitni a(z) %s könyvtárat.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, 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:169 +#: src/gnutls.c:174 #, 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:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, 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:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Az OpenSSL verzió túl régi a TLSv1.1 támogatásához\n" + +#: src/gnutls.c:676 #, 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:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "HIBA" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "FIGYELMEZTETÉS" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s nem mutatott be tanúsítványt.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: %s tanúsítványának nincs ismert kibocsátója.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, 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:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: %s tanúsítványa lejárt.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, 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:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Nem található tanúsítvány\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Hiba a tanúsítvány feldolgozása közben: %s.\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 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:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "A tanúsítvány lejárt.\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "A tanúsítványnak X.509-nek kell lennie\n" @@ -954,11 +970,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "A HTTP kérés írása meghiúsult: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Nincsenek fejlécek, HTTP/0.9 feltételezése" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -967,11 +983,11 @@ "A fájl (%s) már létezik, nem kerül letöltésre.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 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:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -979,55 +995,55 @@ "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:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "A BODY adatfájl (%s) hiányzik: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "MeglévÅ‘ kapcsolat újrafelhasználása a következÅ‘höz: [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "MeglévÅ‘ kapcsolat újrafelhasználása a következÅ‘höz: %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "A proxy válasz olvasása meghiúsult: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s HIBA %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Rosszul formázott állapotsor" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "A proxy alagutazás meghiúsult: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Ismeretlen hitelesítési séma.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Hitelesítés kijelölve: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Mentés ide: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1036,21 +1052,21 @@ "Az aláírás letöltése közben:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "Nem olvasható az aláírás tartalma az átmeneti fájlból. Kihagyás.\n" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Nem sikerült létrehozni átmeneti fájlt. Az aláírás letöltésének kihagyása.\n" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Érvénytelen pri érték. %d feltételezése.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1058,42 +1074,42 @@ "Nem található elfogadható összesítés a Metalink erÅ‘forrásokhoz.\n" "Figyelmen kívül maradnak.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "A tapasztalt hibák miatt az SSL letiltásra kerül.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s kérés elküldve, várakozás válaszra… " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Nem érkezett adat.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Olvasási hiba (%s) a fejlécekben.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(nincs leírás)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Hely: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "nincs megadva" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [következik]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1102,7 +1118,7 @@ "A fájl (%s) nem módosult a kiszolgálón. A letöltés elmarad.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1114,7 +1130,7 @@ "Érdemes lehet megadni a --no-if-modified-since kapcsolót.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1124,58 +1140,58 @@ " A fájl már teljesen le van töltve; nincs teendÅ‘.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Hossz: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "figyelmen kívül hagyva" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Figyelmeztetés: a helyettesítÅ‘ karaktereket a HTTP nem támogatja.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "%s nem írható (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 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:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "A felhasználónév/jelszó hitelesítés meghiúsult.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Nem írható a WARC fájl.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Nem írható az átmeneti WARC fájl.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Nem lehet létrehozni SSL-kapcsolatot.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s nem törölhetÅ‘ (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "HIBA: Ãtirányítás (%d) hely nélkül.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1183,25 +1199,25 @@ "Nem találhatók Metalink adatok a HTTP válaszban. A fájl letöltése HTTP GET " "használatával.\n" -#: src/http.c:4467 +#: src/http.c:4473 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:4507 +#: src/http.c:4514 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:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 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:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1211,16 +1227,16 @@ "letöltésre.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "A távoli fájl újabb, letöltésre kerül.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1230,7 +1246,7 @@ "letöltésre kerül.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1238,7 +1254,7 @@ "A távoli fájl létezik, de nem tartalmaz hivatkozásokat -- nem kerül " "letöltésre.\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1248,7 +1264,7 @@ "de a rekurzió le van tiltva -- nem kerül letöltésre.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1256,12 +1272,12 @@ "A távoli fájl létezik.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1270,7 +1286,7 @@ "%s (%s) -- %s kiírva a szabványos kimenetre [%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1279,58 +1295,58 @@ "%s (%s) -- %s mentve [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, 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:4772 +#: src/http.c:4780 #, 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:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nem támogatott védelmi minÅ‘ség: „%sâ€.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nem támogatott algoritmus: „%sâ€.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s nem olvasható (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, 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:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1341,7 +1357,7 @@ "EllenÅ‘rizze a következÅ‘t: „%sâ€,\n" "vagy adjon meg másik fájlt a --config kapcsolóval.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1352,52 +1368,52 @@ "EllenÅ‘rizze a következÅ‘t: „%sâ€,\n" "vagy adjon meg másik fájlt a --config kapcsolóval.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Érvénytelen --execute parancs: %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Érvénytelen szám: %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: a(z) %s csak egyszer használható\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Érvénytelen bájtérték: %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Érvénytelen idÅ‘intervallum: %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1406,28 +1422,28 @@ "A use-askpass egy karakterláncot, vagy a WGET_ASKPASS vagy SSH_ASKPASS " "környezeti változó egyikének beállítását igényli.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Érvénytelen érték: %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Érvénytelen fejléc: %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Érvénytelen WARC fejléc: %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Érvénytelen folyamattípus: %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1442,16 +1458,16 @@ msgid "Encoding %s isn't valid\n" msgstr "A kódolás (%s) nem érvényes\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 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:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Kezeletlen hibaszám: %d\n" @@ -1484,12 +1500,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; naplózás letiltása.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Használat: %s [KAPCSOLÓ]… [URL]…\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1498,64 +1514,64 @@ "kötelezÅ‘ek.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Indítás:\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help ezen súgó megjelenítése\n" -#: src/main.c:600 +#: src/main.c:601 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:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Naplózás és bemeneti fájl:\n" -#: src/main.c:608 +#: src/main.c:609 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:610 +#: src/main.c:611 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:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug rengeteg hibakeresési információ kiírása\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug Watt-32 hibakeresési információk kiírása\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet csendes (nincs kimenet)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose legyen részletes (ez az alapértelmezés)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1563,7 +1579,7 @@ " -nv, --no-verbose részletesség kikapcsolása csendesség " "nélkül\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1571,7 +1587,7 @@ " --report-speed=TÃPUS sávszélesség kiírása TÃPUSKÉNT. A TÃPUS\n" " lehet bitek\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1580,7 +1596,7 @@ "ek\n" " letöltése\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1588,12 +1604,12 @@ " --input-metalink=FÃJL a helyi Metalink FÃJLBAN lefedett fájlok\n" " letöltése\n" -#: src/main.c:634 +#: src/main.c:635 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:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1602,27 +1618,27 @@ "F)\n" " feloldása az URL-hez képest relatívan\n" -#: src/main.c:639 +#: src/main.c:640 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:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" " --no-config ne olvasson semmilyen beállítófájlt\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Letöltés:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1630,14 +1646,14 @@ " -t, --tries=SZÃM újrapróbálkozások számának beállítása a\n" " SZÃMRA (0 = végtelen)\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused újrapróbálkozás akkor is, ha a kapcsolat\n" " visszautasításra kerül\n" -#: src/main.c:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1646,11 +1662,11 @@ " --ignore-tags=LISTA a figyelmen kívül hagyott HTML címkék\n" " vesszÅ‘kkel elválasztott listája\n" -#: src/main.c:655 +#: src/main.c:656 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:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1660,7 +1676,7 @@ " fájlokra töltenének le (azokat " "felülírva)\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1668,7 +1684,7 @@ msgstr "" " --no-config ne olvasson semmilyen beállítófájlt\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1676,7 +1692,7 @@ " -c, --continue részben letöltött fájl letöltés " "folytatása\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1684,13 +1700,13 @@ " --start-pos=ELTOLÃS letöltés kezdése nullától kezdÅ‘dÅ‘ " "ELTOLÃSTÓL\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TÃPUS elÅ‘rehaladás mérése típusának " "kiválasztása\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1698,7 +1714,7 @@ " --show-progress a folyamatsáv megjelenítése bármely\n" " részletességi módban\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1707,7 +1723,7 @@ " -N, --timestamping ne töltse le újra a fájlokat, hacsak nem\n" " újabbak a helyinél\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1717,7 +1733,7 @@ "since\n" " get kéréseket idÅ‘bélyegzés módban\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1725,22 +1741,22 @@ " --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:679 +#: src/main.c:680 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:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider ne töltsön le semmit\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1748,7 +1764,7 @@ " --dns-servers=CÃMEK lekérdezendÅ‘ DNS kiszolgálók (vesszÅ‘vel\n" " elválasztott) listája\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1756,30 +1772,30 @@ " --bind-dns-address=CÃM DNS feloldó rákapcsolása a CÃMRE (gépnév\n" " vagy IP-cím) a helyi gépen\n" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=MP a DNS keresés idÅ‘korlátjának beállítása\n" " MP másodpercre\n" -#: src/main.c:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=MÃSODPERC MÃSODPERC várakozás a letöltések között\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1787,7 +1803,7 @@ " --waitretry=MÃSODPERC 1..MÃSODPERC várakozás egy letöltés\n" " újrapróbálásai között\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1796,16 +1812,16 @@ "másodpercig\n" " a letöltések között\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy proxy határozott kikapcsolása\n" -#: src/main.c:705 +#: src/main.c:706 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:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1813,19 +1829,19 @@ " --bind-address=CÃM hozzákötés a CÃMHEZ (gépnév vagy IP-cím)\n" " a helyi gépen\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=SEBESSÉG letöltési sebesség korlátozása " "SEBESSÉGRE\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache DNS keresések gyorsítótárazásnak " "letiltása\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1835,7 +1851,7 @@ " amit az OS operációs rendszer " "engedélyez\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1844,15 +1860,15 @@ "hagyása\n" " fájlok/könyvtárak egyeztetésekor\n" -#: src/main.c:718 +#: src/main.c:719 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:720 +#: src/main.c:721 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:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1861,13 +1877,13 @@ " --prefer-family=CSALÃD kapcsolódás elÅ‘ször a megadott család\n" " címeihez: „IPv6â€, „IPv4†vagy „noneâ€\n" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=FELHASZNÃLÓ mind az ftp, mind a http felhasználó\n" " beállítása a FELHASZNÃLÓRA\n" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" @@ -1875,11 +1891,11 @@ "beállítása\n" " a JELSZÓRA\n" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password jelszavak bekérése\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1896,29 +1912,29 @@ " WGET_ASKPASS vagy az SSH_ASKPASS\n" " környezeti változó lesz használva.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri IRI támogatás kikapcsolása\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=KÓD KÓD használata az IRI-k helyi " "kódolásaként\n" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=KÓD KÓD használata alapértelmezett távoli\n" " kódolásként\n" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink fájl eltávolítása felülírás elÅ‘tt\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1927,7 +1943,7 @@ "megtartása\n" " (.badhash hozzáfűzése)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1936,7 +1952,7 @@ "metaurl\n" " sorrendi SZÃM\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1944,7 +1960,7 @@ " --metalink-over-http Metalink metaadatok használata HTTP\n" " válaszfejlécekbÅ‘l\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1953,43 +1969,44 @@ "részesített\n" " helye\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr metaadatok tárolásának kikapcsolása a\n" " kiterjesztett fájlattribútumokban\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Könyvtárak:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ne hozzon létre könyvtárakat\n" -#: src/main.c:765 +#: src/main.c:766 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:767 +#: src/main.c:768 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:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories protokollnév használata a könyvtárakban\n" -#: src/main.c:771 +#: src/main.c:772 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:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1997,28 +2014,28 @@ " --cut-dirs=SZÃM SZÃM db távoli könyvtárösszetevÅ‘ " "kihagyása\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP kapcsolók:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=FELHASZNÃLÓ http felhasználó beállítása " "FELHASZNÃLÓRA\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=JELSZÓ http jelszó beállítása JELSZÓRA\n" -#: src/main.c:783 +#: src/main.c:784 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:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2027,7 +2044,7 @@ "megváltoztatása\n" " (ez általában az „index.htmlâ€)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2036,42 +2053,42 @@ "megfelelÅ‘\n" " kiterjesztésekkel\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length a „Content-Length†fejlécmezÅ‘ mellÅ‘zése\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=KARAKTERLÃNC KARAKTERLÃNC beszúrása a fejlécek közé\n" -#: src/main.c:795 +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect oldalanként engedélyezett átirányítások\n" " legnagyobb száma\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=FELHASZNÃLÓ FELHASZNÃLÓ beállítása proxy felhasználó\n" " névként\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=JELSZÓ JELSZÓ beállítása proxy jelszóként\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2079,11 +2096,11 @@ " --referer=URL a „Referer: URL†fejléc felvétele a HTTP\n" " kérésbe\n" -#: src/main.c:806 +#: src/main.c:807 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:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2091,7 +2108,7 @@ " -U, --user-agent=ÃœGYNÖK azonosítás ÃœGYNÖKKÉNT a Wget/VERZIÓ " "helyett\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2099,23 +2116,23 @@ " --no-http-keep-alive a HTTP keep-alive (tartós kapcsolatok)\n" " letiltása\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ne használjon sütiket\n" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=FÃJL sütik betöltése FÃJLBÓL a munkamenet " "elÅ‘tt\n" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FÃJL sütik mentése FÃJLBA a munkamenet után\n" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2124,7 +2141,7 @@ "és\n" " mentése\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2133,7 +2150,7 @@ "KARAKTERLÃNC\n" " küldése adatként\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2141,14 +2158,14 @@ " --post-file=FÃJL a POST metódus használata, a FÃJL\n" " tartalmának küldése\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMetódus „HTTPMetódus†metódus használata a " "kérésben\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2156,7 +2173,7 @@ " --body-data=KARAKTERLÃNC a KARAKTERLÃNC küldése adatként,\n" " a --method beállítása kötelezÅ‘\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2164,7 +2181,7 @@ " --body-file=FÃJL a FÃJL tartalmának küldése, a\n" " --method beállítása kötelezÅ‘\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2177,7 +2194,7 @@ "kiválasztásakor\n" " (KÃSÉRLETI)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2186,7 +2203,7 @@ "kiszolgálóhibák\n" " esetén\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2197,11 +2214,11 @@ " küldése anélkül, hogy elÅ‘ször megvárná\n" " a kiszolgáló kihívási kérését\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) kapcsolók:\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2212,46 +2229,46 @@ " „autoâ€, „SSLv2â€, „SSLv3â€, „TLSv1†és\n" " „PFS†egyike\n" -#: src/main.c:847 +#: src/main.c:848 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:849 +#: src/main.c:850 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:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FÃJL ügyfél tanúsítványfájlja\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FÃJL személyes kulcs fájlja\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" " --ca-certificate=FÃJL a hitelesítésszolgáltatók csoportját\n" " tartalmazó fájl\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2259,13 +2276,13 @@ " --ca-directory=KÖNYVTÃR a hitelesítésszolgáltatók hash listáját\n" " tartalmazó könyvtár\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" " --crl-file=FÃJL a tanúsítvány-visszavonási fájlok\n" " csoportját tartalmazó fájl\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2281,7 +2298,7 @@ " elválasztóval; a partner " "ellenÅ‘rzéséhez\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2289,7 +2306,7 @@ " --random-file=FÃJL véletlen adatokat tartalmazó fájl az SSL\n" " PRNG elÅ‘készítéséhez\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2297,7 +2314,7 @@ " --egd-file=FÃJL véletlen adatokat tartalmazó, az EGD\n" " foglalatot megnevezÅ‘ fájl\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2307,15 +2324,15 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "HSTS kapcsolók:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts HSTS tiltása\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2324,11 +2341,11 @@ "az\n" " alapértelmezést)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP kapcsolók:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2336,40 +2353,40 @@ " --ftp-stmlf Stream_LF formátum használata az összes\n" " bináris FTP fájlhoz\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=FELHASZNÃLÓ az ftp felhasználó beállítása " "FELHASZNÃLÓRA\n" -#: src/main.c:903 +#: src/main.c:904 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:905 +#: src/main.c:906 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:907 +#: src/main.c:908 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:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp a „passzív†átviteli mód letiltása\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions távoli fájljogosultságok megÅ‘rzése\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2380,11 +2397,11 @@ "könyvtárak)\n" " letöltése\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTPS kapcsolók:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2392,7 +2409,7 @@ " --ftps-implicit implicit FTPS használata\n" " (az alapértelmezett port a 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2404,7 +2421,7 @@ "adatkapcsolat\n" " nyitásakor\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2412,7 +2429,7 @@ " --ftps-clear-data-connection csak a vezérlÅ‘kapcsolat titkosítása;\n" " minden adat egyszerű szöveg lesz\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2420,11 +2437,11 @@ " --ftps-fallback-to-ftp visszaváltás FTP-re, ha az FTPS nem\n" " támogatott a cél kiszolgálón\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC kapcsolók:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2432,25 +2449,25 @@ " --warc-file=FÃJLNÉV kérés/válasz adatok mentése .warc.gz " "fájlba\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=SZÃM a WARC fájlok legnagyobb méretének\n" " beállítása SZÃMRA\n" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx CDX indexfájlok kiírása\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2458,25 +2475,25 @@ " --warc-dedup=FÃJLNÉV ne tárolja az ezen CDX fájlban felsorolt\n" " rekordokat\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 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:949 +#: src/main.c:950 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:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2485,15 +2502,15 @@ " --warc-tempdir=KÖNYVTÃR a WARC író által létrehozott átmeneti\n" " fájlok helye\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekurzív letöltés:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive rekurzív letöltés megadása\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2501,14 +2518,14 @@ " -l, --level=SZÃM legnagyobb rekurziós mélység (inf vagy\n" " 0 = végtelen)\n" -#: src/main.c:962 +#: src/main.c:963 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:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2519,7 +2536,7 @@ " vagy CSS fájlban, hogy helyi fájlokra\n" " mutassanak\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2527,7 +2544,7 @@ " --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:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2536,7 +2553,7 @@ "mentési\n" " fájl forgatása\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2545,7 +2562,7 @@ "róla\n" " X_orig néven mentés\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2554,7 +2571,7 @@ "róla\n" " X.orig néven mentés\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2563,7 +2580,7 @@ "listing\n" " kapcsolók használatával\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2571,7 +2588,7 @@ " -p, --page-requisites a HTML oldal megjelenítéséhez szükséges\n" " összes kép stb. letöltése\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2579,11 +2596,11 @@ " --strict-comments a HTML megjegyzések szigorú (SGML)\n" " kezelésének bekapcsolása\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Rekurzív elfogadás/visszautasítás:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2591,7 +2608,7 @@ " -A, --accept=LISTA az elfogadott kiterjesztések vesszÅ‘kkel\n" " elválasztott listája\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2600,50 +2617,50 @@ "vesszÅ‘kkel\n" " elválasztott listája\n" -#: src/main.c:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TÃPUS reguláris kifejezés típusa (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TÃPUS reguláris kifejezés típusa (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 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:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2651,7 +2668,7 @@ " --follow-tags=LISTA a követett HTML címkék vesszÅ‘kkel\n" " elválasztott listája\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2659,22 +2676,22 @@ " --ignore-tags=LISTA a figyelmen kívül hagyott HTML címkék\n" " vesszÅ‘kkel elválasztott listája\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative csak a relatív hivatkozások követése\n" -#: src/main.c:1018 +#: src/main.c:1019 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:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2684,91 +2701,91 @@ "által\n" " megadott név használata\n" -#: src/main.c:1023 +#: src/main.c:1024 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:1025 +#: src/main.c:1026 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Hibajelentéseket és javaslatokat a címre küldhet\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "%s felhasználó jelszava: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Jelszó: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Nem lehet létrehozni adatcsatornát\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "Hiba az indítási fájlműveletek elÅ‘készítésekor a use-askpass kapcsolónál: " "%d\n" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "Hiba az indítási fájlműveletek beállításakor a use-askpass kapcsolónál: %d\n" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Hiba a(z) „%s %s†parancstól érkezÅ‘ válasz olvasásakor: %s\n" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "„%s%s†felhasználóneve: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "„%s%s@%s†jelszava: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Területi beállítás: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Fordítás: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Összeállítás: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2777,29 +2794,29 @@ "GNU Wget %s, összeállítva %s rendszeren.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (user)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2813,7 +2830,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2821,37 +2838,37 @@ "\n" "Eredetileg Hrvoje Niksic írta.\n" -#: src/main.c:1337 +#: src/main.c:1338 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:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Memóriafoglalási probléma\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Kilépés hiba miatt itt: %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, 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:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: szabálytalan kapcsoló -- „-n%câ€\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2861,7 +2878,7 @@ "links\n" "kerül felhasználásra.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2870,24 +2887,24 @@ "A --no-clobber és a --convert-file-only is meg lett adva, csak a\n" "--convert-file-only kerül felhasználásra.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Nem lehet idÅ‘bélyeget is tenni a régi fájlokra és ugyanakkor békén is " "hagyni.\n" -#: src/main.c:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2899,7 +2916,7 @@ "kézikönyvet.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2909,7 +2926,7 @@ "minden letöltött tartalom a megadott fájlba kerül.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2919,7 +2936,7 @@ "A részletekért lásd a kézikönyvoldalt.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2927,18 +2944,18 @@ "A WARC kimenet nem működik a --no-clobber kapcsolóval, így ez le lesz " "tiltva.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, 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 le lesz tiltva.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, 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:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2947,7 +2964,7 @@ "A WARC kimenet nem működik a --continue vagy --start-pos kapcsolóval, ezek\n" "le lesznek tiltva.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2955,7 +2972,7 @@ "Az ellenÅ‘rzőösszegek letiltva, a WARC deduplikáció nem fogja megtalálni a\n" "többszörös rekordokat.\n" -#: src/main.c:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2964,12 +2981,12 @@ "A WARC kimenet nem működik a --continue vagy --start-pos kapcsolóval, ezek\n" "le lesznek tiltva.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2979,17 +2996,17 @@ "le\n" "lesz tiltva.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: hiányzó URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3000,7 +3017,7 @@ "A --method az adatokat --body-data és --body-file kapcsolókon keresztül " "várja.\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3009,17 +3026,17 @@ "Meg kell adnia egy metódust a --method=HTTPMetódus kapcsolón keresztül a\n" "--body-data vagy --body-file kapcsolókkal való használathoz.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, 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:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -3027,7 +3044,7 @@ "A -k vagy -r csak akkor használható a -O kapcsolóval, ha normál fájl a " "kimenet.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3037,42 +3054,42 @@ "ha\n" "normál fájl a kimenet.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Nem sikerült a libcares elÅ‘készítése\n" -#: src/main.c:2022 +#: src/main.c:2029 #, 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:2045 +#: src/main.c:2052 #, 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:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Nem található URL a következÅ‘ben: %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "%s metalink fájl feldolgozása sikertelen.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Nem sikerült letölteni minden erÅ‘forrást innen: %s.\n" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3083,7 +3100,7 @@ "Valóságban eltelt teljes idÅ‘: %s\n" "Letöltve: %d fájl, %s %s alatt (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "A letöltési korlát (%s) TÚLLÉPVE!\n" @@ -3249,7 +3266,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Folytatás a háttérben, a pid: %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "A kimenet a következÅ‘ fájlba lesz kiírva: %s.\n" @@ -3294,64 +3311,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: %s nem érhetÅ‘ el: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "FIGYELMEZTETÉS: gyenge véletlenmag kerül felhasználásra.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "A PRNG nem készíthetÅ‘ elÅ‘; fontolja meg a --random-file használatát.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "Az OpenSSL verzió túl régi a TLSv1.1 támogatásához\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: megvalósítatlan „secure-protocol†kapcsolóérték: %d\n" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: Érvénytelen URL: %s: %s.\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "A PRNG nem készíthetÅ‘ elÅ‘; fontolja meg a --random-file használatát.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " A kibocsátó hitelessége nem ellenÅ‘rizhetÅ‘ helyileg.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Saját aláírású tanúsítvány.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " A kibocsátott tanúsítvány még nem érvényes.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " A kibocsátott tanúsítvány lejárt.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3360,14 +3377,14 @@ "%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:985 +#: src/openssl.c:989 #, 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:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3379,7 +3396,7 @@ " Ez azt jelezheti, hogy a gép nem az, akinek mondja magát\n" " (azaz nem a valódi %s).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3430,22 +3447,22 @@ 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:912 +#: src/retr.c:928 #, 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:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d átirányítás túllépve.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3453,7 +3470,7 @@ "Feladás.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3525,98 +3542,108 @@ msgid "HTTPS support not compiled in" msgstr "A HTTPS támogatás nincs befordítva" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Nem teljes vagy érvénytelen több bájtos sorozat található\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Folytatás a háttérben, a pid: %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "A(z) %s jogosultságainak beállítása sikertelen.\n" -#: src/utils.c:872 +#: src/utils.c:878 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "A(z) %s jogosultságainak beállítása sikertelen.\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "A(z) %s jogosultságainak beállítása sikertelen.\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Érvénytelen reguláris kifejezés: %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Érvénytelen reguláris kifejezés: %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Hiba %s illesztése közben: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Hiba a WARC fájl megnyitásakor: %s\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Hiba a GZIP adatfolyam megnyitásakor a WARC fájlhoz.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Hiba a warcinfo rekord írásakor a WARC fájlba.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3625,27 +3652,27 @@ "%s WARC fájl megnyitása.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Hiba a WARC fájl megnyitásakor: %s\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" "A CDX fájl nem sorolja fel az eredeti URL-eket. (Hiányzó „a†oszlop.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" "A CDX fájl nem sorolja fel az ellenÅ‘rzőösszegeket. (Hiányzó „k†oszlop.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" "A CDX fájl nem sorolja fel a rekordazonosítókat. (Hiányzó „u†oszlop.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3660,32 +3687,32 @@ "%d rekord betöltve a CDX-bÅ‘l.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Nem sikerült beolvasni a(z) %s CDX fájlt a deduplikációhoz.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Nem sikerült megnyitni az átmeneti WARC manifest fájlt.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Nem sikerült megnyitni az átmeneti WARC naplófájlt.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Nem sikerült megnyitni a WARC fájlt.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Nem sikerült megnyitni a CDX fájlt a kimenethez.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Nem sikerült megnyitni az átmeneti WARC fájlt.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Pontos egyezés található a CDX fájlban. A revizit rekord mentése a WARC-ba.\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/id.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/id.gmo differ diff -Nru wget-1.19.5/po/id.po wget-1.20.1/po/id.po --- wget-1.19.5/po/id.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/id.po 2018-12-26 20:10:50.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: GNU wget 1.16.1.46\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2015-06-01 10:00+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -235,17 +235,17 @@ msgid "Unmatched ) or \\)" msgstr "Tidak cocok ) atau \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Tidak ada ekspresi regular sebelumnya" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "cannot create pipe" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -309,7 +309,7 @@ msgid "failed: %s.\n" msgstr "gagal: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: tidak dapat menemukan alamat dari %s\n" @@ -432,12 +432,12 @@ msgid "Length: %s" msgstr "Besar: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) tersisa" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s tersisa" @@ -603,7 +603,7 @@ "Tidak ada berkas atau direktori %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s memiliki sprung kedalam eksistensi.\n" @@ -626,17 +626,17 @@ msgid "Data transfer aborted.\n" msgstr "Data transfer dibatalkan.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Berkas %s sudah ada disana; tidak diambil.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(coba:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -645,7 +645,7 @@ "%s (%s) - ditulis ke stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -654,8 +654,8 @@ "%s (%s) - %s disimpan [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Menghapus %s.\n" @@ -753,161 +753,175 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Menolak %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Menolak %s.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "Tidak turun ke %s karena ini di excluded/tidak termasuk.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Gagal mencocokan %s dengan %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Tidak ada pola %s yang cocok.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Menulis HTML-ized indeks ke %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Menulis HTML-ized indeks ke %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERROR: Tidak ada direktori %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERROR: Failed to open cert %s: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Error dalam membaca sertifikat: %s.\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Dimuat berkas CRL '%s'\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, 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:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "" "Mohon kirimkan laporan kesalahan dan pertanyaan ke .\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: tidak diimplementasikan 'secure-protocol' nilai pilihan %d\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ERROR" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "PERINGATAN" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Tidak ada certificate yang di berikan oleh %s.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Sertifikat dari %s tidak dipercaya.\n" -#: src/gnutls.c:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Sertifikat dari %s belum memperoleh penerbit yang dikenal.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Sertifikat dari %s telah dicabut.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Sertifikat dari %s tidak dipercaya.\n" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Sertifikat dari %s telah dicabut.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Error menginisialisasi sertifikat X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Tidak ada sertifikat yang ditemukan\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Error dalam membaca sertifikat: %s.\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Sertifikat belum diaktifkan.\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Sertifikat telah habis masa berlakunya.\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Certificate must bu X.509\n" @@ -947,11 +961,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Gagal menulis permintaan HTTP: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Tidak ada headers, mengasumsikan HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -960,133 +974,133 @@ "Berkas %s sudah ada; tidak diambil.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY data berkas %s hilang: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Menggunakan koneksi yang sudah ada ke [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Menggunakan koneksi yang sudah ada ke %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Gagal membaca balasan proxy: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Status line salah format" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Proxy tunneling gagal: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Skema authentifikasi tidak diketahui.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Skema authentifikasi tidak diketahui.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Simpan ke: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Menonaktifkan SSL karena adanya errors.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "Permintaan %s dikirimkan, menunggu balasan... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Tidak ada data yang diterima.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Read error (%s) dalam headers.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(tidak ada deskripsi)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Lokasi: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "tidak dispesifikasikan" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [mengikuti]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1094,7 +1108,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1104,82 +1118,82 @@ " File sudah secara penuh diterima; tidak ada yang harus dilakukan lagi.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Besar: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "diabaikan" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Peringatan: wildcards tidak disupport dalam HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Mode laba-laba diaktifkan. Check jika berkas tujuan ada.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Tidak dapat menulis ke %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Required attribute missing from Header received.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Username/Password Authentication Failed.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Tidak dapat menulis ke WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Tidak dapat menulis ke WARC.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Tidak dapat membuat koneksi SSL.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Tidak dapat menulis ke %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redireksi (%d) tanpa lokasi.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Berkas tidak ada -- link rusak!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Header yang paling akhir dimodifikasi hilang -- time-stamps dimatikan.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "header yang paling akhir dimodifikasi tidak valid -- time-stamp diabaikan.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1189,16 +1203,16 @@ "diambil.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Besar tidak cocok (local %s) -- diambil.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "File remote lebih baru, diambil.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1208,7 +1222,7 @@ "mengambil.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1216,7 +1230,7 @@ "Berkas tujuan ada tapi tidak berisi sumber lain -- tidak diambil.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1226,7 +1240,7 @@ "recursion dinonaktifkan -- tidak mencoba.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1234,12 +1248,12 @@ "Berkas tujuan ada.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s: URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1248,7 +1262,7 @@ "%s (%s) - disimpan ke stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1257,58 +1271,58 @@ "%s (%s) - %s disimpan [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Hubungan ditutup pada byte %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Read error pada byte %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Unsupported quality of protection '%s'.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Skema tidak didukung '%s'.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Tidak dapat membaca %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Error dalam %s pada baris %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1319,7 +1333,7 @@ "'%s',\n" "or specify a different file using --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1330,75 +1344,75 @@ "'%s',\n" "or specify a different file using --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Tidak valid --execute perintah %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Nomor tidak valid %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Nilai byte tidak valid %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Perioda waktu tidak valid %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Nilai tidak valid %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Header tidak valid %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Header WARC tidak valid %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Tipe progress tidak valid %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1412,16 +1426,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Pengkodean %s tidak valid\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Tidak lengkap atau tidak valid urutan multibyte ditemui\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Errno tidak tertangani %d\n" @@ -1454,12 +1468,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; mematikan logging.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Penggunaan: %s [PILIHAN]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1468,68 +1482,68 @@ "pendek.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Memulai:\n" -#: src/main.c:596 +#: src/main.c:597 #, 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:598 +#: src/main.c:599 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help menampilkan bantuan ini.\n" -#: src/main.c:600 +#: src/main.c:601 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background pergi ke background setelah memulai.\n" -#: src/main.c:602 +#: src/main.c:603 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=COMMAND menjalankan sebuah perintah `.wgetrc'-style.\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Mencatat dan memasukan berkas:\n" -#: src/main.c:608 +#: src/main.c:609 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FILE pesan log pada FILE.\n" -#: src/main.c:610 +#: src/main.c:611 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FILE tambahkan pesan pada FILE.\n" -#: src/main.c:613 +#: src/main.c:614 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug tampilkan banyak informasi debugging.\n" -#: src/main.c:617 +#: src/main.c:618 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug tampilkan keluaran Watt-32 debug.\n" -#: src/main.c:620 +#: src/main.c:621 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet diam (tidak ada output).\n" -#: src/main.c:622 +#: src/main.c:623 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose jadi verbose (ini yang default).\n" -#: src/main.c:624 +#: src/main.c:625 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " @@ -1537,7 +1551,7 @@ msgstr "" " -nv, --no-verbose matikan verboseness, tanpa menjadi quiet.\n" -#: src/main.c:626 +#: src/main.c:627 #, fuzzy msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " @@ -1545,7 +1559,7 @@ msgstr "" " --report-speed=TYPE Output bandwidth as TYPE. TYPE can be bits.\n" -#: src/main.c:628 +#: src/main.c:629 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " @@ -1554,7 +1568,7 @@ " -i, --input-file=BERKAS download URLs ditemukan dalam lokal atau " "BERKAS eksternal.\n" -#: src/main.c:631 +#: src/main.c:632 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1563,12 +1577,12 @@ " -i, --input-file=BERKAS download URLs ditemukan dalam lokal atau " "BERKAS eksternal.\n" -#: src/main.c:634 +#: src/main.c:635 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html perlakukan input file sebagai HTML.\n" -#: src/main.c:636 +#: src/main.c:637 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1577,27 +1591,27 @@ " -B, --base=URL telusuri berkas masukan HTML (-i -F)\n" " relatif ke URL.\n" -#: src/main.c:639 +#: src/main.c:640 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --config=FILE Specify config file to use.\n" -#: src/main.c:641 +#: src/main.c:642 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies jangan menggunakan cookies.\n" -#: src/main.c:643 +#: src/main.c:644 #, 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Download:\n" -#: src/main.c:649 +#: src/main.c:650 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1606,13 +1620,13 @@ " -t, --tries=NUMBER set nomor mencoba ke NUMBER (0 untuk tidak " "terbatas).\n" -#: src/main.c:651 +#: src/main.c:652 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr " --retry-connrefused coba lagi walaupun koneksi ditolak.\n" -#: src/main.c:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1621,12 +1635,12 @@ " --ignore-tags=LIST list yang dipisahkan oleh koma yang " "berisitag HTML yang diabaikan.\n" -#: src/main.c:655 +#: src/main.c:656 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FILE tulis document pada FILE.\n" -#: src/main.c:657 +#: src/main.c:658 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1635,14 +1649,14 @@ " -nc, --no-clobber skip downloads yang akan mendownload ke\n" " file yang sudah ada.\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-cookies jangan menggunakan cookies.\n" -#: src/main.c:662 +#: src/main.c:663 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " @@ -1651,25 +1665,25 @@ " -c, --continue lanjutkan mengambil file yang terdownload " "sebagian.\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYPE pilih tipe gauge progress.\n" -#: src/main.c:668 +#: src/main.c:669 #, fuzzy msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --progress=TYPE pilih tipe gauge progress.\n" -#: src/main.c:670 +#: src/main.c:671 #, fuzzy msgid "" " -N, --timestamping don't re-retrieve files unless newer " @@ -1679,7 +1693,7 @@ " -N, --timestamping jangan mengambil kembali file kecuali file\n" " lebih baru dari file local.\n" -#: src/main.c:673 +#: src/main.c:674 #, fuzzy msgid "" " --no-if-modified-since don't use conditional if-modified-since " @@ -1689,7 +1703,7 @@ " -N, --timestamping jangan mengambil kembali file kecuali file\n" " lebih baru dari file local.\n" -#: src/main.c:676 +#: src/main.c:677 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1698,29 +1712,29 @@ " -N, --timestamping jangan mengambil kembali file kecuali file\n" " lebih baru dari file local.\n" -#: src/main.c:679 +#: src/main.c:680 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response tampilkan balasan server.\n" -#: src/main.c:681 +#: src/main.c:682 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider jangan mendownload apapun.\n" -#: src/main.c:683 +#: src/main.c:684 #, 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1729,29 +1743,29 @@ " --bind-address=ADDRESS bind ke ADDRESS (hostname atau IP) pada " "local host.\n" -#: src/main.c:691 +#: src/main.c:692 #, 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:693 +#: src/main.c:694 #, 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:695 +#: src/main.c:696 #, 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:697 +#: src/main.c:698 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SECONDS tunggu SECONDS diantara pengambilan.\n" -#: src/main.c:699 +#: src/main.c:700 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1760,7 +1774,7 @@ " --waitretry=SECONDS tunggu 1..SECONDS diantara pencobaan dari " "sebuah pengambilan.\n" -#: src/main.c:701 +#: src/main.c:702 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1769,17 +1783,17 @@ " --random-wait tunggu dari 0.5*WAIT...1.5*WAIT secs " "diantara pengambilan.\n" -#: src/main.c:703 +#: src/main.c:704 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy secara eksplisit mematikan proxy.\n" -#: src/main.c:705 +#: src/main.c:706 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=NUMBER set pengambilan quota pada NUMBER.\n" -#: src/main.c:707 +#: src/main.c:708 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1788,17 +1802,17 @@ " --bind-address=ADDRESS bind ke ADDRESS (hostname atau IP) pada " "local host.\n" -#: src/main.c:709 +#: src/main.c:710 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=RATE batasi kecepatan download ke RATE.\n" -#: src/main.c:711 +#: src/main.c:712 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache matikan caching dari DNS lookups.\n" -#: src/main.c:713 +#: src/main.c:714 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1807,7 +1821,7 @@ " --restrict-file-names=OS restrict karakter dalam nama file ke salah " "satu dari yang dibolehkan oleh OS.\n" -#: src/main.c:715 +#: src/main.c:716 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1816,19 +1830,19 @@ " --ignore-case abaikan besar/kecil huruf ketika mencocokan " "files/direktori..\n" -#: src/main.c:718 +#: src/main.c:719 #, 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:720 +#: src/main.c:721 #, 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:722 +#: src/main.c:723 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1839,25 +1853,25 @@ "yang dispesifikasikan,\n" " salah satu dari IPv6, IPv4 atau none.\n" -#: src/main.c:726 +#: src/main.c:727 #, 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:728 +#: src/main.c:729 #, 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:730 +#: src/main.c:731 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --ask-password tanya untuk kata sandi.\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1868,12 +1882,12 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri non-aktifkan dukungan IRI.\n" -#: src/main.c:739 +#: src/main.c:740 #, fuzzy msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" @@ -1881,7 +1895,7 @@ " --local-encoding=ENC gunakan ENC sebagai pengkodean lokal untuk " "IRI.\n" -#: src/main.c:741 +#: src/main.c:742 #, fuzzy msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" @@ -1889,73 +1903,73 @@ " --remote-encoding=ENC gunakan ENC sebagai pengkodean baku " "remote.\n" -#: src/main.c:743 +#: src/main.c:744 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --unlink remove file before clobber.\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 #, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" -msgstr " --no-glob matikan FTP nama file globbing.\n" +msgstr " --warc-cdx write CDX index files.\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Direktori:\n" -#: src/main.c:763 +#: src/main.c:764 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories jangan membuat direktori.\n" -#: src/main.c:765 +#: src/main.c:766 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories paksa pembuatan direktori.\n" -#: src/main.c:767 +#: src/main.c:768 #, 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:769 +#: src/main.c:770 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories gunakan nama protocol dalam direktori.\n" -#: src/main.c:771 +#: src/main.c:772 #, fuzzy msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIX simpan file pada PREFIX/...\n" -#: src/main.c:773 +#: src/main.c:774 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -1964,26 +1978,26 @@ " --cut-dirs=NUMBER abaikan NUMBER remote komponen " "direktori.\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Pilihan HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=USER set http user pada USER.\n" -#: src/main.c:781 +#: src/main.c:782 #, fuzzy msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=PASS set http password pada PASS.\n" -#: src/main.c:783 +#: src/main.c:784 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --nocache dissallow server-cached data.\n" -#: src/main.c:785 +#: src/main.c:786 #, fuzzy msgid "" " --default-page=NAME change the default page name (normally\n" @@ -1992,7 +2006,7 @@ " --default-page=NAMA Ubah nama halaman baku (biasanya\n" " ini `index.html'.).\n" -#: src/main.c:788 +#: src/main.c:789 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -2001,26 +2015,25 @@ " -E, --adjust-extension simpan HTML/CSS dokumen dengan ekstensi yang " "sesuai.\n" -#: src/main.c:790 +#: src/main.c:791 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length abaikan `Content-Length' bagian header.\n" -#: src/main.c:792 +#: src/main.c:793 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=STRING masukkan STRING dalam headers.\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TYPE pilih tipe gauge progress.\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" @@ -2028,17 +2041,17 @@ " --max-redirect batas maksimal yang diperbolehkan untuk " "redirection setiap halaman.\n" -#: src/main.c:800 +#: src/main.c:801 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=USER set USER sebagai username proxy.\n" -#: src/main.c:802 +#: src/main.c:803 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=PASS set PASS sebagai password proxy.\n" -#: src/main.c:804 +#: src/main.c:805 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2047,12 +2060,12 @@ " --referer=URL masukkan `Referer: URL' header dalam HTTP " "request.\n" -#: src/main.c:806 +#: src/main.c:807 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers simpan HTTP headers pada file.\n" -#: src/main.c:808 +#: src/main.c:809 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2061,7 +2074,7 @@ " -U, --user-agent=AGENT identifikasi sebagai AGEN daripada sebagai " "Wget/VERSION.\n" -#: src/main.c:810 +#: src/main.c:811 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2070,25 +2083,25 @@ " --no-http-keep-alive disable HTTP keep-alive (persistent " "koneksi).\n" -#: src/main.c:812 +#: src/main.c:813 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies jangan menggunakan cookies.\n" -#: src/main.c:814 +#: src/main.c:815 #, 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:816 +#: src/main.c:817 #, 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:818 +#: src/main.c:819 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " @@ -2097,7 +2110,7 @@ " --keep-session-cookies load dan simpan session (non-permanen) " "cookies.\n" -#: src/main.c:820 +#: src/main.c:821 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2106,7 +2119,7 @@ " --post-data=STRING gunakan metoda POST; kirim STRING sebagai " "data.\n" -#: src/main.c:822 +#: src/main.c:823 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2114,14 +2127,14 @@ msgstr "" " --post-file=FILE gunakan metoda POST; kirim isi dari FILE.\n" -#: src/main.c:824 +#: src/main.c:825 #, fuzzy msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod use method \"HTTPMethod\" in the header.\n" -#: src/main.c:826 +#: src/main.c:827 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " @@ -2129,7 +2142,7 @@ msgstr "" " --body-data=STRING Send STRING as data. --method MUST be set.\n" -#: src/main.c:828 +#: src/main.c:829 #, fuzzy msgid "" " --body-file=FILE send contents of FILE. --method MUST be " @@ -2137,7 +2150,7 @@ msgstr "" " --body-file=FILE Send contents of FILE. --method MUST be set.\n" -#: src/main.c:830 +#: src/main.c:831 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2149,7 +2162,7 @@ "memilih\n" " berkas lokal (EKSPERIMEN).\n" -#: src/main.c:833 +#: src/main.c:834 #, fuzzy msgid "" " --content-on-error output the received content on server " @@ -2158,7 +2171,7 @@ " --content-on-error output the received content on server " "errors.\n" -#: src/main.c:835 +#: src/main.c:836 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2170,11 +2183,11 @@ "tanpa\n" " harus menunggu untuk ditanyai oleh server.\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Pilihan HTTPS (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2185,46 +2198,46 @@ "auto,\n" " SSLv2, SSLv3, dan TLSv1.\n" -#: src/main.c:847 +#: src/main.c:848 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only ikuti link HTTPS only secure\n" -#: src/main.c:849 +#: src/main.c:850 #, 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:851 +#: src/main.c:852 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FILE client certificate file.\n" -#: src/main.c:853 +#: src/main.c:854 #, 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:855 +#: src/main.c:856 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FILE private key file.\n" -#: src/main.c:857 +#: src/main.c:858 #, 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:859 +#: src/main.c:860 #, 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:861 +#: src/main.c:862 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " @@ -2233,12 +2246,12 @@ " --ca-directory=DIR direktori dimana hash list dari CA's " "disimpan\n" -#: src/main.c:863 +#: src/main.c:864 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=FILE file yang berisi CA's.\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2248,7 +2261,7 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2257,7 +2270,7 @@ " --random-file=FILE file dengan data acak untuk seeding SSL " "PRNG.\n" -#: src/main.c:875 +#: src/main.c:876 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " @@ -2266,7 +2279,7 @@ " --egd-file=FILE penamaan file EGD socket dengan data " "random.\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2276,28 +2289,28 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 #, fuzzy msgid "HSTS options:\n" msgstr "Pilihan HTTP:\n" -#: src/main.c:888 +#: src/main.c:889 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --nocache dissallow server-cached data.\n" -#: src/main.c:890 +#: src/main.c:891 #, fuzzy msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr " -v, --verbose jadi verbose (ini yang default).\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Pilihan FTP:\n" -#: src/main.c:898 +#: src/main.c:899 #, fuzzy msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " @@ -2306,38 +2319,38 @@ " --ftp-stmlf Gunakan format Stream_LF untuk seluruh berkas " "binari FTP.\n" -#: src/main.c:901 +#: src/main.c:902 #, fuzzy msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=USER set ftp user pada USER.\n" -#: src/main.c:903 +#: src/main.c:904 #, fuzzy msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASS set ftp password pada PASS.\n" -#: src/main.c:905 +#: src/main.c:906 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing jangan hapus file `.listing'.\n" -#: src/main.c:907 +#: src/main.c:908 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob matikan FTP nama file globbing.\n" -#: src/main.c:909 +#: src/main.c:910 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp disable the \"passive\" mode trasfer.\n" -#: src/main.c:911 +#: src/main.c:912 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions preserver remote file permissions.\n" -#: src/main.c:913 +#: src/main.c:914 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2346,12 +2359,12 @@ " --retr-symlinks ketika berekursif, ambil linked-to files " "(bukan dir).\n" -#: src/main.c:918 +#: src/main.c:919 #, fuzzy msgid "FTPS options:\n" msgstr "Pilihan FTP:\n" -#: src/main.c:920 +#: src/main.c:921 #, fuzzy msgid "" " --ftps-implicit use implicit FTPS (default port is " @@ -2360,7 +2373,7 @@ " --ftp-stmlf Gunakan format Stream_LF untuk seluruh berkas " "binari FTP.\n" -#: src/main.c:922 +#: src/main.c:923 #, fuzzy msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " @@ -2371,23 +2384,23 @@ "file\n" " lebih baru dari file local.\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Pilihan WARC:\n" -#: src/main.c:933 +#: src/main.c:934 #, fuzzy msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " @@ -2396,26 +2409,26 @@ " --warc-file=FILENAME save request/response data to a .warc.gz " "file.\n" -#: src/main.c:935 +#: src/main.c:936 #, 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:937 +#: src/main.c:938 #, 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:939 +#: src/main.c:940 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx write CDX index files.\n" -#: src/main.c:941 +#: src/main.c:942 #, fuzzy msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " @@ -2424,19 +2437,19 @@ " --warc-dedup=FILENAME do not store records listed in this CDX " "file.\n" -#: src/main.c:944 +#: src/main.c:945 #, 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:947 +#: src/main.c:948 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests do not calculate SHA1 digests.\n" -#: src/main.c:949 +#: src/main.c:950 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2445,7 +2458,7 @@ " --no-warc-keep-log do not store the log file in a WARC " "record.\n" -#: src/main.c:951 +#: src/main.c:952 #, fuzzy msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " @@ -2456,17 +2469,17 @@ "the\n" " WARC writer.\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Recursive download:\n" -#: src/main.c:958 +#: src/main.c:959 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr "" " -r, --recursive spesifikasikan untuk mendownload rekursif.\n" -#: src/main.c:960 +#: src/main.c:961 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2475,7 +2488,7 @@ " -l, --level=NUMBER maksimum kedalaman rekursi (inf atau 0 untuk tak " "terhingga).\n" -#: src/main.c:962 +#: src/main.c:963 #, fuzzy msgid "" " --delete-after delete files locally after downloading " @@ -2483,7 +2496,7 @@ msgstr "" " --delete-after delete files locally sesudah mendownloadnya.\n" -#: src/main.c:964 +#: src/main.c:965 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2494,20 +2507,20 @@ "yang\n" " menunjuk ke berkas lokal.\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 #, 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:973 +#: src/main.c:974 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2516,7 +2529,7 @@ " -K, --backup-converted sebelum mengubah berkas X, backup sebagai X." "orig.\n" -#: src/main.c:976 +#: src/main.c:977 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2524,7 +2537,7 @@ msgstr "" " -K, --backup-converted sebelum mengubah file X, backup sebagai X.orig.\n" -#: src/main.c:979 +#: src/main.c:980 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2533,7 +2546,7 @@ " -m, --mirror shortcut untuk -N -r -l inf --no-remove-" "listing.\n" -#: src/main.c:981 +#: src/main.c:982 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2542,7 +2555,7 @@ " -p, --page-requisites ambil semua gambar, dll. yang diperlukan untuk " "menampilkan file HTML.\n" -#: src/main.c:983 +#: src/main.c:984 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2551,11 +2564,11 @@ " --strict-comments hidupkan strick (SGML) handling dari komentar " "HTML.\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Recursive diterima/ditolak:\n" -#: src/main.c:989 +#: src/main.c:990 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2564,7 +2577,7 @@ " -A, --accept=LIST list yang dipisahkan oleh koma yang " "berisiekstensi yang diterima.\n" -#: src/main.c:991 +#: src/main.c:992 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2573,27 +2586,27 @@ " -R, --reject=LIST list yang dipisahkan oleh koma yang " "berisiekstensi yang ditolak.\n" -#: src/main.c:993 +#: src/main.c:994 #, fuzzy msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr " --accept-regex=REGEX regex matching accepted URLs.\n" -#: src/main.c:995 +#: src/main.c:996 #, fuzzy msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=REGEX regex matching rejected URLs.\n" -#: src/main.c:998 +#: src/main.c:999 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TYPE pilih tipe regex (posix|pcre).\n" -#: src/main.c:1001 +#: src/main.c:1002 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYPE pilih tipe regex (posix).\n" -#: src/main.c:1004 +#: src/main.c:1005 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2601,7 +2614,7 @@ " -D, --domains=LIST list yang dipisahkan oleh koma yang " "berisidomains yang dibolehkan.\n" -#: src/main.c:1006 +#: src/main.c:1007 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" @@ -2609,13 +2622,13 @@ " --exclude-domains=LIST list yang dipisahkan oleh koma yang " "berisidomains yang direject/tolak.\n" -#: src/main.c:1008 +#: src/main.c:1009 #, fuzzy msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr " --follow-ftp ikuti link FTP dari dokumen HTML.\n" -#: src/main.c:1010 +#: src/main.c:1011 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2624,7 +2637,7 @@ " --follow-tags=LIST list yang dipisahkan oleh koma yang " "berisitag HTML yang diikuti\n" -#: src/main.c:1012 +#: src/main.c:1013 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2633,25 +2646,25 @@ " --ignore-tags=LIST list yang dipisahkan oleh koma yang " "berisitag HTML yang diabaikan.\n" -#: src/main.c:1014 +#: src/main.c:1015 #, 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:1016 +#: src/main.c:1017 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative hanya mengikuti links relative saja.\n" -#: src/main.c:1018 +#: src/main.c:1019 #, 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:1020 +#: src/main.c:1021 #, fuzzy msgid "" " --trust-server-names use the name specified by the " @@ -2662,92 +2675,92 @@ "file\n" " lebih baru dari file local.\n" -#: src/main.c:1023 +#: src/main.c:1024 #, 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:1025 +#: src/main.c:1026 #, 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Laporkan bug dan saran kepada .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Kata sandi untuk pengguna %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Kata sandi: " -#: src/main.c:1103 +#: src/main.c:1104 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "cannot create pipe" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Kata sandi untuk pengguna %s: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Lokal: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Kompilasi: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Sambungkan: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2756,29 +2769,29 @@ "GNU Wget %s dibuat di %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (lingkungan)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (pengguna)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, 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:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2793,7 +2806,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2801,37 +2814,37 @@ "\n" "Originalnya ditulis oleh Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "" "Mohon kirimkan laporan kesalahan dan pertanyaan ke .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Memory allocation problem\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Exiting due to error in %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: illegal pilihan -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2840,7 +2853,7 @@ "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, fuzzy, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2849,23 +2862,23 @@ "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2878,7 +2891,7 @@ "dengan -p atau -r. Lihat manual untuk informasi lebih details.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2888,7 +2901,7 @@ "akan diambil akan diletakan dalam sebuah berkas yang anda spesifikasikan.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2898,26 +2911,26 @@ "untuk informasi lebih lengkap.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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:1699 +#: src/main.c:1700 #, 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:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC output does not work with --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, fuzzy, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2925,14 +2938,14 @@ msgstr "" "WARC output does not work with --continue, --continue will be disabled.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, 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:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2940,29 +2953,29 @@ msgstr "" "WARC output does not work with --continue, --continue will be disabled.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Tidak dapat menspesifikasikan baik --ask-password dan --password.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: hilang URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2971,7 +2984,7 @@ "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2980,24 +2993,24 @@ "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Versi ini tidak mendukung untuk IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, 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:2005 +#: src/main.c:2012 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3005,42 +3018,42 @@ msgstr "" "-k can be used together with -O only if outputting to a regular file.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Gagal untuk meng-unlink symlink %s: %s\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: tidak dapat menemukan alamat dari %s\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Tidak ada URLs yang ditemukan dalam %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Tidak dapat menghapus %s: %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3051,7 +3064,7 @@ "Total wall clock time: %s\n" "Terambil: %d berkas, %s dalam %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Download quota dari %s TERLEWATI!\n" @@ -3220,7 +3233,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Melanjutkan di background, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Keluaran akan ditulis ke %s.\n" @@ -3265,64 +3278,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: tidak dapat melihat statistik %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "PERINGATAN: menggunakan nilai random yang lemah.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Tidak dapat seed PRNG; pertimbangkan menggunakan --random-file.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: URL tidak valid %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "Tidak dapat seed PRNG; pertimbangkan menggunakan --random-file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Tidak dapat untuk memverifikasi atoritas penerbit secara lokal.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Selft-signed sertifikat ditemukan.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Sertifikat yang diterbitkan tidak sah.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Sertifikat yang diterbikan telah expired.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3331,7 +3344,7 @@ "%s: nama pengguna sertifikat\n" "\ttidak cocok dengan yang diberikan oleh hostname %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3339,7 +3352,7 @@ " %s: nama pengguna sertifikat %s tidak cocok dengan yang diberikan oleh " "hostname %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3350,7 +3363,7 @@ " Ini mungkin merupakan indikasi bahwa host bukan yang dimaksud\n" " (mungkin ini bukan %s sesungguhnya).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3402,22 +3415,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Menload file robot.txt; tolong hiraukan kesalahan.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Salah dalam parsing proxy URL %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirections exceeded.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3425,7 +3438,7 @@ "Menyerah.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3497,98 +3510,108 @@ msgid "HTTPS support not compiled in" msgstr "dukungan HTTPS tidak dikompilasi dalam versi ini" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Tidak lengkap atau tidak valid urutan multibyte ditemui\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Melanjutkan di background, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Gagal untuk meng-unlink symlink %s: %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Tidak dapat memperoleh cookie untuk %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Tidak dapat memperoleh cookie untuk %s\n" +msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Invalid regular expression %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Invalid regular expression %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Error menulis ke %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Error opening WARC file %s.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Error opening GZIP stream to WARC file.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Tidak dapat menulis ke WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3597,24 +3620,24 @@ "Opening WARC file %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Error opening WARC file %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "CDX file does not list original urls. (Missing column 'a'.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "CDX file does not list checksums. (Missing column 'k'.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "CDX file does not list record ids. (Missing column 'u'.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3629,32 +3652,32 @@ "Loaded %d records from CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Could not read CDX file %s for deduplication.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Tidak dapat menulis ke WARC.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Tidak dapat menulis ke WARC.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Tidak dapat menulis ke WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Could not open CDX file for output.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Tidak dapat menulis ke WARC.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 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" @@ -3664,18 +3687,12 @@ #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: pilihan '--%s' tidak diketahui\n" -#~ msgid "%s: option '-W %s' is ambiguous\n" -#~ msgstr "%s: pilihan '-W %s' adalah sebuah ambigu\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 "File `%s' already there; not retrieving.\n" -#~ msgstr "File `%s' sudah ada disana; tidak diambil.\n" - #~ msgid "idn_decode failed (%d): %s\n" #~ msgstr "idn_decode gagal (%d):%s\n" @@ -3686,6 +3703,9 @@ #~ "\n" #~ "%s diterima.\n" +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "File `%s' sudah ada disana; tidak diambil.\n" + #~ msgid "Authorization failed.\n" #~ msgstr "Authorisasi gagal.\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/it.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/it.gmo differ diff -Nru wget-1.19.5/po/it.po wget-1.20.1/po/it.po --- wget-1.19.5/po/it.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/it.po 2018-12-26 20:10:50.000000000 +0000 @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: wget 1.18.109\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-01-20 16:22+0100\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-19 14:14+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\n" @@ -19,7 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 2.0beta2\n" +"X-Generator: Poedit 2.1.1\n" #: lib/error.c:195 msgid "Unknown system error" @@ -102,29 +102,29 @@ msgstr "Errore sconosciuto" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: l'opzione \"%s\" è ambigua\n" +msgstr "%s: l'opzione \"%s%s\" è ambigua\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: l'opzione \"%s\" è ambigua; possibilità:" +msgstr "%s: l'opzione \"%s%s\" è ambigua; possibilità:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: opzione \"%c%s\" non riconosciuta\n" +msgstr "%s: opzione \"%s%s\" non riconosciuta\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: l'opzione \"%c%s\" non accetta argomenti\n" +msgstr "%s: l'opzione \"%s%s\" non accetta argomenti\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: l'opzione \"%s\" richiede un argomento\n" +msgstr "%s: l'opzione \"%s%s\" richiede un argomento\n" #: lib/getopt.c:621 #, c-format @@ -233,17 +233,17 @@ msgid "Unmatched ) or \\)" msgstr ") o \\) senza corrispondenza" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Nessuna espressione regolare precedente" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "impossibile creare la pipe" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -309,7 +309,7 @@ msgid "failed: %s.\n" msgstr "non riuscito: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: impossibile risolvere l'indirizzo dell'host %s\n" @@ -438,12 +438,12 @@ msgid "Length: %s" msgstr "Lunghezza: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) rimanenti" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s rimanenti" @@ -616,7 +616,7 @@ "Il file o la directory %s non esiste.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s è venuto in esistenza.\n" @@ -639,17 +639,17 @@ msgid "Data transfer aborted.\n" msgstr "Trasferimento dati interrotto.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Il file %s è già presente, non viene scaricato.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(tentativo:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -658,7 +658,7 @@ "%s (%s) - scritto su stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -667,8 +667,8 @@ "%s (%s) - %s salvato [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Rimozione di %s.\n" @@ -768,165 +768,182 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "%s rifiutato.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "%s rifiutato (voce non valida).\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s è escluso/non incluso tramite regex.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Errore nella corrispondenza di %s con %s: %s.\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Nessun corrispondenza con il modello %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Indice in formato HTML scritto in %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Indice in formato HTML scritto in %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERRORE: Impossibile aprire la directory %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERRORE: Impossibile aprire il certificato %s: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "" "Caricato certificato CA \"%s\"\n" "\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Caricato il file CRL \"%s\"\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" +"La versione installata di GnuTLS è troppo vecchia per supportare TLS 1.3\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: valore %d dell'opzione \"secure-protocol\" non implementata\n" +msgstr "GnuTLS: valore %u dell'opzione \"secure-protocol\" non implementata\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Segnalare questo problema a bug-wget@gnu.org\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: impossibile impostare la priorità direttamente. Viene usata la " +"priorità predefinita.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ERRORE" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "AVVERTIMENTO" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: nessun certificato presentato da %s.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: il certificato di %s non è fidato.\n" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, 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" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" +msgstr "%s: il certificato di %s non ha un emittente conosciuto.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Il certificato di %s è stato revocato.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Il certificato di %s è scaduto.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Errore durante l'inizializzazione del certificato X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Nessun certificato trovato\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Errore analizzando il certificato: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Il certificato non è ancora stato attivato\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Il certificato è scaduto\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "La chiave pubblica non corrisponde a quella selezionata.\n" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Il certificato deve essere X.509\n" @@ -966,11 +983,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Scrittura della richiesta HTTP non riuscita: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Nessuna intestazione, si assume HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -979,11 +996,11 @@ "Il file %s è già presente, non viene scaricato.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime non riuscita, potrebbe essere un bug.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -991,55 +1008,55 @@ "Impossibile convertire la marcatura temporale nel formato http. Viene usato " "il tempo 0 come ultima data di modifica.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "File dati %s del BODY mancante: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Riutilizzo della connessione esistente a [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Riutilizzo della connessione esistente a %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Lettura della risposta del proxy non riuscita: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRORE %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Riga di stato malformata" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tunnel proxy non riuscito: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Schema di autenticazione sconosciuto.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Autenticazione selezionata: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Salvataggio in: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1048,21 +1065,21 @@ "Nello scaricare la firma:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Impossibile creare un file temporaneo: scaricamento firma saltato.\n" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Valore pri non valido, viene ipotizzato %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1070,43 +1087,43 @@ "Impossibile trovare un digest valido per le risorse Metalink.\n" "Verranno ignorate.\n" -#: src/http.c:3210 +#: src/http.c:3213 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:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "Richiesta %s inviata, in attesa di risposta... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Nessun dato ricevuto.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Errore di lettura nelle intestazioni (%s).\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(nessuna descrizione)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Posizione: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "non specificato" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [segue]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1115,7 +1132,7 @@ "File %s non modificato sul server, non viene scaricato.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1126,7 +1143,7 @@ "Aggiungere l'opzione --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1136,58 +1153,58 @@ " Il file è già interamente scaricato; niente da fare.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Lunghezza: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignorato" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Attenzione: i metacaratteri non sono supportati in HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Modalità spider abilitata. Controllare se il file remoto esiste.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Impossibile scrivere in %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Manca un attributo richiesto nello header ricevuto.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Autenticazione nome utente/password non riuscita.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Impossibile scrivere nel file WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Impossibile scrivere nel file WARC temporaneo.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Impossibile stabilire una connessione SSL.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Impossibile rimuovere %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERRORE: ridirezione (%d) senza posizione di destinazione.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1195,25 +1212,25 @@ "Impossibile trovare dati Metalink nella risposta HTTP. Il file viene " "scaricato con HTTP GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Trovata intestazione Metalink: attivata la modalità Metalink.\n" # FIXME -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Il file remoto non esiste -- collegamento rotto!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Intestazione Last-modified mancante -- time-stamp disattivati.\n" -#: src/http.c:4542 +#: src/http.c:4550 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:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1221,16 +1238,16 @@ msgstr "" "Il file del server è più vecchio del file locale %s -- non viene scaricato.\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Il file remoto è più recente, scaricamento in corso.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1239,14 +1256,14 @@ "Il file remoto esiste e potrebbe contenere collegamenti ad altre risorse -- " "scaricamento in corso.\n" -#: src/http.c:4613 +#: src/http.c:4621 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:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1255,18 +1272,18 @@ "Il file remoto esiste e potrebbe contenere ulteriori collegamenti,\n" "ma la ricorsione è disabilitata -- non viene scaricato.\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" msgstr "Il file remoto esiste.\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1275,7 +1292,7 @@ "%s (%s) - scritto su stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1284,58 +1301,60 @@ "%s (%s) - %s salvato [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Connessione chiusa al byte %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Errore di lettura al byte %s (%s). " -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Qualità di protezione \"%s\" non gestita.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmo \"%s\" non supportato.\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, 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" +msgstr "" +"%s: WGETRC punta a %s, a cui non è possibile accedere per via dell'errore: " +"%s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: impossibile leggere %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: errore in %s alla riga %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1347,7 +1366,7 @@ "\"%s\"\n" "o specificare un altro file utilizzando --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1358,50 +1377,50 @@ "\"%s\"\n" "o specificare un altro file utilizzando --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: comando %s passato a --execute non valido\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: numero %s non valido.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s può essere usata solo una volta\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: valore di byte %s non valido\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: periodo di tempo %s non valido\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1411,28 +1430,28 @@ "come WGET_ASKPASS o SSH_ASKPASS.\n" "\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: valore %s non valido.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: intestazione %s non valida.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: intestazione WARC %s non valida.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: tipo di avanzamento %s non valido.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1446,16 +1465,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Codifica %s non valida\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Incontrata sequenza multibyte incompleta o non valida\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Codice di errore %d non gestito\n" @@ -1488,12 +1507,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; registrazione disabilitata.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uso: %s [OPZIONI]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1502,69 +1521,69 @@ "corte.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Avvio:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version Visualizza la versione ed esce\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help Stampa questo aiuto\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background Va in background dopo l'avvio\n" -#: src/main.c:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "File di registro e di input:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FILE Registra i messaggi su FILE\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FILE Accoda i messaggi su FILE\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug Stampa le informazioni di debug\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug Stampa le informazioni di debug " "Watt-32\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet Silenzioso (nessun output)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose Prolisso (predefinito)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose Meno prolisso, ma non silenzioso\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1572,7 +1591,7 @@ " --report-speed=TIPO Banda in uscita definita come TIPO\n" " (può essere \"bits\")\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1581,7 +1600,7 @@ "o\n" " esterno\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1590,12 +1609,12 @@ "metalink\n" " locale o esterno\n" -#: src/main.c:634 +#: src/main.c:635 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:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1604,29 +1623,29 @@ "di\n" " input (-i -F) come relativi all'URL\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FILE Specifica il file di configurazione da\n" " usare\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" " --no-config Non legge alcun file di configurazione\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Scaricamento:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1634,28 +1653,27 @@ " -t, --tries=NUMERO Imposta il NUMERO di tentativi\n" " (0 = illimitati)\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused Riprova anche se la connessione è\n" " rifiutata\n" -#: src/main.c:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=ELENCO Elenco separato da virgole di tag HTML " -"che\n" -" vengono ignorati\n" +" --retry-on-http-error=ERR Elenco separato da virgole di errori " +"HTTP da\n" +" riprovare\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=FILE Scrive i documenti su FILE\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1663,15 +1681,15 @@ " -nc, --no-clobber Non avvia lo scaricamento di file già\n" " esistenti (soprascrivendoli)\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -" --no-config Non legge alcun file di configurazione\n" +" --no-netrc Non ottiene le credenziali dal file ." +"netrc\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1680,7 +1698,7 @@ "parzialmente\n" " scaricato\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1688,13 +1706,13 @@ " --start-pos=OFFSET Avvia lo scaricamento alla posizione a\n" " base zero OFFSET\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TIPO Sceglie il TIPO di misurazione\n" " dell'avanzamento\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1702,7 +1720,7 @@ " --show-progress Visualizza la barra di avanzamento in\n" " qualsiasi modo prolisso\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1711,7 +1729,7 @@ " -N, --timestamping Non scarica file più vecchi di quelli\n" " locali\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1721,7 +1739,7 @@ "nella\n" " modalità timestamping\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1730,20 +1748,20 @@ "con\n" " quello del server\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response Stampa la risposta del server\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider Non scarica niente\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1752,7 +1770,7 @@ " (separati da virgole)\n" "\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1760,32 +1778,32 @@ " --bind-dns-address=INDIRIZZO Lega il risolutore DNS a INDIRIZZO\n" " (nome host o IP) all'host locale\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SECONDI Aspetta SECONDI tra i vari " "scaricamenti\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1793,7 +1811,7 @@ " --waitretry=SECONDI Aspetta 1...SECONDI tra i tentativi di\n" " scaricamento\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1802,19 +1820,19 @@ "secondi\n" " tra gli scaricamenti\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy Disattiva esplicitamente l'uso del " "proxy\n" -#: src/main.c:705 +#: src/main.c:706 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:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1823,19 +1841,19 @@ "all'host\n" " locale\n" -#: src/main.c:709 +#: src/main.c:710 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:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache Disattiva la cache di risoluzione del " "DNS\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1845,7 +1863,7 @@ "SO\n" " indicato\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1853,17 +1871,17 @@ " --ignore-case Ignora maiuscole/minuscole in file e\n" " directory\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" " -4, --inet4-only Si connette solo a indirizzi IPv4\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" " -6, --inet6-only Si connette solo a indirizzi IPv6\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1873,24 +1891,24 @@ " FAMIGLIA specificata (IPv6, IPv4 o " "none)\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password Chiede la password\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1910,30 +1928,30 @@ "WGET_ASKPASS\n" " o SSH_ASKPASS\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri Disattiva la gestione di IRI\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink Rimuove il file prima di sovrascrivere\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1942,7 +1960,7 @@ " controllo non corrisponde\n" " (appende .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1951,7 +1969,7 @@ "Metalink\n" " application/metalink4+xml\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1960,7 +1978,7 @@ "intestazioni\n" " nella risposta HTTP\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1968,42 +1986,43 @@ " --preferred-location Posizione preferita per le risorse\n" " Metalink\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr Disabilita l'archiviazione dei " "metadati\n" " negli attributi estesi del file\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Directory:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories Non crea directory\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories Forza la creazione di directory\n" -#: src/main.c:767 +#: src/main.c:768 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:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories Usa il nome del protocollo nelle " "directory\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFISSO Salva i file in PREFISSO/...\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -2012,26 +2031,26 @@ "directory\n" " remote\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Opzioni HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=UTENTE Imposta l'utente http a UTENTE\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-passwd=PASSWORD Imposta la password http a PASSWORD\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache Non permette la cache dei dati lato\n" " server\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2040,7 +2059,7 @@ "predefinita\n" " (solitamente \"index.html\")\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2048,47 +2067,47 @@ " -E, --adjust-extension Salva i documenti HTML/CSS con\n" " l'estensione corretta\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length Ignora il campo Content-Length nelle\n" " intestazioni\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=STRINGA Inserisce STRINGA tra le intestazioni\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=TIPO Sceglie il TIPO di misurazione\n" -" dell'avanzamento\n" +" --compression=TIPO Sceglie la compressione, uno tra auto, " +"gzip\n" +" e none (predefinito: none)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect Numero massimo di ridirezioni per " "pagina\n" -#: src/main.c:800 +#: src/main.c:801 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:802 +#: src/main.c:803 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:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2097,12 +2116,12 @@ "\"\n" " nella richiesta HTTP\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers Salva le intestazioni HTTP su file\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2111,7 +2130,7 @@ "come\n" " Wget/VERSIONE\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2120,24 +2139,24 @@ "(connessioni\n" " persistenti)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies Non usa i cookie\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2146,7 +2165,7 @@ "sessione\n" " (non permanenti)\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2155,7 +2174,7 @@ "come\n" " dati\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2164,13 +2183,13 @@ "del\n" " FILE\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=METODOHTTP Usa METODOHTTP nell'intestazione\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2178,7 +2197,7 @@ " --body-data=STRINGA Invia STRINGA come dati, --method deve\n" " essere impostato\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2187,7 +2206,7 @@ "deve\n" " essere impostato\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2200,7 +2219,7 @@ "locali\n" " (SPERIMENTALE)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2208,7 +2227,7 @@ " --content-on-error Mostra i contenuti ricevuti quando si\n" " verificano errori lato server\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2221,56 +2240,55 @@ "richiesta\n" " dal server\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opzioni HTTPS (SSL/TLS):\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" " --secure-protocol=PROT Sceglie il protocollo sicuro; uno tra\n" -" auto, SSLv2, SSLv3, TLSv1 e PFS\n" +" SSLv3, TLSv1, TLSv1_1, TLSv1_2 e PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only Segue solo i collegamenti HTTPS sicuri\n" -#: src/main.c:849 +#: src/main.c:850 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:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FILE File certificato del client\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FILE File della chiave privata\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 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:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2279,11 +2297,11 @@ "delle\n" " Autorità di Certificazione (CA)\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FILE File con il bundle dei CRL\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2299,7 +2317,7 @@ " separati da \";\" per verificare i " "nodi\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2308,7 +2326,7 @@ "inizializzare\n" " SSL PRNG\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2316,7 +2334,7 @@ " --egd-file=FILE File col nome del socket EGD con dati\n" " casuali\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2325,16 +2343,25 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=STR Imposta la stringa di priorità (GnuTLS) " +"o\n" +" l'elenco di cifrari (OpenSSL). " +"Utilizzare\n" +" con attenzione: questa opzione scavala\n" +" l'opzione --secure-protocol.\n" +" Il formato e la sintassi della stringa\n" +" dipendono dal motore SSL/TLS " +"utilizzato.\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "Opzioni HSTS:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts Disabilita HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2342,11 +2369,11 @@ " --hsts-file Percorso al database HSTS\n" " (soprascrive quello predefinito)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Opzioni FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2355,26 +2382,26 @@ "FTP\n" " binari\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=UTENTE Imposta l'utente ftp a UTENTE\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASS Imposta la password ftp a PASS\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing Non elimina i file \".listing\"\n" -#: src/main.c:907 +#: src/main.c:908 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:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" @@ -2382,12 +2409,12 @@ "trasferimento\n" " passiva\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions Preserva i permessi remoti dei file\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2397,11 +2424,11 @@ " dai collegamenti simbolici quando in\n" " modalità ricorsiva\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "Opzioni FTP:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2409,7 +2436,7 @@ " --ftps-implicit Usa FTPS implicito\n" " (porta predefinita a 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2419,7 +2446,7 @@ " nella connessione di controllo quando\n" " viene aperta una connessione dati\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2428,7 +2455,7 @@ "controllo,\n" " tutti i dati saranno in chiaro\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2436,11 +2463,11 @@ " --ftps-fallback-to-ftp Usa FTP se FTPS non è supportato dal\n" " server\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Opzioni WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2449,24 +2476,24 @@ "file\n" " .warc.gz\n" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=STRINGA Inserisce STRINGA nel record warcinfo\n" -#: src/main.c:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx Scrive file indice CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2475,17 +2502,17 @@ "file\n" " CDX specificato\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests Non calcola i digest SHA1\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2493,7 +2520,7 @@ " --no-warc-keep-log Non archivia il file di registro in un\n" " record WARC\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2503,15 +2530,15 @@ "creati\n" " dal processo di scrittura WARC\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Scaricamento ricorsivo:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive Scaricamento ricorsivo\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2519,7 +2546,7 @@ " -l, --level=NUMERO Profondità massima di ricorsione\n" " (inf o 0 = illimitata)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2527,7 +2554,7 @@ " --delete-after Elimina localmente i file dopo averli\n" " scaricati\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2537,7 +2564,7 @@ "CSS a\n" " file locali\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2545,7 +2572,7 @@ " --convert-file-only Converte solo la parte del file degli\n" " URL (nota anche come basename)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2553,7 +2580,7 @@ " --backups=N Prima di salvare il file X, torna a N\n" " backup precedenti\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2561,7 +2588,7 @@ " -K, --backup-converted Salva il file X come X_orig prima di\n" " convertirlo\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2569,7 +2596,7 @@ " -K, --backup-converted Salva il file X come X.orig prima di\n" " convertirlo\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2577,7 +2604,7 @@ " -m, --mirror Scorciatoia per:\n" " -N -r -l inf --no-remove-listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2586,7 +2613,7 @@ " necessarie per visualizzare la pagina " "HTML\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2595,11 +2622,11 @@ "strict\n" " (SGML)\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Accetto/Rifiuto ricorsivo:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2608,7 +2635,7 @@ "estensioni\n" " accettate\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2617,51 +2644,51 @@ "estensioni\n" " rifiutate\n" -#: src/main.c:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 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:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TIPO Tipo di espressione regolare (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 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:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2670,7 +2697,7 @@ "che\n" " vengono seguiti\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2679,23 +2706,23 @@ "che\n" " vengono ignorati\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative Segue solo i collegamenti relativi\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=ELENCO Elenco di directory consentite\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2704,93 +2731,95 @@ " --trust-server-names Usa il nome indicato dall'ultimo\n" " componente dell'URL di re-direzione\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=ELENCO Elenco di directory non consentite\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" -msgstr "Inviare segnalazioni di bug e suggerimenti a \n" +msgstr "" +"Inviare segnalazioni di bug, domande e discussioni a \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"oppure segnalare un bug presso https://savannah.gnu.org/bugs/?" +"func=additem&group=wget.\n" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Password per l'utente %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Password: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Impossibile creare la pipe\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Nome utente per \"%s%s\": " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Password per \"%s%s@%s\": " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Locale: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Compilazione: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Collegamento: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2799,29 +2828,29 @@ "GNU Wget %s compilato su %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (utente)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2835,7 +2864,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2843,36 +2872,36 @@ "\n" "Scritto da Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "Inviare segnalazioni di bug e suggerimenti a .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Problema di allocazione di memoria\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Uscita causata dall'errore in %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Usare \"%s --help\" per ulteriori opzioni.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opzione illecita -- \"-n%c\"\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2881,7 +2910,7 @@ "Specificati sia --no-clobber che --convert-links, solo --convert-links verrà " "usato.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2890,23 +2919,23 @@ "Specificati sia --no-clobber che --convert-links, solo --convert-file-only " "verrà usato.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2921,7 +2950,7 @@ "\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2931,7 +2960,7 @@ "verrà messo nel singolo file specificato.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2941,7 +2970,7 @@ "O.\n" "Consultare il manuale per maggiori dettagli.\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2949,7 +2978,7 @@ "L'output WARC non funziona con --no-clobber: --no-clobber verrà " "disabilitata.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2957,12 +2986,12 @@ "L'output WARC non funziona con la registrazione delle date: verrà " "disabilitata.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "L'output WARC non funziona con --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2971,7 +3000,7 @@ "L'output WARC non funziona con --continue o --start-pos: verranno " "disabilitati.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2979,21 +3008,21 @@ "I digest sono disabilitati: la de-duplicazione WARC non rileverà record " "duplicati.\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"L'output WARC non funziona con --continue o --start-pos: verranno " +"La compressione non funziona con --continue o --start-pos: verranno " "disabilitati.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Impossibile specificare --ask-password e --password simultaneamente.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3002,17 +3031,17 @@ "Specificare sia --start-pos che --continue non è consigliato: --continue " "verrà disabilitato.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL mancante\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3021,7 +3050,7 @@ "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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3030,24 +3059,24 @@ "È necessario specificare attraverso --method=HTTPMethod un metodo da " "utilizzare con --body-data o --body-file.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Questa versione non gestisce gli IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, 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:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3056,48 +3085,48 @@ "--convert-links o --convert-file-only possono essere usati assieme solo in " "scrittura su un file regolare.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "" "Inizializzazione di libcares non riuscita\n" "\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Inizializzazione del canale c-ares non riuscita\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" "Analisi dell'indirizzo IP \"%s\" non riuscita\n" "\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Nessun URL trovato in %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Impossibile analizzare il file metalink %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3108,7 +3137,7 @@ "Tempo totale: %s\n" "Scaricati: %d file, %s in %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Quota di scaricamento di %s SUPERATA!\n" @@ -3284,7 +3313,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Prosecuzione in background, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "L'output sarà scritto su %s.\n" @@ -3331,69 +3360,68 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: stat di %s non riuscita: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "ATTENZIONE: si sta usando un seme casuale debole.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Impossibile inizializzare PRNG; considerare l'utilizzo di --random-file.\n" -#: src/openssl.c:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -"La versione installata di OpenSSL è troppo vecchia per supportare TLSv1.1\n" +"La versione installata di OpenSSL è troppo vecchia per supportare TLS 1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: URL non valido %s: %s\n" +msgstr "OpenSSL: elenco cifrari non valido: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "" -"Impossibile inizializzare PRNG; considerare l'utilizzo di --random-file.\n" +"Attenzione: impossibile inizializzare PRNG; considerare l'utilizzo di --" +"random-file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Impossibile verificare localmente l'autorità dell'emittente.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Trovato certificato auto-firmato.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Il certificato rilasciato non è ancora valido.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Il certificato rilasciato è scaduto.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3402,7 +3430,7 @@ "%s: nessuno dei nomi alternativi indicati nel certificato corresponde al\n" " nome dell'host richiesto %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3410,7 +3438,7 @@ " %s: il nome comune di certificato %s non corrisponde al nome dell'host\n" " richiesto %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3422,7 +3450,7 @@ " Questo può indicare che l'host non è chi si dichiara di essere\n" " (cioè non è il vero %s).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3481,22 +3509,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Caricamento di robots.txt; ignorare eventuali errori.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Errore analizzando l'URL del proxy %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "superate %d ridirezioni.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3504,7 +3532,7 @@ "Rinuncio.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3573,107 +3601,109 @@ msgid "HTTPS support not compiled in" msgstr "Gestione di HTTPS non compilata" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "Incontrata sequenza multibyte incompleta o non valida\n" +msgstr "Incontrata sequenza multibyte non convertibile\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Prosecuzione in background, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Rimozione del collegamento simbolico %s non riuscita: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "" -"Inizializzazione di libcares non riuscita\n" -"\n" +msgstr "Esecuzione di Fopen su %s non riuscita\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "" -"Impossibile impostare i permessi per %s.\n" -"\n" +msgstr "Recupero FD del file %s non riuscito\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "" -"Impossibile impostare i permessi per %s.\n" -"\n" +msgstr "Esecuzione di stat sul file %s non riuscita, controllare i permessi\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Il file %s è stato modificato dall'ultimo controllo. Controllo di sicurezza " +"non riuscito." -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "" -"Analisi dell'indirizzo IP \"%s\" non riuscita\n" -"\n" +msgstr "Apertura del file %s non riuscita, motivo: %s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "" -"Impossibile impostare i permessi per %s.\n" -"\n" +msgstr "Esecuzione di stat sul file %s non riuscita, errore: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"Tentativo di apertura del file %s, ma è stato modificato dall'ultimo " +"controllo. Controllo di sicurezza non riuscito." + +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Espressione regolare %s non valida, errore PCRE2 %d\n" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Espressione regolare %s non valida, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Errore cercando la corrispondenza %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "Chiave con dimensione errata saltata (%d/%d): %s\n" + +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Errore nel duplicare il descrittore file del file WARC.\n" -#: src/warc.c:223 +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Errore nell'aprire lo stream GZIP verso il file WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Errore nello scrivere il record warcinfo sul file WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3682,24 +3712,24 @@ "Apertura file WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Errore nell'aprire il file WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Il file CDX non riporta gli URL originali (colonna \"a\" mancante).\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Il file CDX non riporta i checksum (colonna \"k\" mancante).\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "Il file CDX non riporta gli ID dei record (colonna \"u\" mancante).\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3710,32 +3740,32 @@ msgstr[0] "Caricato %d record da CDX.\n" msgstr[1] "Caricati %d record da CDX.\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Impossibile leggere il file CDX %s per de-duplicazione.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Impossibile aprire il file manifest WARC temporaneo.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Impossibile aprire il file di registro WARC temporaneo.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Impossibile aprire il file WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Impossibile aprire il file CDX per l'output.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Impossibile aprire il file WARC temporaneo.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 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" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/ja.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/ja.gmo differ diff -Nru wget-1.19.5/po/ja.po wget-1.20.1/po/ja.po --- wget-1.19.5/po/ja.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/ja.po 2018-12-26 20:10:50.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) 1998 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Originally translated by Penguin Kun , 1998 -# Hiroshi Takekawa , 2000-2017 +# Hiroshi Takekawa , 2000-2018 # msgid "" msgstr "" -"Project-Id-Version: wget 1.18.109\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-01-18 19:20+0900\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-14 19:17+0900\n" "Last-Translator: Hiroshi Takekawa \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -100,29 +100,29 @@ msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ã§ã™" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: オプション '%s' ã¯æ›–昧ã§ã™\n" +msgstr "%s: オプション '%s%s' ã¯æ›–昧ã§ã™\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: オプション '%s' ã¯æ›–昧ã§ã™ã€‚é¸æŠžè‚¢ã¯æ¬¡ã®é€šã‚Šã§ã™:" +msgstr "%s: オプション '%s%s' ã¯æ›–昧ã§ã™ã€‚é¸æŠžè‚¢ã¯æ¬¡ã®é€šã‚Šã§ã™:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: '%c%s' ã¯èªè­˜ã§ããªã„オプションã§ã™\n" +msgstr "%s: '%s%s' ã¯èªè­˜ã§ããªã„オプションã§ã™\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: オプション '%c%s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã›ã‚“\n" +msgstr "%s: オプション '%s%s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã›ã‚“\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: オプション '--%s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã™\n" +msgstr "%s: オプション '%s%s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã™\n" #: lib/getopt.c:621 #, c-format @@ -231,17 +231,17 @@ msgid "Unmatched ) or \\)" msgstr "マッãƒã—ãªã„ ) ã‚„ \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "ã“れよりå‰ã«æ­£è¦è¡¨ç¾ã¯ã‚ã‚Šã¾ã›ã‚“" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "パイプãŒä½œæˆã§ãã¾ã›ã‚“" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -307,7 +307,7 @@ msgid "failed: %s.\n" msgstr "失敗ã—ã¾ã—ãŸ: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: ホストアドレス %s を解決ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" @@ -432,12 +432,12 @@ msgid "Length: %s" msgstr "é•·ã•: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) 残ã£ã¦ã„ã¾ã™" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s 残ã£ã¦ã„ã¾ã™" @@ -606,7 +606,7 @@ "%s ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã¾ãŸã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯ã‚ã‚Šã¾ã›ã‚“。\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s ãŒå­˜åœ¨ã—ã¦ã„ã¾ã™ã€‚\n" @@ -629,17 +629,17 @@ msgid "Data transfer aborted.\n" msgstr "データ転é€ã‚’中断ã—ã¾ã—ãŸã€‚\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "ファイル %s ã¯ã™ã§ã«å­˜åœ¨ã™ã‚‹ã®ã§ã€å–å¾—ã—ã¾ã›ã‚“。\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(試行:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -648,7 +648,7 @@ "%s (%s) - stdout ã¸å‡ºåŠ›ã—ã¾ã—㟠%s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -657,8 +657,8 @@ "%s (%s) - %s ã¸ä¿å­˜çµ‚了 [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "%s を削除ã—ã¾ã—ãŸã€‚\n" @@ -758,160 +758,174 @@ msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "除外ã•ã‚Œã¦ã„ã‚‹ã‹å«ã¾ã‚Œã¦ã„ãªã„ã®ã§ %s ã«ç§»å‹•ã—ã¾ã›ã‚“。\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "%s を除外ã—ã¾ã™ã€‚\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "%s を除外ã—ã¾ã™ (ä¸æ­£ãªã‚¨ãƒ³ãƒˆãƒª)。\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s ã¯æ­£è¦è¡¨ç¾ã«ã‚ˆã‚Šé™¤å¤–ã•ã‚Œã¦ã„ã‚‹ã‹å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“。\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "%s 㯠%s ã«å¯¾ã—ã¦ãƒžãƒƒãƒã—ã¾ã›ã‚“ã§ã—ãŸ: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "パターン %s ã«é©åˆã™ã‚‹ã‚‚ã®ãŒã‚ã‚Šã¾ã›ã‚“。\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "%s [%s]ã«HTML化ã•ã‚ŒãŸã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’書ãã¾ã—ãŸã€‚\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "%s ã«HTML化ã•ã‚ŒãŸã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’書ãã¾ã—ãŸã€‚\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "エラー：%s ã¨ã„ã†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’é–‹ã‘ã¾ã›ã‚“。\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "エラー：%s ã¨ã„ã†è¨¼æ˜Žæ›¸ã‚’é–‹ã‘ã¾ã›ã‚“: (%d)\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "CA証明書 '%s' をロードã—ã¾ã—ãŸ\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "エラー：%s ã¨ã„ã†CRLファイルを開ã‘ã¾ã›ã‚“: (%d)\n" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "CRL ファイル '%s' をロードã—ã¾ã—ãŸ\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "エラー: GnuTLS ã¯éµã¨è¨¼æ˜Žæ›¸ã®ã‚¿ã‚¤ãƒ—ãŒåŒã˜ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n" -#: src/gnutls.c:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "GnuTLS ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã™ãŽã¦ TLSv1.3 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: 実装ã•ã‚Œã¦ã„ãªã„ 'secure-protocol' オプション値 %d\n" +msgstr "GnuTLS: 実装ã•ã‚Œã¦ã„ãªã„ 'secure-protocol' オプション値 %u\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "ã“ã®å•é¡Œã‚’ bug-wget@gnu.org ã«å ±å‘Šã—ã¦ãã ã•ã„\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: 実装ã•ã‚Œã¦ã„ãªã„ 'secure-protocol' オプション値 %d\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" -msgstr "" +msgstr "GnuTLS: 優先度を設定ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚デフォルトã®å„ªå…ˆåº¦ã«ã—ã¾ã™ã€‚\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "エラー" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "警告" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s ã‹ã‚‰è¨¼æ˜Žæ›¸ã®æ示ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸ\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã¯ä¿¡ç”¨ã•ã‚Œã¾ã›ã‚“。\n" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã®ç™ºè¡Œè€…ãŒä¸æ˜Žã§ã™ã€‚\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã¯å¤±åŠ¹ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã«ç½²åã—ã¦ã„ã‚‹ã®ãŒ CA ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" "%s: %s ã®è¨¼æ˜Žæ›¸ã®ç½²åã«ä½¿ã‚ã‚Œã¦ã„るアルゴリズムãŒå®‰å…¨ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã¯ã¾ã æœ‰åŠ¹ã«ãªã£ã¦ã„ã¾ã›ã‚“。\n" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã¯å¤±åŠ¹ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "X509 証明書ã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "証明書ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "証明書を解釈中ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "証明書ã¯ã¾ã æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "証明書ã¯å¤±åŠ¹ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "証明書ã®æ‰€æœ‰è€…ã®åå‰ã¨ãƒ›ã‚¹ãƒˆå %s ãŒä¸€è‡´ã—ã¾ã›ã‚“\n" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "公開éµãŒå›ºå®šã—ãŸå…¬é–‹éµã¨ä¸€è‡´ã—ã¾ã›ã‚“!\n" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "証明書㯠X.509 å½¢å¼ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“\n" @@ -951,11 +965,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "HTTP ã«ã‚ˆã‚‹æŽ¥ç¶šè¦æ±‚ã®é€ä¿¡ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "ヘッダãŒãªã„ã®ã§ã€HTTP/0.9 ã ã¨ä»®å®šã—ã¾ã™" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -964,11 +978,11 @@ "ファイル %s ã¯ã™ã§ã«å­˜åœ¨ã™ã‚‹ã®ã§ã€å–å¾—ã—ã¾ã›ã‚“。\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚ãŠãらããƒã‚°ã§ã™ã€‚\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -976,55 +990,55 @@ "タイムスタンプを http å½¢å¼ã«å¤‰æ›ã§ãã¾ã›ã‚“。0 を最終変更時間ã¨ã—ã¦ä½¿ã„ã¾" "ã™ã€‚\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY データファイル %s ãŒã‚ã‚Šã¾ã›ã‚“: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "[%s]:%d ã¸ã®æŽ¥ç¶šã‚’å†åˆ©ç”¨ã—ã¾ã™ã€‚\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "%s:%d ã¸ã®æŽ¥ç¶šã‚’å†åˆ©ç”¨ã—ã¾ã™ã€‚\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "プロクシã‹ã‚‰ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s エラー %d: %s。\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "奇妙ãªã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹è¡Œã§ã™" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "プロクシã®ãƒˆãƒ³ãƒãƒªãƒ³ã‚°ã«å¤±æ•—ã—ã¾ã—ãŸ: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "ä¸æ˜Žãªèªè¨¼å½¢å¼ã§ã™ã€‚\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "é¸æŠžã•ã‚ŒãŸèªè¨¼å½¢å¼: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "%s ã«ä¿å­˜ä¸­\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1033,20 +1047,20 @@ "ç½²åをダウンロード中ã«:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "一時ファイルã‹ã‚‰ç½²å情報ãŒèª­ã‚ã¾ã›ã‚“。飛ã°ã—ã¾ã™ã€‚\n" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "一時ファイルãŒä½œã‚Œã¾ã›ã‚“。署åã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã‚’飛ã°ã—ã¾ã™ã€‚\n" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "無効㪠pri 値ã§ã™ã€‚%d を用ã„ã¾ã™ã€‚\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1054,42 +1068,42 @@ "メタリンクリソースã«å¯¾ã—ã¦è¨±å®¹ã§ãるダイジェストãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚\n" "無視ã—ã¾ã™ã€‚\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "エラーãŒç™ºç”Ÿã—ãŸã®ã§ SSL を無効ã«ã—ã¾ã™\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s ã«ã‚ˆã‚‹æŽ¥ç¶šè¦æ±‚ã‚’é€ä¿¡ã—ã¾ã—ãŸã€å¿œç­”ã‚’å¾…ã£ã¦ã„ã¾ã™... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "データãŒå—ä¿¡ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "ヘッダ内ã§èª­ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼(%s)ã§ã™\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(説明ãªã—)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "場所: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "特定ã§ãã¾ã›ã‚“" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [続ã]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1099,7 +1113,7 @@ "ã™ã€‚\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1110,7 +1124,7 @@ "--no-if-modified-since オプションを付ã‘ã‚‹ã¨ã„ã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1120,59 +1134,59 @@ " ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«å…¨éƒ¨å–å¾—ã—ãŠã‚ã£ã¦ã„ã¾ã™ã€‚何もã™ã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "é•·ã•: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "無視ã—ã¾ã—ãŸ" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "警告: HTTPã¯ãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰ã«å¯¾å¿œã—ã¦ã„ã¾ã›ã‚“。\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "スパイダーモードãŒæœ‰åŠ¹ã§ã™ã€‚リモートファイルãŒå­˜åœ¨ã—ã¦ã‚‹ã‹ç¢ºèªã—ã¾ã™ã€‚\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "%s ã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“(%s)。\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "å¿…è¦ãªã‚¢ãƒˆãƒªãƒ“ュートãŒå—ã‘ã¨ã£ãŸãƒ˜ãƒƒãƒ€ã«ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Username/Password ã«ã‚ˆã‚‹èªè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "WARC ファイルã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“。\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "一時 WARC ファイルã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“。\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "SSL ã«ã‚ˆã‚‹æŽ¥ç¶šãŒç¢ºç«‹ã§ãã¾ã›ã‚“。\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s を削除ã§ãã¾ã›ã‚“(%s)。\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "エラー: 場所ãŒå­˜åœ¨ã—ãªã„リダイレクション(%d)ã§ã™ã€‚\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1180,23 +1194,23 @@ "HTTP 応答ã«ãƒ¡ã‚¿ãƒªãƒ³ã‚¯æƒ…å ±ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚HTTP GET ã§ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—ã¾" "ã™ã€‚\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "メタリンクヘッダãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚メタリンクモードã«å¤‰æ›´ã—ã¾ã™ã€‚\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "リモートファイルãŒå­˜åœ¨ã—ã¦ã„ã¾ã›ã‚“ -- リンクãŒå£Šã‚Œã¦ã„ã¾ã™!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified ヘッダãŒã‚ã‚Šã¾ã›ã‚“ -- 日付を無効ã«ã—ã¾ã™ã€‚\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified ヘッダãŒç„¡åŠ¹ã§ã™ -- 日付を無視ã—ã¾ã™ã€‚\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1205,16 +1219,16 @@ "サーãƒå´ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚ˆã‚Šãƒ­ãƒ¼ã‚«ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ« %s ã®æ–¹ãŒæ–°ã—ã„ã®ã§å–å¾—ã—ã¾ã›ã‚“。\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "大ãã•ãŒåˆã‚ãªã„ã®ã§(ローカル㯠%s)ã€è»¢é€ã—ã¾ã™ã€‚\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "リモートファイルã®ã»ã†ãŒæ–°ã—ã„ã®ã§ã€è»¢é€ã—ã¾ã™ã€‚\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1224,7 +1238,7 @@ "中。\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1233,7 +1247,7 @@ "ん。\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1243,18 +1257,18 @@ "ã™ -- å–å¾—ã—ã¾ã›ã‚“。\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" msgstr "リモートファイルãŒå­˜åœ¨ã—ã¾ã™ã€‚\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1263,7 +1277,7 @@ "%s (%s) - stdout ã¸å‡ºåŠ›å®Œäº† %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1272,58 +1286,58 @@ "%s (%s) - %s ã¸ä¿å­˜å®Œäº† [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - %s ãƒã‚¤ãƒˆã§æŽ¥ç¶šãŒçµ‚了ã—ã¾ã—ãŸã€‚ " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - %s ãƒã‚¤ãƒˆã§èª­ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(%s)。" -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - %s/%s ãƒã‚¤ãƒˆã§èª­ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(%s)。 " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "'%s' ã¨ã„ã†ä¿è­·æ–¹å¼ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "'%s' ã¨ã„ã†ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" -msgstr "%s: WGETRC ㌠%s を指ã—ã¦ã„ã¾ã™ãŒ, 存在ã—ã¾ã›ã‚“。\n" +msgstr "%s: WGETRC ㌠%s を指ã—ã¦ã„ã¾ã™ãŒ, 存在ã—ã¾ã›ã‚“: %s\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s (%s)を読ã¿è¾¼ã‚ã¾ã›ã‚“。\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: %s 内㮠%d è¡Œã§ã‚¨ãƒ©ãƒ¼ã§ã™\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: %s 内㮠%d è¡Œã§æ–‡æ³•ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ\n" -#: src/init.c:713 +#: src/init.c:706 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: コマンド %s (%s ã® %d行目) ã¯ä¸æ˜Žã§ã™\n" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1334,7 +1348,7 @@ "'%s'\n" "ã®å†…容を確èªã™ã‚‹ã‹ --config ã§åˆ¥ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã—ã¦ãã ã•ã„。\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1345,49 +1359,49 @@ "'%s'\n" "ã®å†…容を確èªã™ã‚‹ã‹ --config ã§åˆ¥ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã—ã¦ãã ã•ã„。\n" -#: src/init.c:783 +#: src/init.c:776 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: 警告: システムã¨ãƒ¦ãƒ¼ã‚¶ã® wgetrc ã®ä¸¡æ–¹ãŒ %s を指定ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/init.c:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: 無効㪠--execute 指定 %s ã§ã™ã€‚\n" -#: src/init.c:1043 +#: src/init.c:1037 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" "%s: %s: %s ã¯ãƒ–ール値ã¨ã—ã¦ç„¡åŠ¹ã§ã™ã€‚`on' ã‹ `off' を指定ã—ã¦ãã ã•ã„。\n" -#: src/init.c:1076 +#: src/init.c:1070 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" "%s: %s: %s ã¯ç„¡åŠ¹ã§ã™ã€‚`on'ã€`off'ã€`quiet' ã®ã„ãšã‚Œã‹ã‚’指定ã—ã¦ãã ã•ã„。\n" -#: src/init.c:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªæ•°ã§ã™ã€‚\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s ã¯ä¸€åº¦ã ã‘使ã‚れるã¹ãã‚‚ã®ã§ã™\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªãƒã‚¤ãƒˆå€¤ã§ã™ã€‚\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªæ™‚é–“é–“éš”ã§ã™ã€‚\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1396,28 +1410,28 @@ "use-askpass ã¯æ–‡å­—列ãŒæ¸¡ã•ã‚Œã‚‹ã‹ã€ç’°å¢ƒå¤‰æ•° WGET_ASKPASS ã‹ SSH_ASKPASS ãŒè¨­å®š" "ã•ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªå€¤ã§ã™ã€‚\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªãƒ˜ãƒƒãƒ€ã§ã™ã€‚\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãª WARC ヘッダã§ã™ã€‚\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªçµŒéŽè¡¨ç¤ºå½¢å¼ã§ã™ã€‚\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1432,16 +1446,16 @@ msgid "Encoding %s isn't valid\n" msgstr "エンコード %s ã¯ç„¡åŠ¹ã§ã™\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "ä¸å®Œå…¨ã‹ä¸æ­£ãªãƒžãƒ«ãƒãƒã‚¤ãƒˆæ–‡å­—列ã§ã™\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "処ç†ã•ã‚Œãªã„エラー (errno %d)\n" @@ -1474,12 +1488,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; ログå–ã‚Šã‚’ç¦æ­¢ã—ã¾ã™ã€‚\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "使ã„æ–¹: %s [オプション]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1487,64 +1501,64 @@ "é•·ã„オプションã§ä¸å¯æ¬ ãªå¼•æ•°ã¯çŸ­ã„オプションã§ã‚‚ä¸å¯æ¬ ã§ã™ã€‚\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "スタートアップ:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¦çµ‚了ã™ã‚‹\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background スタート後ã«ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã«ç§»è¡Œã™ã‚‹\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=COMMAND `.wgetrc'å½¢å¼ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "ログã¨å…¥åŠ›ãƒ•ã‚¡ã‚¤ãƒ«:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FILE ログを FILE ã«å‡ºåŠ›ã™ã‚‹\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FILE メッセージを FILE ã«è¿½è¨˜ã™ã‚‹\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug デãƒãƒƒã‚°æƒ…報を表示ã™ã‚‹\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug Watt-32デãƒãƒƒã‚°æƒ…報を表示ã™ã‚‹\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet 何も出力ã—ãªã„\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose 冗長ãªå‡ºåŠ›ã‚’ã™ã‚‹ (デフォルト)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -nv, --no-verbose 冗長ã§ã¯ãªãã™ã‚‹\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1552,7 +1566,7 @@ " --report-speed=TYPE 帯域幅を TYPE ã§å‡ºåŠ›ã—ã¾ã™ã€‚TYPE 㯠" "'bits' ãŒæŒ‡å®šã§ãã¾ã™ã€‚\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1560,7 +1574,7 @@ " -i, --input-file=FILE FILE ã®ä¸­ã«æŒ‡å®šã•ã‚ŒãŸ URL をダウンロードã™" "ã‚‹\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1568,11 +1582,11 @@ " --input-metalink=FILE Metalink FILE ã«æ›¸ã‹ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’ダウン" "ロードã™ã‚‹\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html 入力ファイルを HTML ã¨ã—ã¦æ‰±ã†\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1581,50 +1595,49 @@ "ã‚’\n" " 指定ã—㟠URL ã®ç›¸å¯¾ URL ã¨ã—ã¦æ‰±ã†\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=FILE 設定ファイルを指定ã™ã‚‹\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-config 設定ファイルを読ã¿ã“ã¾ãªã„\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=FILE æ‹’å¦ã•ã‚ŒãŸç†ç”±ã‚’ログ FILE ã«ä¿å­˜ã™ã‚‹\n" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "ダウンロード:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" " -t, --tries=NUMBER リトライ回数ã®ä¸Šé™ã‚’指定 (0 ã¯ç„¡åˆ¶é™).\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr " --retry-connrefused 接続を拒å¦ã•ã‚Œã¦ã‚‚リトライã™ã‚‹\n" -#: src/main.c:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=LIST å–得対象ã«ã—ãªã„ã‚¿ã‚°åをコンマ区切りã§æŒ‡å®š" -"ã™ã‚‹\n" +" --retry-on-http-error=ERRORS コンマ区切りã§æŒ‡å®šã—ãŸHTTPã®ã‚¨ãƒ©ãƒ¼ã®å ´" +"åˆãƒªãƒˆãƒ©ã‚¤ã™ã‚‹\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FILE FILE ã«æ–‡æ›¸ã‚’書ãã“ã‚€\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1632,14 +1645,13 @@ " -nc, --no-clobber 存在ã—ã¦ã„るファイルをダウンロードã§ä¸Šæ›¸ã" "ã—ãªã„\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-config 設定ファイルを読ã¿ã“ã¾ãªã„\n" +msgstr " --no-netrc .netrc ã‹ã‚‰èªè¨¼æƒ…報をå–å¾—ã—ãªã„\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1647,24 +1659,24 @@ " -c, --continue 部分的ã«ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ç¶šãã‹ã‚‰" "始ã‚ã‚‹\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr " --start-pos=OFFSET OFFSET ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã‚’開始ã™ã‚‹\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TYPE 進行表示ゲージã®ç¨®é¡žã‚’ TYPE ã«æŒ‡å®šã™ã‚‹\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --show-progress ã©ã®ãƒ¢ãƒ¼ãƒ‰ã§ã‚‚進æ—ãƒãƒ¼ã‚’表示ã™ã‚‹\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1673,7 +1685,7 @@ " -N, --timestamping ローカルã«ã‚るファイルよりも新ã—ã„ファイル" "ã ã‘å–å¾—ã™ã‚‹\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1683,7 +1695,7 @@ " if-modified-since get リクエストを使ã‚ãª" "ã„\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1691,21 +1703,21 @@ " --no-use-server-timestamps ローカルå´ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ã«\n" " サーãƒã®ã‚‚ã®ã‚’使ã‚ãªã„\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response サーãƒã®å¿œç­”を表示ã™ã‚‹\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider 何もダウンロードã—ãªã„\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SECONDS å…¨ã¦ã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã‚’ SECONDS 秒ã«è¨­å®šã™" "ã‚‹\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1713,7 +1725,7 @@ " --dns-servers=ADDRESSES åå‰ã®è§£æ±ºã«ä½¿ã†DNSサーãƒã®ãƒªã‚¹ãƒˆ (カンマ" "区切り)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1721,33 +1733,33 @@ " --bind-address=ADDRESS ローカルホストã®DNS resolverアドレスã¨ã—" "㦠ADDRESS (ホストåã‹ IP) を使ã†\n" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SECS DNS å•ã„åˆã‚ã›ã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã‚’ SECS 秒ã«è¨­" "定ã™ã‚‹\n" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SECS 接続タイムアウトを SECS 秒ã«è¨­å®šã™ã‚‹\n" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SECS 読ã¿è¾¼ã¿ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã‚’ SECS 秒ã«è¨­å®šã™ã‚‹\n" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SECONDS ダウンロード毎㫠SECONDS 秒待ã¤\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr " --waitretry=SECONDS リトライ毎㫠1〜SECONDS 秒待ã¤\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1755,16 +1767,16 @@ " --random-wait ダウンロード毎㫠0.5*WAIT〜1.5*WAIT 秒待" "ã¤\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy プロクシを使ã‚ãªã„\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=NUMBER ダウンロードã™ã‚‹ãƒã‚¤ãƒˆæ•°ã®ä¸Šé™ã‚’指定ã™ã‚‹\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1772,24 +1784,24 @@ " --bind-address=ADDRESS ローカルアドレスã¨ã—㦠ADDRESS (ホストå" "ã‹ IP) を使ã†\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=RATE ダウンロード速度を RATE ã«åˆ¶é™ã™ã‚‹\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache DNS ã®å•ã„åˆã‚ã›çµæžœã‚’キャッシュã—ãªã„\n" -#: src/main.c:713 +#: src/main.c:714 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:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1797,15 +1809,15 @@ " --ignore-case ファイルå/ディレクトリåã®æ¯”較ã§å¤§æ–‡å­—å°" "文字を無視ã™ã‚‹\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only IPv4 ã ã‘を使ã†\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only IPv6 ã ã‘を使ã†\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1814,20 +1826,20 @@ " --prefer-family=FAMILY 指定ã—ãŸãƒ•ã‚¡ãƒŸãƒª(IPv6, IPv4, none)ã§æœ€åˆã«" "接続ã™ã‚‹\n" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr " --user=USER ftp, http ã®ãƒ¦ãƒ¼ã‚¶åを指定ã™ã‚‹\n" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=PASS ftp, http ã®ãƒ‘スワードを指定ã™ã‚‹\n" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password パスワードを別途入力ã™ã‚‹\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1844,29 +1856,29 @@ "ãŒ\n" " 使ã‚ã‚Œã¾ã™ã€‚\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri IRI サãƒãƒ¼ãƒˆã‚’使ã‚ãªã„\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=ENC 指定ã—㟠ENC ã‚’ IRI ã®ãƒ­ãƒ¼ã‚«ãƒ«ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£" "ングã«ã™ã‚‹\n" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=ENC 指定ã—㟠ENC をデフォルトã®ãƒªãƒ¢ãƒ¼ãƒˆã‚¨ãƒ³" "コーディングã«ã™ã‚‹\n" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink 上書ãã™ã‚‹å‰ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1874,7 +1886,7 @@ " --keep-badhash ãƒã‚§ãƒƒã‚¯ã‚µãƒ ãŒä¸€è‡´ã—ãªã‹ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚‚" "(ファイルåã« .badhash を追加ã—ãŸä¸Šã§)ä¿æŒã—ã¾ã™ã€‚\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1882,7 +1894,7 @@ " --metalink-index=NUMBER Metalink application/metalink4+xml ã® " "metaurl 番å·ã‚’ NUMBER ã«æŒ‡å®šã™ã‚‹\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1890,7 +1902,7 @@ " --metalink-over-http メタリンク情報を HTTP 応答ヘッダã‹ã‚‰å–å¾—ã™" "ã‚‹\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1898,39 +1910,40 @@ " --preferred-location メタリンクリソースã«å¯¾ã—ã¦è‰¯ã„場所をé¸æŠžã™" "ã‚‹\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr 拡張ファイル属性ã¸ã®ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ä¿å­˜ã‚’無効ã«" "ã™ã‚‹\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "ディレクトリ:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ディレクトリを作らãªã„\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories ディレクトリを強制的ã«ä½œã‚‹\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ホストåã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作らãªã„\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories プロトコルåã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作る\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIX ファイルを PREFIX/ 以下ã«ä¿å­˜ã™ã‚‹\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1938,24 +1951,24 @@ " --cut-dirs=NUMBER リモートディレクトリåã® NUMBER 階層分を無" "視ã™ã‚‹\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP オプション:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=USER http ユーザåã¨ã—㦠USER を使ã†\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=PASS http パスワードã¨ã—㦠PASS を使ã†\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache サーãƒãŒã‚­ãƒ£ãƒƒã‚·ãƒ¥ã—ãŸãƒ‡ãƒ¼ã‚¿ã‚’許å¯ã—ãªã„\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1963,57 +1976,57 @@ " --default-page=NAME デフォルトã®ãƒšãƒ¼ã‚¸åã‚’ NAME ã«å¤‰æ›´ã—ã¾ã™\n" " 通常㯠`index.html' ã§ã™\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" " -E, --adjust-extension HTML/CSS 文書ã¯é©åˆ‡ãªæ‹¡å¼µå­ã§ä¿å­˜ã™ã‚‹\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length `Content-Length' ヘッダを無視ã™ã‚‹\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=STRING é€ä¿¡ã™ã‚‹ãƒ˜ãƒƒãƒ€ã« STRING を追加ã™ã‚‹\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=TYPE 進行表示ゲージã®ç¨®é¡žã‚’ TYPE ã«æŒ‡å®šã™ã‚‹\n" +" --compression=TYPE 圧縮アルゴリズムã®æŒ‡å®š: autoã‹gzipã‹" +"none(デフォルトã¯none)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr " --max-redirect ページã§è¨±å¯ã™ã‚‹æœ€å¤§è»¢é€å›žæ•°\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=USER プロクシユーザåã¨ã—㦠USER を使ã†\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=PASS プロクシパスワードã¨ã—㦠PASS を使ã†\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr " --referer=URL Referer ã‚’ URL ã«è¨­å®šã™ã‚‹\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers HTTP ã®ãƒ˜ãƒƒãƒ€ã‚’ファイルã«ä¿å­˜ã™ã‚‹\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2021,7 +2034,7 @@ " -U, --user-agent=AGENT User-Agent ã¨ã—㦠Wget/VERSION ã§ã¯ãªã " "AGENT を使ã†\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2029,34 +2042,34 @@ " --no-http-keep-alive HTTP ã® keep-alive (æŒç¶šçš„接続) 機能を使ã‚" "ãªã„\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies クッキーを使ã‚ãªã„\n" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr " --load-cookies=FILE クッキーを FILE ã‹ã‚‰èª­ã¿ã“ã‚€\n" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --save-cookies=FILE クッキーを FILE ã«ä¿å­˜ã™ã‚‹\n" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" " --keep-session-cookies セッションã ã‘ã§ç”¨ã„るクッキーをä¿æŒã™ã‚‹\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" " --post-data=STRING POST メソッドを用ã„㦠STRING ã‚’é€ä¿¡ã™ã‚‹\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2064,14 +2077,14 @@ " --post-file=FILE POST メソッドを用ã„㦠FILE ã®ä¸­å‘³ã‚’é€ä¿¡ã™" "ã‚‹\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod \"HTTPMethod\" をヘッダã®ãƒ¡ã‚½ãƒƒãƒ‰ã¨ã—ã¦ä½¿" "ã„ã¾ã™\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2079,7 +2092,7 @@ " --body-data=STRING STRING をデータã¨ã—ã¦é€ã‚‹ã€‚--method を指定" "ã—ã¦ãã ã•ã„。\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2087,7 +2100,7 @@ " --body-file=FILE ファイルã®ä¸­å‘³ã‚’é€ã‚‹ã€‚--method を指定ã—ã¦" "ãã ã•ã„。\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2098,14 +2111,14 @@ " ローカルã®ãƒ•ã‚¡ã‚¤ãƒ«åã¨ã—ã¦ç”¨ã„ã‚‹ (実験" "çš„)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" " --content-on-error サーãƒã‚¨ãƒ©ãƒ¼æ™‚ã«å—ä¿¡ã—ãŸå†…容を出力ã™ã‚‹\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2115,56 +2128,55 @@ " --auth-no-challenge サーãƒã‹ã‚‰ã®ãƒãƒ£ãƒ¬ãƒ³ã‚¸ã‚’å¾…ãŸãšã«ã€\n" " Basicèªè¨¼ã®æƒ…報をé€ä¿¡ã—ã¾ã™ã€‚\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) オプション:\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" " --secure-protocol=PR セキュアプロトコルをé¸æŠžã™ã‚‹ (auto, " -"SSLv2, SSLv3, TLSv1, PFS)\n" +"SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2, PFS)\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only 安全㪠HTTPS ã®ãƒªãƒ³ã‚¯ã ã‘ãŸã©ã‚‹\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate サーãƒè¨¼æ˜Žæ›¸ã‚’検証ã—ãªã„\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr "" " --certificate=FILE クライアント証明書ã¨ã—㦠FILE を使ã†\n" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE クライアント証明書ã®ç¨®é¡žã‚’ TYPE (PEM, " "DER) ã«è¨­å®šã™ã‚‹\n" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FILE 秘密éµã¨ã—㦠FILE を使ã†\n" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TYPE 秘密éµã®ç¨®é¡žã‚’ TYPE (PEM, DER) ã«è¨­å®šã™" "ã‚‹\n" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FILE CA 証明書ã¨ã—㦠FILE を使ã†\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2172,11 +2184,11 @@ " --ca-directory=DIR CA ã®ãƒãƒƒã‚·ãƒ¥ãƒªã‚¹ãƒˆãŒä¿æŒã•ã‚Œã¦ã„るディレ" "クトリを指定ã™ã‚‹\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FILE CRL ファイルを指定ã™ã‚‹\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2191,7 +2203,7 @@ "ン区切り)を指定ã—ã¦ã€\n" " 相手をèªè¨¼ã—ã¾ã™ã€‚\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2199,13 +2211,13 @@ " --random-file=FILE SSL PRNG ã®åˆæœŸåŒ–データã«ä½¿ã†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指" "定ã™ã‚‹\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr " --egd-file=FILE EGD ソケットã¨ã—㦠FILE を使ã†\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2214,16 +2226,22 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=STR GnuTLSã®å„ªå…ˆåº¦ã‹OpenSSLã®æš—å·ãƒªã‚¹ãƒˆã‚’直接指定" +"ã™ã‚‹\n" +" 注æ„ã—ã¦ä½¿ã£ã¦ãã ã•ã„。--secure-protocol " +"を上書ãã—ã¾ã™ã€‚\n" +" フォーマットや文法㯠SSL/TLS 実装ã«ä¾å­˜ã—" +"ã¾ã™ã€‚\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "HSTS オプション:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts HSTS を使ã‚ãªã„\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2231,11 +2249,11 @@ " --hsts-file HSTS データベースã®ãƒ‘ス (デフォルトを上書" "ã)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP オプション:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2243,35 +2261,35 @@ " --ftp-stmlf ftp ã®å…¨ã¦ã®ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã§ Stream_LF " "フォーマットを用ã„ã¾ã™ã€‚\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=USER ftp ユーザã¨ã—㦠USER を使ã†\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASS ftp パスワードã¨ã—㦠PASS を使ã†\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing `.listing' ファイルを削除ã—ãªã„\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob FTP ファイルåã®ã‚°ãƒ­ãƒ–を無効ã«ã™ã‚‹\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp \"passive\" 転é€ãƒ¢ãƒ¼ãƒ‰ã‚’使ã‚ãªã„\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions リモートã®ãƒ•ã‚¡ã‚¤ãƒ«ãƒ‘ーミッションをä¿å­˜ã™" "ã‚‹\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2279,11 +2297,11 @@ " --retr-symlinks å†å¸°å–得中ã«ã€ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã§ãƒªãƒ³ã‚¯ã•" "ã‚ŒãŸå…ˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–å¾—ã™ã‚‹\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTPS オプション:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2291,7 +2309,7 @@ " --ftps-implicit implicit FTPS を使ㆠ(デフォルトãƒãƒ¼ãƒˆ" "㯠990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2301,7 +2319,7 @@ "ã‚’\n" " データ接続ã§å†é–‹ã™ã‚‹\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2309,7 +2327,7 @@ " --ftps-clear-data-connection 制御ãƒãƒ£ãƒãƒ«ã ã‘æš—å·åŒ–ã™ã‚‹(データã¯å¹³" "æ–‡ã«ãªã‚‹)\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2317,11 +2335,11 @@ " --ftps-fallback-to-ftp サーãƒãŒ FTPS ã«å¯¾å¿œã—ã¦ã„ãªã„å ´åˆã¯ " "FTP ã«ã™ã‚‹\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC オプション:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2329,24 +2347,24 @@ " --warc-file=FILENAME リクエスト/レスãƒãƒ³ã‚¹ãƒ‡ãƒ¼ã‚¿ã‚’ .warc.gz " "ファイルã«ä¿å­˜ã™ã‚‹\n" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=STRING warcinfo record ã« STRING を追加ã™ã‚‹\n" -#: src/main.c:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx CDX インデックスファイルを書ã\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2354,23 +2372,23 @@ " --warc-dedup=FILENAME 指定ã—㟠CDX ファイルã«è¼‰ã£ã¦ã„ã‚‹ record " "ã¯ä¿å­˜ã—ãªã„\n" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-warc-compression WARC ファイルを GZIP ã§åœ§ç¸®ã—ãªã„\n" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests SHA1 ダイジェストを計算ã—ãªã„\n" -#: src/main.c:949 +#: src/main.c:950 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:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2379,15 +2397,15 @@ " --warc-tempdir=DIRECTORY WARC 書込時ã®ä¸€æ™‚ファイルを置ãディレクト" "リを指定ã™ã‚‹\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "å†å¸°ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive å†å¸°ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã‚’è¡Œã†\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2395,7 +2413,7 @@ " -l, --level=NUMBER å†å¸°æ™‚ã®éšŽå±¤ã®æœ€å¤§ã®æ·±ã•ã‚’ NUMBER ã«è¨­å®šã™" "ã‚‹ (0 ã§ç„¡åˆ¶é™)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2403,7 +2421,7 @@ " --delete-after ダウンロード終了後ã€ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—ãŸãƒ•ã‚¡ã‚¤" "ルを削除ã™ã‚‹\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2412,7 +2430,7 @@ " -k, --convert-links HTML ã‚„ CSS 中ã®ãƒªãƒ³ã‚¯ã‚’ローカルを指ã™ã‚ˆã†" "ã«å¤‰æ›´ã™ã‚‹\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2420,7 +2438,7 @@ " --convert-file-only URLã®ãƒ•ã‚¡ã‚¤ãƒ«å部分ã ã‘変æ›ã™ã‚‹ (ã„ã‚ゆる" "basename)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2428,7 +2446,7 @@ " --backups=N ファイルã«æ›¸ãã“む時㫠N ファイルã®ãƒãƒƒã‚¯" "アップをローテーションã•ã›ã‚‹\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2436,7 +2454,7 @@ " -K, --backup-converted リンク変æ›å‰ã®ãƒ•ã‚¡ã‚¤ãƒ« X ã‚’ X_orig ã¨ã—ã¦" "ä¿å­˜ã™ã‚‹\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2444,14 +2462,14 @@ " -K, --backup-converted リンク変æ›å‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ .orig ã¨ã—ã¦ä¿å­˜" "ã™ã‚‹\n" -#: src/main.c:979 +#: src/main.c:980 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:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2459,18 +2477,18 @@ " -p, --page-requisites HTML を表示ã™ã‚‹ã®ã«å¿…è¦ãªå…¨ã¦ã®ç”»åƒç­‰ã‚‚å–" "å¾—ã™ã‚‹\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" " --strict-comments HTML 中ã®ã‚³ãƒ¡ãƒ³ãƒˆã®å‡¦ç†ã‚’厳密ã«ã™ã‚‹\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "å†å¸°ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰æ™‚ã®ãƒ•ã‚£ãƒ«ã‚¿:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2478,7 +2496,7 @@ " -A, --accept=LIST ダウンロードã™ã‚‹æ‹¡å¼µå­ã‚’コンマ区切りã§æŒ‡å®š" "ã™ã‚‹\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2486,43 +2504,43 @@ " -R, --reject=LIST ダウンロードã—ãªã„æ‹¡å¼µå­ã‚’コンマ区切りã§æŒ‡" "定ã™ã‚‹\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr " --accept-regex=REGEX 許容ã™ã‚‹ URL ã®æ­£è¦è¡¨ç¾ã‚’指定ã™ã‚‹\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=REGEX æ‹’å¦ã™ã‚‹ URL ã®æ­£è¦è¡¨ç¾ã‚’指定ã™ã‚‹\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TYPE æ­£è¦è¡¨ç¾ã®ã‚¿ã‚¤ãƒ— (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYPE æ­£è¦è¡¨ç¾ã®ã‚¿ã‚¤ãƒ— (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LIST ダウンロードã™ã‚‹ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’コンマ区切りã§æŒ‡" "定ã™ã‚‹\n" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LIST ダウンロードã—ãªã„ドメインをコンマ区切りã§" "指定ã™ã‚‹\n" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp HTML 文書中㮠FTP リンクもå–得対象ã«ã™ã‚‹\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2530,7 +2548,7 @@ " --follow-tags=LIST å–得対象ã«ã™ã‚‹ã‚¿ã‚°åをコンマ区切りã§æŒ‡å®šã™" "ã‚‹\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2538,22 +2556,22 @@ " --ignore-tags=LIST å–得対象ã«ã—ãªã„ã‚¿ã‚°åをコンマ区切りã§æŒ‡å®š" "ã™ã‚‹\n" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts å†å¸°ä¸­ã«åˆ¥ã®ãƒ›ã‚¹ãƒˆã‚‚ダウンロード対象ã«ã™" "ã‚‹\n" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative 相対リンクã ã‘å–得対象ã«ã™ã‚‹\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" " -I, --include-directories=LIST å–得対象ã«ã™ã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’指定ã™ã‚‹\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2562,93 +2580,94 @@ " --trust-server-names ファイルåã¨ã—ã¦ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆå…ˆã®URLã®æœ€å¾Œ" "ã®éƒ¨åˆ†ã‚’使ã†\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=LIST å–得対象ã«ã—ãªã„ディレクトリを指定ã™ã‚‹\n" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent 親ディレクトリをå–得対象ã«ã—ãªã„\n" -#: src/main.c:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" -msgstr "ãƒã‚°å ±å‘Šã‚„æ案ã¯ã¸\n" +msgstr "ãƒã‚°å ±å‘Šã‚„質å•ã€è­°è«–ã¯ã¸\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"ãã‚Œã¨(ã‚ã‚‹ã„ã¯ã¾ãŸã¯) https://savannah.gnu.org/bugs/?" +"func=additem&group=wget ã«ç™»éŒ²ã—ã¦ãã ã•ã„。\n" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, éžå¯¾è©±çš„ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è»¢é€ã‚½ãƒ•ãƒˆ\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "ユーザ %s ã®ãƒ‘スワード: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "パスワード: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "パイプãŒä½œæˆã§ãã¾ã›ã‚“\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "èªè¨¼æƒ…å ±å–得用ã®ãƒ—ログラム(use-askpass)ã‚’èµ·å‹•ã™ã‚‹ãŸã‚ã®åˆæœŸåŒ–ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—" "ã¾ã—ãŸ: %d\n" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "èªè¨¼æƒ…å ±å–得用ã®ãƒ—ログラム(use-askpass)ã‚’èµ·å‹•ã™ã‚‹ãŸã‚ã®è¨­å®šã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾" "ã—ãŸ: %d\n" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "コマンド \"%s %s\" ã®å¿œç­”ã®èª­ã¿è¾¼ã¿ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "'%s%s' ã®ãƒ¦ãƒ¼ã‚¶å: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "%s%s@%s ã®ãƒ‘スワード: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "ロケール: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "コンパイル: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "リンク: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2657,29 +2676,29 @@ "GNU Wget %s built on %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (user)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2693,7 +2712,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2701,38 +2720,38 @@ "\n" "Hrvoje Niksic ã«ã‚ˆã£ã¦æ›¸ã‹ã‚Œã¾ã—ãŸã€‚\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "ãƒã‚°å ±å‘Šã‚„質å•ã¯ã¸\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "メモリ確ä¿ã§ãã¾ã›ã‚“\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "エラーã®ãŸã‚終了ã—ã¾ã™ï¼š%s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "詳ã—ã„オプション㯠`%s --help' を実行ã—ã¦ãã ã•ã„。\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: `-n%c' ã¯ä¸æ­£ãªã‚ªãƒ—ション指定ã§ã™\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "デãƒãƒƒã‚°ã‚µãƒãƒ¼ãƒˆãŒã‚³ãƒ³ãƒ‘イル時ã«æœ‰åŠ¹ã«ã•ã‚Œã¦ã„ã¾ã›ã‚“。--debug フラグを無視ã—" "ã¾ã™ã€‚\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2741,7 +2760,7 @@ "--no-clobber 㨠--convert-links ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸãŒã€--convert-links ã ã‘ãŒæœ‰" "効ã«ãªã‚Šã¾ã™ã€‚\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2750,24 +2769,24 @@ "--no-clobber 㨠--convert-file-only ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸãŒã€--convert-file-only " "ã ã‘ãŒæœ‰åŠ¹ã«ãªã‚Šã¾ã™ã€‚\n" -#: src/main.c:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "" "出力を詳細ã«ã™ã‚‹ã‚ªãƒ—ションã¨å‡ºåŠ›ã‚’抑制ã™ã‚‹ã‚ªãƒ—ションをåŒæ™‚ã«ã¯æŒ‡å®šã§ãã¾ã›" "ã‚“\n" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "-Nã¨-ncã¨ã‚’åŒæ™‚ã«ã¯æŒ‡å®šã§ãã¾ã›ã‚“。\n" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "--inet4-only 㨠--inet6-only を両方指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“\n" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2779,7 +2798,7 @@ "ニュアルをå‚ç…§ã—ã¦ãã ã•ã„。\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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 +2808,7 @@ "å…¨ã¦æŒ‡å®šã•ã‚ŒãŸä¸€ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å…¥ã‚‹ã“ã¨ã‚’æ„味ã—ã¾ã™ã€‚\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2799,7 +2818,7 @@ "詳ã—ãã¯ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2807,7 +2826,7 @@ "WARC ã§å‡ºåŠ›ã™ã‚‹å ´åˆã¯ --no-clobber ã¯ä½¿ãˆãªã„ã®ã§ã€--no-clobber を無効ã«ã—ã¾" "ã™ã€‚\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2815,12 +2834,12 @@ "WARC ã§å‡ºåŠ›ã™ã‚‹å ´åˆã¯ã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ãŒä½¿ãˆãªã„ã®ã§ã€ã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—を無効ã«ã—ã¾" "ã™ã€‚\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC ã§å‡ºåŠ›ã™ã‚‹å ´åˆã¯ --spider ã¯ä½¿ãˆã¾ã›ã‚“。\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2829,7 +2848,7 @@ "WARC ã§å‡ºåŠ›ã™ã‚‹å ´åˆã¯ --continue ã‚„ --start-pos ã¯ä½¿ãˆãªã„ã®ã§ã€ãれらを無効" "ã«ã—ã¾ã™ã€‚\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2837,21 +2856,21 @@ "ダイジェストãŒç„¡åŠ¹ã§ã™ã€‚WARC ã®é‡è¤‡æŽ’除機能ã§é‡è¤‡ record を見ã¤ã‘られã¾ã›" "ん。\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"WARC ã§å‡ºåŠ›ã™ã‚‹å ´åˆã¯ --continue ã‚„ --start-pos ã¯ä½¿ãˆãªã„ã®ã§ã€ãれらを無効" -"ã«ã—ã¾ã™ã€‚\n" +"圧縮㯠--continue ã‚„ --start-pos ã¨ã¯åŒæ™‚ã«ä½¿ãˆã¾ã›ã‚“。圧縮ã¯ç„¡åŠ¹åŒ–ã•ã‚Œã¾" +"ã™ã€‚\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "--ask-password 㨠--password を両方指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2860,17 +2879,17 @@ "--start-pos 㨠--continue ã®ä¸¡æ–¹ã‚’指定ã™ã‚‹ã“ã¨ã¯æŽ¨å¥¨ã•ã‚Œã¾ã›ã‚“。--continue ã¯" "無効ã«ãªã‚Šã¾ã™ã€‚\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: URLãŒã‚ã‚Šã¾ã›ã‚“\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "--post-data 㨠--post-file を両方指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“\n" -#: src/main.c:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2879,7 +2898,7 @@ "--post-data 㨠--post-file 㯠--method ã¨ä¸€ç·’ã«ã¯ä½¿ãˆã¾ã›ã‚“。--method を使ã†" "å ´åˆã¯ã€ãƒ‡ãƒ¼ã‚¿ã‚’ --body-data ã‹ --body-file ã‹ã‚‰ä¸Žãˆã¦ãã ã•ã„\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2888,23 +2907,23 @@ "--body-data ã‚„ --body-file を使ã†å ´åˆã¯ã€--method ã§ãƒ¡ã‚½ãƒƒãƒ‰ã‚’指定ã—ã¦ãã ã•" "ã„。\n" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "--body-data 㨠--body-file を両方指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“\n" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ IRI をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -#: src/main.c:1999 +#: src/main.c:2006 #, 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:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2913,42 +2932,42 @@ "--convert-links ã‚„ --convert-file-only ã¯æ™®é€šã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å‡ºåŠ›ã™ã‚‹æ™‚ã ã‘使ãˆã¾" "ã™ã€‚\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "libcares ã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸ\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "c-ares ãƒãƒ£ãƒãƒ«ã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸ\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "IP アドレス '%s' ã‚’ç†è§£ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "'%s' ã¨ã„ã†DNSサーãƒã‚’設定ã§ãã¾ã›ã‚“: (%d)\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "%s ã«ã¯URLãŒã‚ã‚Šã¾ã›ã‚“。\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "メタリンクファイル %s ã®è§£æžã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "%s ã‹ã‚‰å…¨ã¦ã«ãƒªã‚½ãƒ¼ã‚¹ã¯ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2959,7 +2978,7 @@ "経éŽæ™‚é–“: %s\n" "ダウンロード完了: %d ファイルã€%s ãƒã‚¤ãƒˆã‚’ %s ã§å–å¾— (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "容é‡åˆ¶é™(%s ãƒã‚¤ãƒˆ)を超éŽã—ã¾ã™!\n" @@ -3125,7 +3144,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã§ç¶™ç¶šã—ã¾ã™ã€pid㯠%lu。\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "出力を %s ã«æ›¸ãè¾¼ã¿ã¾ã™ã€‚\n" @@ -3173,77 +3192,75 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: %sã®æƒ…報をå–å¾—ã§ãã¾ã›ã‚“: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "警告: å¼±ã„乱数ã®ç¨®ã‚’使用ã—ã¦ã„ã¾ã™\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "PRNGã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸã€‚--random-file ã®ä½¿ç”¨ã‚’検討ã—ã¦ãã ã•ã„。\n" -#: src/openssl.c:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "OpenSSL ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã™ãŽã¦ TLSv1.1 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" +msgstr "OpenSSL ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã™ãŽã¦ TLSv1.3 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "OpenSSL ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã™ãŽã¦ TLSv1.1 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "OpenSSL ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã™ãŽã¦ TLSv1.2 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: 実装ã•ã‚Œã¦ã„ãªã„ 'secure-protocol' オプション値 %d\n" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: %s ã¯ç„¡åŠ¹ãª URL ã§ã™(%s)。\n" +msgstr "OpenSSL: 無効ãªæš—å·ãƒªã‚¹ãƒˆã§ã™: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "PRNGã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸã€‚--random-file ã®ä½¿ç”¨ã‚’検討ã—ã¦ãã ã•ã„。\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸(発行者: %s)ã®æ¤œè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸ:\n" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " 発行者ã®æ¨©é™ã‚’検証ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " 自己署å証明書ã§ã™ã€‚\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " 発行ã•ã‚ŒãŸè¨¼æ˜Žæ›¸ã¯ã¾ã æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " 発行ã•ã‚ŒãŸè¨¼æ˜Žæ›¸ã¯å¤±åŠ¹ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "%s: 証明書ã«è¨˜è¼‰ã•ã‚Œã¦ã„る別åã¨ãƒ›ã‚¹ãƒˆå %s ãŒä¸€è‡´ã—ã¾ã›ã‚“\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr " %s: 証明書ã«è¨˜è¼‰ã•ã‚Œã¦ã„ã‚‹åå‰ %s ã¨ãƒ›ã‚¹ãƒˆå %s ãŒä¸€è‡´ã—ã¾ã›ã‚“\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3254,7 +3271,7 @@ " 接続先ã®ã‚µãƒ¼ãƒãŒãªã‚Šã™ã¾ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚\n" " ã¤ã¾ã‚Šã€æœ¬ç‰©ã® %s ã§ã¯ãªã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3305,22 +3322,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txtを読ã¿è¾¼ã‚“ã§ã„ã¾ã™ã€ã‚¨ãƒ©ãƒ¼ã¯ç„¡è¦–ã—ã¦ãã ã•ã„。\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "proxy URL %s を解釈中ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "proxy URL %s ã«é–“é•ã„ãŒã‚ã‚Šã¾ã™: HTTPã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "リダイレクション回数㌠%d を越ãˆã¾ã—ãŸã€‚\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3328,7 +3345,7 @@ "中止ã—ã¾ã—ãŸã€‚\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3341,7 +3358,7 @@ "Found no broken links.\n" "\n" msgstr "" -"壊れãŸãƒªãƒ³ã‚¯ã¯ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚\n" +"壊れã¦ã„るリンクã¯ã‚ã‚Šã¾ã›ã‚“。\n" "\n" #: src/spider.c:82 @@ -3353,10 +3370,10 @@ "Found %d broken links.\n" "\n" msgstr[0] "" -"%d 個ã®å£Šã‚ŒãŸãƒªãƒ³ã‚¯ã‚’見ã¤ã‘ã¾ã—ãŸã€‚\n" +"%d 個ã®ãƒªãƒ³ã‚¯ãŒå£Šã‚Œã¦ã„ã¾ã™ã€‚\n" "\n" msgstr[1] "" -"%d 個ã®å£Šã‚ŒãŸãƒªãƒ³ã‚¯ã‚’見ã¤ã‘ã¾ã—ãŸã€‚\n" +"%d 個ã®ãƒªãƒ³ã‚¯ãŒå£Šã‚Œã¦ã„ã¾ã™ã€‚\n" "\n" #: src/url.c:674 @@ -3400,98 +3417,111 @@ msgid "HTTPS support not compiled in" msgstr "HTTPS ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã‚‹ã‚ˆã†ã‚³ãƒ³ãƒ‘イルã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "ä¸å®Œå…¨ã‹ä¸æ­£ãªãƒžãƒ«ãƒãƒã‚¤ãƒˆæ–‡å­—列ã§ã™\n" +msgstr "変æ›ã§ããªã„マルãƒãƒã‚¤ãƒˆæ–‡å­—列ã§ã™\n" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: メモリã®ç¢ºä¿ã«å¤±æ•—ã—ã¾ã—ãŸ; メモリãŒã„ã£ã±ã„ã§ã™\n" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: %ld ãƒã‚¤ãƒˆã®ç¢ºä¿ã«å¤±æ•—ã—ã¾ã—ãŸ; メモリãŒã„ã£ã±ã„ã§ã™\n" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: テキストãƒãƒƒãƒ•ã‚¡ (%d bytes) ã¯å¤§ãã™ãŽã‚‹ã®ã§ã€ä¸­æ­¢ã—ã¾ã™ã€‚\n" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã§ç¶™ç¶šã—ã¾ã™ã€pid㯠%d。\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "シンボリックリンク %s ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "libcares ã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸ\n" +msgstr "ファイル %s ã® fopen() 失敗ã—ã¾ã—ãŸ\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "%s ã®ãƒ‘ーミッションãŒè¨­å®šã§ãã¾ã›ã‚“。\n" +msgstr "ファイル %s ã® FD(ファイルディスクリプタ) ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "%s ã®ãƒ‘ーミッションãŒè¨­å®šã§ãã¾ã›ã‚“。\n" +msgstr "" +"ファイル %s ã® stat() ã«å¤±æ•—ã—ã¾ã—㟠(パーミッションを確èªã—ã¦ãã ã•ã„)\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"ファイル %s ã¯æœ€å¾Œã«ç¢ºèªã—ãŸæ™‚ã‹ã‚‰å¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚セキュリティãƒã‚§ãƒƒã‚¯ã«å¤±" +"æ•—ã—ã¾ã—ãŸã€‚" -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "IP アドレス '%s' ã‚’ç†è§£ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" +msgstr "ファイル %s ã®ã‚ªãƒ¼ãƒ—ンã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "%s ã®ãƒ‘ーミッションãŒè¨­å®šã§ãã¾ã›ã‚“。\n" +msgstr "ファイル %s ã® stat() ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"ファイル %s をオープンã—よã†ã¨ã—ãŸã¨ã“ã‚最後ã«ç¢ºèªã—ãŸæ™‚ã‹ã‚‰å¤‰æ›´ã•ã‚Œã¦ã„ã¾ã—" +"ãŸã€‚セキュリティãƒã‚§ãƒƒã‚¯ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "%s ã¯ç„¡åŠ¹ãªæ­£è¦è¡¨ç¾ã§ã™, PCRE2 エラー %d\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "%s ã¯ç„¡åŠ¹ãªæ­£è¦è¡¨ç¾ã§ã™, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "%s をマッãƒä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "é–“é•ã£ãŸã‚µã‚¤ã‚ºã®ã‚­ãƒ¼ã‚’スキップã—ã¾ã™ (%d/%d): %s\n" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "WARC ファイルディスクリプタを複製中ã«ã‚¨ãƒ©ãƒ¼ã€‚\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "GZIP ストリームを WARC ファイルå‘ã‘ã«ã‚ªãƒ¼ãƒ—ンã§ãã¾ã›ã‚“ã§ã—ãŸ\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "WARC ファイル㸠warcinfo レコードを書ãè¾¼ã‚ã¾ã›ã‚“。\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3500,24 +3530,24 @@ "WARC ファイル %s をオープンã—ã¦ã„ã¾ã™ã€‚\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "WARC ファイル %s をオープンã§ãã¾ã›ã‚“。\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "CDX ファイルã«å…ƒã®URLã®åˆ—'a'ãŒã‚ã‚Šã¾ã›ã‚“。\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "CDX ファイルã«ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã®åˆ—'k'ãŒã‚ã‚Šã¾ã›ã‚“。\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "CDX ファイルã«ãƒ¬ã‚³ãƒ¼ãƒ‰IDã®åˆ—'u'ãŒã‚ã‚Šã¾ã›ã‚“。\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3532,50 +3562,32 @@ "CDX ファイルã‹ã‚‰ %d レコードを読ã¿ã“ã¿ã¾ã—ãŸã€‚\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "CDX ファイル %s ã‚’é‡è¤‡é™¤åŽ»ã®ãŸã‚ã«èª­ã¿ã“ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "一時 WARC マニフェストファイルãŒã‚ªãƒ¼ãƒ—ンã§ãã¾ã›ã‚“。\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "一時 WARC ログファイルをオープンã§ãã¾ã›ã‚“。\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "WARC ファイルをオープンã§ãã¾ã›ã‚“。\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "CDX ファイルを出力用ã«ã‚ªãƒ¼ãƒ—ンã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "一時 WARC ファイルをオープンã§ãã¾ã›ã‚“。\n" -#: src/warc.c:1482 +#: src/warc.c:1495 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" diff -Nru wget-1.19.5/po/lt.po wget-1.20.1/po/lt.po --- wget-1.19.5/po/lt.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/lt.po 2018-12-26 20:10:50.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: wget-1.11.3\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2009-01-29 00:21+0200\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -239,17 +239,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -313,7 +313,7 @@ msgid "failed: %s.\n" msgstr "nepavyko: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, fuzzy, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: nepavyko rasti adreso „%s“\n" @@ -436,12 +436,12 @@ msgid "Length: %s" msgstr "Dydis: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", liko %s (%s)" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", liko %s" @@ -612,7 +612,7 @@ "NÄ—ra tokio failo ar aplanko „%s“.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s staiga susikÅ«rÄ—.\n" @@ -635,17 +635,17 @@ msgid "Data transfer aborted.\n" msgstr "Duomenų siuntimas nutrauktas.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "Failas „%s“ jau egzistuoja; nesiunÄiama.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(bandymas:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, fuzzy, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -654,7 +654,7 @@ "%s (%s) - „%s“ įraÅ¡yta [%s/%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -663,8 +663,8 @@ "%s (%s) - „%s“ įraÅ¡ytas [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Å alinamas %s.\n" @@ -760,164 +760,178 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "Atmetamas „%s“.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Atmetamas „%s“.\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Klaida taikant %s su %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "NÄ—ra „%s“ atitikmenų.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "HTML formato turinys įraÅ¡ytas į „%s“ [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "HTML formato turinys įraÅ¡ytas į „%s“.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "KLAIDA" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "Ä®SPÄ–JIMAS" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s nepateikÄ— sertifikato.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, fuzzy, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: %s nepateikÄ— sertifikato.\n" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, 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:810 +#: src/gnutls.c:934 #, fuzzy, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: %s nepateikÄ— sertifikato.\n" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, fuzzy, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr " IÅ¡duotas sertifikatas dar nevalidus.\n" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr " IÅ¡duoto sertifikato galiojimo laikas baigÄ—si.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:834 +#: src/gnutls.c:958 #, fuzzy msgid "No certificate found\n" msgstr "%s: %s nepateikÄ— sertifikato.\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Klaida apdorojant tarpinÄ—s stoties URL %s: %s.\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 #, fuzzy msgid "The certificate has not yet been activated\n" msgstr " IÅ¡duotas sertifikatas dar nevalidus.\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 #, fuzzy msgid "The certificate has expired\n" msgstr " IÅ¡duoto sertifikato galiojimo laikas baigÄ—si.\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -957,11 +971,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Klaida raÅ¡ant HTTP užklausÄ…: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "NÄ—ra antraÅ¡Äių, bandoma kaip HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" @@ -970,133 +984,133 @@ "Failas „%s“ jau egzistuoja; nesiunÄiama.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "NÄ—ra POST duomenų failo „%s“: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Naudojamas esamas prisijungimas prie %s:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Naudojamas esamas prisijungimas prie %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Klaida skaitant tarpinÄ—s stoties atsakÄ…: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s KLAIDA %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Netinkama bÅ«senos eilutÄ—" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "TarpinÄ—s stoties tuneliavimas nesÄ—kmingas: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Nesuprantamas autentifikavimo bÅ«das.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Nesuprantamas autentifikavimo bÅ«das.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, fuzzy, c-format msgid "Saving to: %s\n" msgstr "RaÅ¡oma į: „%s“\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "DÄ—l įvykusių klaidų iÅ¡jungiamas SSL.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s užklausa iÅ¡siųsta, laukiama atsakymo..." -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Negauta duomenų.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "AntraÅ¡Äių skaitymo klaida (%s).\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(be apraÅ¡ymo)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Vieta: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "nenurodyta" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [sekama]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1104,7 +1118,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1114,81 +1128,81 @@ " Failas jau atsiųstas iki galo; užduoÄių nebeliko.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Dydis: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignoruojamas" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "PerspÄ—jimas: Å¡ablonai nesuderinami su HTTP protokolu.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nepavyksta raÅ¡yti į „%s“ (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Nepavyksta raÅ¡yti į „%s“ (%s).\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Nepavyko užmegzti SSL prisijungimo.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nepavyksta raÅ¡yti į „%s“ (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "KLAIDA: Nukreipimas (%d) niekur neveda.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "NutolÄ™s failas neegzistuoja – klaidinga nuoroda!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Paskutinio keitimo antraÅ¡tÄ— netaisyklinga – laiko žymÄ—s iÅ¡jungtos.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1197,16 +1211,16 @@ "Serverio filas ne naujesnis negu vietinis failas „%s“ – nesiunÄiama.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "NutolÄ™s failas yra naujesnis, siunÄiama.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1216,7 +1230,7 @@ "siunÄiama.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1224,7 +1238,7 @@ "NutolÄ™s failas egzistuoja, bet jame nÄ—ra nuorodų – nesiunÄiama.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1234,7 +1248,7 @@ "bet rekursija iÅ¡junga – nesiunÄiama.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1242,12 +1256,12 @@ "NutolÄ™s failas egzistuoja.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s: NekorektiÅ¡kas URL adresas %s: %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, fuzzy, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1256,7 +1270,7 @@ "%s (%s) - „%s“ įraÅ¡yta [%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1265,58 +1279,58 @@ "%s (%s) - „%s“ įraÅ¡yta [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Prisijungimas užvertas ties %s baitu. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Skaitymo klaida ties %s (%s) baitu." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepalaikoma schema" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nepavyksta nuskaityti %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Klaida %s eilutÄ—je %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1324,7 +1338,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1332,76 +1346,76 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: NekorektiÅ¡ka --execute komanda „%s“\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: NekorektiÅ¡kas skaitmuo „%s“.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: NekorektiÅ¡ka baito reikÅ¡mÄ— „%s“\n" -#: src/init.c:1379 +#: src/init.c:1373 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: NekorektiÅ¡kas laiko periodas „%s“\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: NekorektiÅ¡ka reikÅ¡mÄ— „%s“.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: NekorektiÅ¡ka antraÅ¡tÄ— „%s“.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: NekorektiÅ¡ka antraÅ¡tÄ— „%s“.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: NekorektiÅ¡kas pažangos tipas „%s“.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1415,16 +1429,16 @@ msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "" @@ -1457,12 +1471,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; žurnalas iÅ¡jungiamas.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Naudojimas: %s [PARINKTIS]... [ADRESAS]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1471,69 +1485,69 @@ "argumentams.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Pradžia:\n" -#: src/main.c:596 +#: src/main.c:597 #, 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:598 +#: src/main.c:599 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help iÅ¡spausdinti Å¡iÄ… informacijÄ….\n" -#: src/main.c:600 +#: src/main.c:601 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background veikti fone.\n" -#: src/main.c:602 +#: src/main.c:603 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=COMMAND įvykdyti „.wgetrc“ tipo komandÄ….\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Žurnalai ir įvedimo failas:\n" -#: src/main.c:608 +#: src/main.c:609 #, 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:610 +#: src/main.c:611 #, 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:613 +#: src/main.c:614 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug iÅ¡vesti daug derinimo informacijos.\n" -#: src/main.c:617 +#: src/main.c:618 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug iÅ¡spausdinti Watt-32 derinimo informacijÄ….\n" -#: src/main.c:620 +#: src/main.c:621 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tyli veiksena (be iÅ¡vesties).\n" -#: src/main.c:622 +#: src/main.c:623 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose informuoti iÅ¡samiai (numatytoji reikÅ¡mÄ—).\n" -#: src/main.c:624 +#: src/main.c:625 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " @@ -1542,33 +1556,33 @@ " -nv, --no-verbose sumažinti informatyvumÄ… (bet neiÅ¡jungti " "praneÅ¡imų).\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 #, 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:631 +#: src/main.c:632 #, 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:634 +#: src/main.c:635 #, 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:636 +#: src/main.c:637 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1577,26 +1591,26 @@ " -N, --timestamping nesiųsti failų, nebent naujesni už " "vietinius.\n" -#: src/main.c:639 +#: src/main.c:640 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --no-cookies nenaudoti slapukų.\n" -#: src/main.c:641 +#: src/main.c:642 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies nenaudoti slapukų.\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Parsiuntimas:\n" -#: src/main.c:649 +#: src/main.c:650 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1605,7 +1619,7 @@ " -t, --tries=SKAIÄŒIUS nustatyti bandymų parsiųsti SKAIÄŒIŲ (0 – " "neriboti).\n" -#: src/main.c:651 +#: src/main.c:652 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" @@ -1613,7 +1627,7 @@ " --retry-connrefused bandyti iÅ¡ naujo net jei prisijungimas " "atmetamas.\n" -#: src/main.c:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1622,12 +1636,12 @@ " --ignore-tags=SÄ„RAÅ AS kableliais atskirtas ignoruojamų\n" " HTML žymių sÄ…raÅ¡as.\n" -#: src/main.c:655 +#: src/main.c:656 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FAILAS raÅ¡yti dokumentus į FAILÄ„.\n" -#: src/main.c:657 +#: src/main.c:658 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1637,33 +1651,33 @@ "perraÅ¡yti\n" " esamus failus.\n" -#: src/main.c:660 +#: src/main.c:661 #, 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:662 +#: src/main.c:663 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr " -c, --continue tÄ™sti dalinai parsiųstÄ… failÄ….\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TYPE nurodyti progreso indikatoriaus tipÄ….\n" -#: src/main.c:668 +#: src/main.c:669 #, fuzzy msgid "" " --show-progress display the progress bar in any verbosity " @@ -1671,7 +1685,7 @@ msgstr "" " --progress=TYPE nurodyti progreso indikatoriaus tipÄ….\n" -#: src/main.c:670 +#: src/main.c:671 #, fuzzy msgid "" " -N, --timestamping don't re-retrieve files unless newer " @@ -1681,42 +1695,42 @@ " -N, --timestamping nesiųsti failų, nebent naujesni už " "vietinius.\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 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:679 +#: src/main.c:680 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response iÅ¡vesti serverio atsakymÄ….\n" -#: src/main.c:681 +#: src/main.c:682 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider nieko nesiųsti.\n" -#: src/main.c:683 +#: src/main.c:684 #, 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1725,31 +1739,31 @@ " --bind-address=ADRESAS susieti su ADRESU (kompiuterio vardu ar\n" " IP adresu) vietiniame kompiuteryje.\n" -#: src/main.c:691 +#: src/main.c:692 #, 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:693 +#: src/main.c:694 #, 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:695 +#: src/main.c:696 #, 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:697 +#: src/main.c:698 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDÄ–S laukti SEKUNDES tarp siuntimų.\n" -#: src/main.c:699 +#: src/main.c:700 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1758,7 +1772,7 @@ " --waitretry=SEK laukti 1..SEK tarp bandymų atsiusti iÅ¡ " "naujo.\n" -#: src/main.c:701 +#: src/main.c:702 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1767,17 +1781,17 @@ " --random-wait laukti tarp 0...2*WAIT sekundžių tarp " "atsiuntimų.\n" -#: src/main.c:703 +#: src/main.c:704 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy bÅ«tinai iÅ¡jungti tarpinÄ™ stotį.\n" -#: src/main.c:705 +#: src/main.c:706 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=SKAIÄŒIUS nustatyti parsiuntimo į SKAIÄŒIŲ.\n" -#: src/main.c:707 +#: src/main.c:708 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1786,18 +1800,18 @@ " --bind-address=ADRESAS susieti su ADRESU (kompiuterio vardu ar\n" " IP adresu) vietiniame kompiuteryje.\n" -#: src/main.c:709 +#: src/main.c:710 #, 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:711 +#: src/main.c:712 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache iÅ¡jungti DNS paieÅ¡kų spartinimÄ….\n" -#: src/main.c:713 +#: src/main.c:714 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1806,7 +1820,7 @@ " --restrict-file-names=OS apriboti simbolius failų varduose į " "palaikomus OS.\n" -#: src/main.c:715 +#: src/main.c:716 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1815,17 +1829,17 @@ " --ignore-case ignoruoti registrÄ… filtruojant failus/" "aplankus.\n" -#: src/main.c:718 +#: src/main.c:719 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only jungtis tik prie IPv4 adresų.\n" -#: src/main.c:720 +#: src/main.c:721 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only jungtis tik prie IPv6 adresų.\n" -#: src/main.c:722 +#: src/main.c:723 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1836,23 +1850,23 @@ "adresų:\n" " „IPv6“, „IPv4“ arba „none“.\n" -#: src/main.c:726 +#: src/main.c:727 #, 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:728 +#: src/main.c:729 #, 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:730 +#: src/main.c:731 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --password=SLAPTAŽODIS nustatyti FTP ir HTTP slaptažodį.\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1863,88 +1877,88 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-proxy bÅ«tinai iÅ¡jungti tarpinÄ™ stotį.\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:743 +#: src/main.c:744 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --no-glob iÅ¡jungti FTP failų vardų „globbing“.\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Aplankai:\n" -#: src/main.c:763 +#: src/main.c:764 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories nekurti aplankų.\n" -#: src/main.c:765 +#: src/main.c:766 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories priverstinai kurti aplankus.\n" -#: src/main.c:767 +#: src/main.c:768 #, 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:769 +#: src/main.c:770 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories aplankuose naudoti protokolo vardÄ….\n" -#: src/main.c:771 +#: src/main.c:772 #, 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:773 +#: src/main.c:774 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -1953,32 +1967,32 @@ " --cut-dirs=SKAIÄŒIUS ignoruoti SKAIÄŒIŲ nutolusio aplanko " "komponentų.\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP parametrai:\n" -#: src/main.c:779 +#: src/main.c:780 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=NAUDOTOJAS nustatyti HTTP naudotojÄ….\n" -#: src/main.c:781 +#: src/main.c:782 #, fuzzy msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=SLAPTAŽODIS nustatyti HTTP slaptažodį.\n" -#: src/main.c:783 +#: src/main.c:784 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache neleisti duomenų serverio kaupe.\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:788 +#: src/main.c:789 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -1986,44 +2000,42 @@ msgstr "" " -E, --html-extension įraÅ¡yti HTML dokumentus su „.html“ priesaga.\n" -#: src/main.c:790 +#: src/main.c:791 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length ignoruoti „Content-Length“ antraÅ¡tÄ™.\n" -#: src/main.c:792 +#: src/main.c:793 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=TEKSTAS įterpti TEKSTÄ„ tarp antraÅ¡Äių.\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=TYPE nurodyti progreso indikatoriaus tipÄ….\n" -#: src/main.c:798 +#: src/main.c:799 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maksimalus peradresavimų skaiÄius puslapiui.\n" -#: src/main.c:800 +#: src/main.c:801 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=NAUDOTOJAS nustatyti tarpinÄ—s stoties naudotojÄ….\n" -#: src/main.c:802 +#: src/main.c:803 #, 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:804 +#: src/main.c:805 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2032,12 +2044,12 @@ " --referer=URL įtraukti „Referer: URL“ antraÅ¡tÄ™ HTTP " "užklausoje.\n" -#: src/main.c:806 +#: src/main.c:807 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers įraÅ¡yti HTTP antraÅ¡tes į failÄ….\n" -#: src/main.c:808 +#: src/main.c:809 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2045,7 +2057,7 @@ msgstr "" " -U, --user-agent=AGENTAS prisistatyti AGENTU vietoje „Wget/VERSIJA“.\n" -#: src/main.c:810 +#: src/main.c:811 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2054,31 +2066,31 @@ " --no-http-keep-alive iÅ¡jungti HTTP keep-alive (ilgalaikiai " "prisijungimai).\n" -#: src/main.c:812 +#: src/main.c:813 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies nenaudoti slapukų.\n" -#: src/main.c:814 +#: src/main.c:815 #, 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:816 +#: src/main.c:817 #, 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:818 +#: src/main.c:819 #, 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:820 +#: src/main.c:821 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2087,7 +2099,7 @@ " --post-data=TEKSTAS naudoti POST metodÄ…; siųsti TEKSTÄ„ kaip " "duomenis.\n" -#: src/main.c:822 +#: src/main.c:823 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2095,12 +2107,12 @@ msgstr "" " --post-file=FAILAS naudoti POST metodÄ…; siųsti FAILO turinį.\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " @@ -2109,7 +2121,7 @@ " --post-data=TEKSTAS naudoti POST metodÄ…; siųsti TEKSTÄ„ kaip " "duomenis.\n" -#: src/main.c:828 +#: src/main.c:829 #, fuzzy msgid "" " --body-file=FILE send contents of FILE. --method MUST be " @@ -2117,7 +2129,7 @@ msgstr "" " --post-file=FAILAS naudoti POST metodÄ…; siųsti FAILO turinį.\n" -#: src/main.c:830 +#: src/main.c:831 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2129,13 +2141,13 @@ " parenkant vietinių failų vardus " "(EKSPERIMENTINIS).\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2147,11 +2159,11 @@ "informacijÄ…\n" " nelaukiant serverio užklausimo.\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) parametrai:\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2161,45 +2173,45 @@ " --secure-protocol=PR rinktis saugų protokolÄ…: „auto“, „SSLv2“,\n" " „SSLv3“ arba „TLSv1“.\n" -#: src/main.c:847 +#: src/main.c:848 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr " -L, --relative sekti tik reliatyvias nuorodas.\n" -#: src/main.c:849 +#: src/main.c:850 #, fuzzy msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate nevaliduoti serverio sertifikato.\n" -#: src/main.c:851 +#: src/main.c:852 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FAILAS kliento sertifikato failas.\n" -#: src/main.c:853 +#: src/main.c:854 #, 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:855 +#: src/main.c:856 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FAILAS privataus rakto failas.\n" -#: src/main.c:857 +#: src/main.c:858 #, 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:859 +#: src/main.c:860 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FAILAS failas su CA rinkiniu.\n" -#: src/main.c:861 +#: src/main.c:862 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " @@ -2208,12 +2220,12 @@ " --ca-directory=DIR aplankas, kuriame saugomas CA maišų " "sÄ…raÅ¡as.\n" -#: src/main.c:863 +#: src/main.c:864 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=FAILAS failas su CA rinkiniu.\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2223,7 +2235,7 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2232,7 +2244,7 @@ " --random-file=FAILAS failas su atsitiktiniais duomenimis SSL\n" " PRNG inicializacijai.\n" -#: src/main.c:875 +#: src/main.c:876 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " @@ -2241,7 +2253,7 @@ " --egd-file=FILE EGD lizdo failas su atsitiktiniais " "duomenimis.\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2251,65 +2263,65 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 #, fuzzy msgid "HSTS options:\n" msgstr "HTTP parametrai:\n" -#: src/main.c:888 +#: src/main.c:889 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-cache neleisti duomenų serverio kaupe.\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP parametrai:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:901 +#: src/main.c:902 #, fuzzy msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=NAUDOTOJAS nustatyti FTP naudotojÄ….\n" -#: src/main.c:903 +#: src/main.c:904 #, fuzzy msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=SLAPTAŽODIS nustatyti FTP slaptažodį.\n" -#: src/main.c:905 +#: src/main.c:906 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing neÅ¡alinti „.listing“ failų.\n" -#: src/main.c:907 +#: src/main.c:908 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob iÅ¡jungti FTP failų vardų „globbing“.\n" -#: src/main.c:909 +#: src/main.c:910 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp iÅ¡jungti „pasyvią“ persiuntimo veiksenÄ….\n" -#: src/main.c:911 +#: src/main.c:912 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions iÅ¡saugoti nutolusio failo leidimus.\n" -#: src/main.c:913 +#: src/main.c:914 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2318,54 +2330,54 @@ " --retr-symlinks siunÄiant rekursyviai, siųsti simbolinių\n" " nuorodų rodomus failus (ne aplankus).\n" -#: src/main.c:918 +#: src/main.c:919 #, fuzzy msgid "FTPS options:\n" msgstr "FTP parametrai:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 #, fuzzy msgid "WARC options:\n" msgstr "FTP parametrai:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --header=TEKSTAS įterpti TEKSTÄ„ tarp antraÅ¡Äių.\n" -#: src/main.c:937 +#: src/main.c:938 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" @@ -2373,28 +2385,28 @@ " -t, --tries=SKAIÄŒIUS nustatyti bandymų parsiųsti SKAIÄŒIŲ (0 – " "neriboti).\n" -#: src/main.c:939 +#: src/main.c:940 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider nieko nesiųsti.\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-cookies nenaudoti slapukų.\n" -#: src/main.c:949 +#: src/main.c:950 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2403,23 +2415,23 @@ " --ignore-case ignoruoti registrÄ… filtruojant failus/" "aplankus.\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekursyvus siuntimas:\n" -#: src/main.c:958 +#: src/main.c:959 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive siųsti failus rekursyviai.\n" -#: src/main.c:960 +#: src/main.c:961 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2428,14 +2440,14 @@ " -l, --level=SKAIÄŒIUS maksimalus rekursijos gylis (inf arba 0 " "begalybei).\n" -#: src/main.c:962 +#: src/main.c:963 #, fuzzy msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after iÅ¡trinti failus juos parsiuntus.\n" -#: src/main.c:964 +#: src/main.c:965 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2445,19 +2457,19 @@ " -k, --convert-links pakeisti nuorodas parsiųstame HTML, kad rodytų\n" " į vietinius failus.\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2467,7 +2479,7 @@ "atsarginÄ™\n" " kopijÄ… „X.orig“.\n" -#: src/main.c:976 +#: src/main.c:977 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2477,7 +2489,7 @@ "atsarginÄ™\n" " kopijÄ… „X.orig“.\n" -#: src/main.c:979 +#: src/main.c:980 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2485,7 +2497,7 @@ msgstr "" " -m, --mirror „-N -r -l inf --no-remove-listing“ santrumpa.\n" -#: src/main.c:981 +#: src/main.c:982 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2494,7 +2506,7 @@ " -p, --page-requisites parsiųsti visus paveikslÄ—lius ir kt. failus,\n" " reikalingus HTML puslapiui parodyti.\n" -#: src/main.c:983 +#: src/main.c:984 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2503,11 +2515,11 @@ " --strict-comments įjungti griežtÄ… (SGML) HTML komentarų " "apdorojimÄ….\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Rekursyvus priÄ—mimas/atmetimas:\n" -#: src/main.c:989 +#: src/main.c:990 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2516,7 +2528,7 @@ " -A, --accept=SÄ„RAÅ AS kableliais atskirtas imamų plÄ—tinių " "sÄ…raÅ¡as.\n" -#: src/main.c:991 +#: src/main.c:992 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2525,27 +2537,27 @@ " -R, --reject=SÄ„RAÅ AS kableliais atskirtas atmetamų plÄ—tinių " "sÄ…raÅ¡as.\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --progress=TYPE nurodyti progreso indikatoriaus tipÄ….\n" -#: src/main.c:1001 +#: src/main.c:1002 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --progress=TYPE nurodyti progreso indikatoriaus tipÄ….\n" -#: src/main.c:1004 +#: src/main.c:1005 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2553,7 +2565,7 @@ " -D, --domains=SÄ„RAÅ AS kableliais atskirtas imamų domenų " "sÄ…raÅ¡as.\n" -#: src/main.c:1006 +#: src/main.c:1007 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" @@ -2561,14 +2573,14 @@ " --exclude-domains=SÄ„RAÅ AS kableliais atskirtas atmetamų domenų " "sÄ…raÅ¡as.\n" -#: src/main.c:1008 +#: src/main.c:1009 #, 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:1010 +#: src/main.c:1011 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2577,7 +2589,7 @@ " --follow-tags=SÄ„RAÅ AS kableliais atskirtas sekamų HTML žymių " "sÄ…raÅ¡as.\n" -#: src/main.c:1012 +#: src/main.c:1013 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2586,144 +2598,144 @@ " --ignore-tags=SÄ„RAÅ AS kableliais atskirtas ignoruojamų\n" " HTML žymių sÄ…raÅ¡as.\n" -#: src/main.c:1014 +#: src/main.c:1015 #, 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:1016 +#: src/main.c:1017 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative sekti tik reliatyvias nuorodas.\n" -#: src/main.c:1018 +#: src/main.c:1019 #, 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:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:1023 +#: src/main.c:1024 #, 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:1025 +#: src/main.c:1026 #, 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "" "Siųskite praneÅ¡imus apie klaidas ir pasiÅ«lymus adresu .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, neinteraktyvus parsiuntiklis.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "" -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "" -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "" -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2008 Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2737,7 +2749,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2745,67 +2757,67 @@ "\n" "ParaÅ¡Ä— Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 #, 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:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Pabandykite „%s --help“, jei norite daugiau informacijos.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: netaisyklingas parametras – „-n%c“\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2817,7 +2829,7 @@ "-p arba -r. Daugiau informacijos žinyne..\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2827,7 +2839,7 @@ "įraÅ¡ytas į vienintelį nurodytÄ… failÄ….\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2837,138 +2849,138 @@ "informacijos žinyne.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: trÅ«ksta URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: nepavyko rasti adreso „%s“\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "%s nerasta URL adresų.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Nepavyko paÅ¡alinti „%s“: %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2257 +#: src/main.c:2264 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2978,7 +2990,7 @@ "BAIGTA --%s--\n" "Parsiųsta: %d failų, %s per %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Parsiuntimo kvota (%s) VIRÅ YTA!\n" @@ -3144,7 +3156,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "TÄ™siama fone, proceso numeris %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "IÅ¡vestis bus įraÅ¡yta į „%s“.\n" @@ -3189,76 +3201,76 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: nepavyko patikrinti %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "DÄ–MESIO: naudojamas silpnas „random seed“.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Nepavyko inicializuoti PRNG; naudokite --random-file parametrÄ….\n" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: NekorektiÅ¡kas URL adresas %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "Nepavyko inicializuoti PRNG; naudokite --random-file parametrÄ….\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Nepavyko lokaliai verifikuoti iÅ¡davÄ—jo autoriteto.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Rastas savo-pasiraÅ¡ytas sertifikatas.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " IÅ¡duotas sertifikatas dar nevalidus.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " IÅ¡duoto sertifikato galiojimo laikas baigÄ—si.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, 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:985 +#: src/openssl.c:989 #, 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:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3266,7 +3278,7 @@ " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3317,22 +3329,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Ä®keliamas robots.txt; nekreipkite dÄ—mesio į klaidas.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Klaida apdorojant tarpinÄ—s stoties URL %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "virÅ¡yta %d peradresavimų.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3340,7 +3352,7 @@ "Pasiduodama.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3415,120 +3427,129 @@ msgid "HTTPS support not compiled in" msgstr "" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "TÄ™siama fone, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nepavyko iÅ¡trinti simbolinÄ—s nuorodos „%s“: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Nepavyko paÅ¡alinti „%s“: %s\n" +msgstr "" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Nepavyko paÅ¡alinti „%s“: %s\n" +msgstr "" -#: src/utils.c:872 +#: src/utils.c:878 #, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: nepavyko rasti adreso „%s“\n" +msgstr "" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "nepavyko prisijungti prie %s prievado %d: %s\n" +msgstr "" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Klaida raÅ¡ant į „%s“: %s\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, fuzzy, c-format msgid "Error opening WARC file %s.\n" msgstr "Klaida apdorojant tarpinÄ—s stoties URL %s: %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3540,61 +3561,50 @@ msgstr[1] "" msgstr[2] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgid "%s: option `--%s' doesn't allow an argument\n" #~ msgstr "%s: parametras „--%s“ neleidžia argumento\n" -#, fuzzy -#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgid "%s: unrecognized option `--%s'\n" #~ msgstr "%s: neatpažintas parametras „--%s“\n" -#, fuzzy -#~ msgid "%s: option '-W %s' is ambiguous\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" -#, fuzzy -#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgid "%s: option `-W %s' doesn't allow an argument\n" #~ msgstr "%s: parametras „-W %s“ neleidžia argumento\n" -#, fuzzy -#~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: parametrui „%s“ reikia argumento\n" - -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "Failas „%s“ jau egzistuoja; nesiunÄiama.\n" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: neleistinas pasirinkimas – %c\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Autorizavimas nepavyko.\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/nb.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/nb.gmo differ diff -Nru wget-1.19.5/po/nb.po wget-1.20.1/po/nb.po --- wget-1.19.5/po/nb.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/nb.po 2018-12-26 20:10:50.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) 1998 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Robert Schmidt , 1998. -# Ã…ka Sikrom , 2017. +# Ã…ka Sikrom , 2018. # msgid "" msgstr "" -"Project-Id-Version: wget-1.18.109\n" +"Project-Id-Version: wget-1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-01-24 09:40+0100\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-18 22:33+0100\n" "Last-Translator: Ã…ka Sikrom \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" @@ -18,7 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 2.0.6\n" #: lib/error.c:195 msgid "Unknown system error" @@ -101,29 +101,29 @@ msgstr "Ukjent feil" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: valget «%s» er flertydig\n" +msgstr "%s: valget «%s%s» er flertydig\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: valget «%s» er flertydig, og kan bety følgende:" +msgstr "%s: valget «%s%s» er flertydig, og kan bety følgende:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: «%c%s» er et ukjent valg\n" +msgstr "%s: «%s%s» er et ukjent valg\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: valget «%c%s» tillater ikke bruk av argumenter\n" +msgstr "%s: valget «%s%s» tillater ikke bruk av argumenter\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: valget «--%s» krever et argument\n" +msgstr "%s: valget «%s%s» krever et argument\n" #: lib/getopt.c:621 #, c-format @@ -232,17 +232,17 @@ msgid "Unmatched ) or \\)" msgstr "Ingen treff pÃ¥ «)» eller «\\)»" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Intet tidligere regulært uttrykk" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "klarte ikke Ã¥ lage datarør" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -306,7 +306,7 @@ msgid "failed: %s.\n" msgstr "mislyktes: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: klarte ikke Ã¥ slÃ¥ opp vertsnavn %s\n" @@ -431,12 +431,12 @@ msgid "Length: %s" msgstr "Lengde: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) gjenstÃ¥r" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s gjenstÃ¥r" @@ -605,7 +605,7 @@ "Fila eller mappa %s finnes ikke.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s har begynt Ã¥ eksistere.\n" @@ -628,17 +628,17 @@ msgid "Data transfer aborted.\n" msgstr "Dataoverføring avbrutt.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, 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:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(prøv:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -647,7 +647,7 @@ "%s (%s) - skrevet til standard utkanal %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -656,8 +656,8 @@ "%s (%s) - %s lagret [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Fjerner %s.\n" @@ -754,162 +754,178 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Avviser %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Avviser %s (ugyldig oppføring).\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s er utelatt/ekskludert med reg.uttrykk.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Feil ved utlikning av %s mot %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ingen treff pÃ¥ mønsteret %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Lagret indeks i HTML-format til %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Lagret indeks i HTML-format til %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "Feil: Klarte ikke Ã¥ Ã¥pne mappa %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "FEIL: Klarte ikke Ã¥ Ã¥pne sertifikatet s%s: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Lastet inn CA-sertifikat «%s»\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Latet inn CRL-fil «%s»\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Installert GnuTLS-versjon er for gammel til Ã¥ støtte TLSv1.3\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: verdi %d er ikke implementert for valget «secure-protocol»\n" +msgstr "GnuTLS: verdi %u er ikke implementert for valget «secure-protocol»\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: Klarte ikke Ã¥ endre prioritetsstreng skikkelig. Faller tilbake pÃ¥ " +"forvalgt prioritet.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "FEIL" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "ADVARSEL" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s la ikke frem et sertifikat.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Sertifikatet pÃ¥ %s kommer ikke fra en kjent utgiver.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Sertifikatet pÃ¥ %s er tilbakekalt.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Sertifikatet pÃ¥ %s er utgÃ¥tt.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Feil ved innlasting av X509-sertifikat: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Fant ingen sertifikat\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Feil ved lesing av sertifikat: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Sertifikatet er ikke aktivt ennÃ¥\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Sertifikatet er utgÃ¥tt\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Sertifikatet mÃ¥ være av typen X.509\n" @@ -949,11 +965,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Feil ved skriving av HTTP-forespørsel: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Ingen linjer. Antar at HTTP/0.9 er gjeldende" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -962,11 +978,11 @@ "Fila %s ligger allerede der, og blir ikke lastet ned pÃ¥ nytt.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime mislyktes. Dette er sannsynligvis en programfeil.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -974,55 +990,55 @@ "Klarte ikke Ã¥ konvertere tidsstempel til http-format. Bruker «time 0» som " "tidspunkt for endring.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY-datafila %s mangler: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Bruker etablert tilkobling til [%s]:%d pÃ¥ nytt.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Bruker etablert tilkobling til %s:%d pÃ¥ nytt.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Lesing av respons fra mellomtjener mislyktes: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s PROGRAMFEIL %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Feilutformet statuslinje" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tunnelsending via mellomtjener mislyktes: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Ukjent autentiseringsmetode.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Autentisering valgt: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Lagrer til: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1031,21 +1047,21 @@ "Ved nedlasting av signatur:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Ugyldig pri-verdi. Bruker %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1053,42 +1069,42 @@ "Fant ingen akseptabel behandlingsmetode for Metalink-ressurser.\n" "De blir derfor ignorert.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "SlÃ¥r av SSL pÃ¥ grunn av oppstÃ¥tte programfeil.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-forespørsel sendt. Venter pÃ¥ svar … " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Ingen data mottatt.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Lesefeil (%s) i hodelinjer.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(ingen beskrivelse)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Plassering: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "ikke angitt" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [følgende]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1097,7 +1113,7 @@ "Fila %s er ikke endret pÃ¥ tjener. Lar være Ã¥ laste ned.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1108,7 +1124,7 @@ "Du bør vurdere Ã¥ bruke valget «--no-if-modified-since».\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1118,81 +1134,81 @@ " Fila er allerede lastet ned i sin helhet.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Lengde: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignorert" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Advarsel: jokertegn støttes ikke i HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Klarte ikke Ã¥ skrive til %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Obligatorisk attributt mangler pÃ¥ mottatt linje.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Autentisering med brukernavn og passord mislyktes.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Klarte ikke Ã¥ skrive til WARC-fil.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Klarte ikke Ã¥ skrive til midlertidig WARC-fil.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Klarte ikke Ã¥ sette opp SSL-tilkobling.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Klarte ikke Ã¥ fjerne lenke til %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "PROGRAMFEIL: Videresending (%d) uten plassering.\n" -#: src/http.c:4458 +#: src/http.c:4464 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:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Fant Metalink-hoder. GÃ¥r i Metalink-modus.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Ekstern fil finnes ikke. Død lenke!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Linja «Last-modified» mangler. Tidsstempler er slÃ¥tt av.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Linja «Last-modified» er ugyldig. Tidsstempler ignoreres.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1202,16 +1218,16 @@ "lastet ned.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Ekstern versjon av fila er nyest, og blir lastet ned.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1221,7 +1237,7 @@ "ned.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1229,7 +1245,7 @@ "Ekstern fil finnes, men inneholder ingen lenke. Laster ikke ned.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1239,7 +1255,7 @@ "men jobbing i undermapper er slÃ¥tt av. Laster ikke ned.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1247,12 +1263,12 @@ "Ekstern fil finnes.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s nettadresse: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1261,7 +1277,7 @@ "%s (%s) - skrevet til standard utkanal %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1270,58 +1286,58 @@ "%s (%s) - %s lagret [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Tilkobling lukket ved byte %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lesefeil ved byte %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lesefeil ved byte %s/%s (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Beskyttelseskvalitet «%s» støttes ikke.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmen «%s» støttes ikke.\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, 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" +msgstr "%s: WGETRC peker pÃ¥ %s, som ble avvist pÃ¥ grunn av feil: %s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Klarte ikke Ã¥ lese %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Feil i %s pÃ¥ linje %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaksfeil i %s pÃ¥ linje %d.\n" -#: src/init.c:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1333,7 +1349,7 @@ "«%s»,\n" "eller velg en annen fil med «--config».\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1344,49 +1360,49 @@ "«%s»,\n" "eller velg en annen fil med «--config».\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: %s er en ugyldig «--execute»-kommando\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: %s er et ugyldig tall.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s kan bare brukes én gang\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: %s er en ugyldig byte-verdi\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: %s er en ugyldig tidsperiode\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1395,28 +1411,28 @@ "use-askpass krever at miljøvariabel WGET_ASKPASS eller SSH_ASKPASS har en " "verdi.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: %s er en ugyldig verdi.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: %s er en ugyldig linje.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: %s er en ugyldig WARC-linje.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: %s er en ugyldig framdriftstype.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1430,16 +1446,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Kodinga %s er ugyldig\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Fant ufullstendig eller ugyldig multibyte-sekvens\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "UhÃ¥ndtert feilnummer %d\n" @@ -1472,12 +1488,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s. SlÃ¥r av loggføring.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Bruk: %s [VALG] … [NETTADRESSE] …\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1486,62 +1502,62 @@ "korte valg.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Oppstart:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version vis versjonsinformasjon og avslutt.\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help vis denne hjelpeteksten\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background kjør i bakgrunnen etter oppstart\n" -#: src/main.c:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Loggføring og inndatafil:\n" -#: src/main.c:608 +#: src/main.c:609 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:610 +#: src/main.c:611 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:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug skriv ut en haug av " "feilsøkingsinformasjon\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug skriv ut Watt-32-feilsøkingsinformasjon\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet stillemodus (ingen utdata)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose skriv ut detaljert info (dette er " "standard)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1549,13 +1565,13 @@ " -nv, --no-verbose ikke skriv ut detaljer, men ikke vær helt " "stille\n" -#: src/main.c:626 +#: src/main.c:627 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:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1563,7 +1579,7 @@ " -i, --input-file=FIL last ned nettadresser som finnes i valgt " "FIL\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1571,11 +1587,11 @@ " --input-metalink=FIL last ned filer som stÃ¥r oppført i lokal " "Metalink-FIL\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html behandle inndatafil som HTML\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1584,51 +1600,50 @@ "F»)\n" " relativt til valgt nettADResse\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=FIL velg oppsettsfil som skal brukes\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-config ikke les oppsettsfil(er)\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Last ned:\n" -#: src/main.c:649 +#: src/main.c:650 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:651 +#: src/main.c:652 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:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=LISTE kommaseparert liste over HTML-tagger som " -"skal ignoreres\n" +" --retry-on-http-error=FEIL kommaseparert liste over HTML-tagger " +"som skal prøves pÃ¥ nytt\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FIL lagre dokumenter i valgt FIL\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1636,14 +1651,15 @@ " -nc, --no-clobber hopp over nedlastinger som ville ha\n" " overskrevet eksisterende filer\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-config ikke les oppsettsfil(er)\n" +msgstr "" +" --no-netrc ikke prøv Ã¥ hente akkreditiver fra ." +"netrc\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1651,7 +1667,7 @@ " -c, --continue fortsett nedlasting av en delvis " "nedlastet fil\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1659,11 +1675,11 @@ " --start-pos=POS start nedlasting fra valgt POSisjon, talt fra " "null\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYPE velg en TYPE framdriftsviser\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1671,7 +1687,7 @@ " --show-progress vis framdriftsviser uansett grad av " "detaljer som skrives ut\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1680,7 +1696,7 @@ " -N, --timestamping ikke hent filer pÃ¥ nytt med mindre de er\n" " nyere enn de lokale\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1689,7 +1705,7 @@ " --no-if-modified-since ikke bruk betinget «if-modified-since»\n" " forespørsler i tidsstempel-modus\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1697,21 +1713,21 @@ " --no-use-server-timestamps ikke gi lokale filer samme tidsstempel\n" " som tjenerens filer\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response skriv ut svarmelding fra tjener\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider ikke last ned noe\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1719,7 +1735,7 @@ " --dns-servers=ADRESSER liste over DNS-tjenere som skal spørres " "(adskilt med komma)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1727,31 +1743,31 @@ " --bind-dns-address=ADRESSE knytt DNS-oppslagsverktøy til valgt " "ADRESSE (vertsnavn eller IP) pÃ¥ lokal vert\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 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:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1759,7 +1775,7 @@ " --waitretry=SEKUNDER vent 1…SEKunder mellom gjentatte forsøk " "pÃ¥ nedlasting\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1767,17 +1783,17 @@ " --random-wait vent fra 0.5*WAIT … 1.5*WAIT sekunder " "mellom nedlastinger\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy la aktivt være Ã¥ bruke mellomtjener\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ANTALL bruk valgt ANTALL nedlastinger som kvote\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1785,16 +1801,16 @@ " --bind-address=ADRESSE tildel lokal vert valgt ADRESSE " "(vertsnavn eller IP)\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=FART begrens nedlasting til valgt FART\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache slÃ¥ av hurtiglagring av DNS-oppslag\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1802,7 +1818,7 @@ " --restrict-file-names=OS bare la filnavn inneholde tegn som " "operativsystemet tillater\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1810,15 +1826,15 @@ " --ignore-case ikke skill mellom store og smÃ¥ bokstaver " "ved sammenlikning av filer og mapper\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only bare koble til IPv4-adresser\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only bare koble til IPv6-adresser\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1828,24 +1844,24 @@ "valgt familie\n" " (enten «IPv6», «IPv4», eller «none»)\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password be om passord\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1863,27 +1879,27 @@ "WGET_ASKPASS eller\n" " SSH_ASKPASS.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri slÃ¥ av IRI-støtte\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink fjern fil før ting blir rotete\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1891,7 +1907,7 @@ " --keep-badhash behold filer som ikke samsvarer med " "kontrollsum (legg til «.badhash»)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1899,7 +1915,7 @@ " --metalink-index=TALL Metalenke application/metalink4+xml meta-" "adresse ordinær TALL\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1907,7 +1923,7 @@ " --metalink-over-http bruk Metalink-metadata fra HTTP-" "svarhoder\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1915,39 +1931,40 @@ " --preferred-location foretrukket plassering av Metalink-" "ressurser\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr slÃ¥ av lagring av metadata i utvidede " "filattributter\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Mapper:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ikke lag nye mapper\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories tving opprettelse av mapper\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ikke lag vertsmapper\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories bruk protokollnavn pÃ¥ mapper\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIKS lagre filer i PREFIKS/…\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1955,26 +1972,26 @@ " --cut-dirs=ANTALL ignorer valgt ANTALL eksterne " "mappekomponenter\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP-valg:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=BRUKER bruk valgt BRUKER som http-bruker\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-password=PASS bruk valgt PASSord som http-passord\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache ikke tillat mellomlagring av data pÃ¥ " "tjener\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1982,7 +1999,7 @@ " --default-page=NAVN Endre standard sidenavn (vanligvis «index." "html»)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1990,52 +2007,53 @@ " -E, --adjust-extension lagre HTML-/CSS-dokumenter med korrekt " "filetternavn\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length ignorer «Content-Length»-linja\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=STRENG sett inn STRENG blant hodelinjene\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TYPE velg en TYPE framdriftsviser\n" +msgstr "" +" --compression=TYPE velg komprimering («auto», «gzip» eller " +"«none»). (forvalgt: none)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maksimalt antall videresendinger per side\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=BRUKER bruk valgt BRUKER som mellomtjener-" "brukernavn\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=PASS bruk valgt PASSord som mellomtjener-" "passord\n" -#: src/main.c:804 +#: src/main.c:805 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:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers lagre HTTP-hodelinjer i en fil\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2043,7 +2061,7 @@ " -U, --user-agent=AGENT oppgi valgt AGENTnavn, i stedet for «Wget/" "VERSJON»\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2051,24 +2069,24 @@ " --no-http-keep-alive slÃ¥ av «HTTP keep-alive» (bevaring av " "forbindelser)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ikke bruk informasjonskapsler\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2076,14 +2094,14 @@ " --keep-session-cookies last inn og lagre (ikke-permanente) " "infokapsler for økter\n" -#: src/main.c:820 +#: src/main.c:821 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:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2091,13 +2109,13 @@ " --post-file=FIL bruk POST-metoden og send innholdet i " "valgt FIL\n" -#: src/main.c:824 +#: src/main.c:825 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:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2105,7 +2123,7 @@ " --body-data=STRENG send valgt STRENG som data (NB: «--" "method» MÃ… være valgt)\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2113,7 +2131,7 @@ " --body-file=FIL send innhold i valgt FIL (NB: «--method» " "MÃ… være valgt)\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2124,7 +2142,7 @@ "ved\n" " valg av filnavn (USTABILT)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2132,7 +2150,7 @@ " --content-on-error skriv ut mottatt innhold i feilmeldinger " "fra tjener\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2143,12 +2161,11 @@ " uten Ã¥ vente pÃ¥ etterspørsel fra\n" " tjeneren.\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS(SSL-/TLS-)-valg :\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" @@ -2156,45 +2173,46 @@ msgstr "" " --secure-protocol=PR velg sikkerhetsprotokoll. Enten «auto», " "«SSLv2»,\n" -" «SSLv3», «TLSv1» eller «PFS».\n" +" «SSLv3», «TLSv1», «TLSv1_1, «TLSv1_2» " +"eller «PFS».\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only bare følg HTTPS-lenker\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate ikke kontroller tjenerens sertifikat\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FIL klientens sertifikatFIL\n" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE klientens sertifikatTYPE («PEM» eller " "«DER»)\n" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FIL privatnøkkel-FIL\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 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:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2202,11 +2220,11 @@ " --ca-directory=MAPPE hvilken MAPPE nøkkellista over CA-er " "ligger i\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FIL fil med liste over CRL-er\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2221,14 +2239,14 @@ " sha256-kontrollsummer adskilt med «;»,\n" " til bekreftelse av motpart\n" -#: src/main.c:871 +#: src/main.c:872 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:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2236,7 +2254,7 @@ " --egd-file=FIL fil med vilkÃ¥rlighetsdata for navngivning " "av EGD-sokkel\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2245,16 +2263,22 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=STR Velg prioritetsstreng (GnuTLS) eller " +"algoritmeliste-streng (OpenSSL) direkte.\n" +" Bruk med varsomhet. Dette valget " +"overstyrer «--secure-protocol».\n" +" Format og syntaks for denne strengen " +"avhenger av hvilken SSL-/TLS-motor som i er i bruk.\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "HSTS-valg:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts slÃ¥ av HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2262,11 +2286,11 @@ " --hsts-file sti til HSTS-database (overstyrer " "standardsti)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP-valg:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2274,36 +2298,36 @@ " --ftp-stmlf bruk formatet Stream_LF pÃ¥ alle binære " "FTP-filer\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=BRUKER bruk valgt BRUKER som ftp-bruker\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" " --ftp-password=PASS bruk valgt PASSord som ftp-passord\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ikke fjern «.listing»-filer\n" -#: src/main.c:907 +#: src/main.c:908 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:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp slÃ¥ av «passiv» overføringsmodus\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions behold tjenerens oppsett av " "filtillatelser\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2311,11 +2335,11 @@ " --retr-symlinks hent lenkemÃ¥l (unntatt mapper) ved arbeid " "i mappehierarkier\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTPS-valg:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2323,7 +2347,7 @@ " --ftps-implicit bruk implisitt FTPS (standardport er " "990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2333,7 +2357,7 @@ "kontrolltilkobling ved Ã¥pning av\n" " datatilkobling\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2341,7 +2365,7 @@ " --ftps-clear-data-connection bare krypter kontroll-kanalen (alle " "data sendes i form av ren tekst)\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2349,11 +2373,11 @@ " --ftps-fallback-to-ftp bruk FTP hvis FTPS ikke støttes av " "tjeneren\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC-valg:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2361,25 +2385,25 @@ " --warc-file=FILNAVN lagre foresp.-/svardata i en «.warc.gz»-" "fil\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx skriv CDX-indeksfiler\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2387,24 +2411,24 @@ " --warc-dedup=FILNAVN ikke lagre oppføringer som er oppført i " "denne CDX-fila\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ikke beregn SHA1-kontrollsummer\n" -#: src/main.c:949 +#: src/main.c:950 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:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2412,17 +2436,17 @@ msgstr "" " --warc-tempdir=MAPPE plassering av midlertidige WARC-filer\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Nedlasting av underliggende hierarki:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr "" " -r, --recursive last ned underliggende filer og/eller " "mapper\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2430,7 +2454,7 @@ " -l, --level=TALL maksimal hierarkidybde (bruk «inf» eller 0 " "for ubegrenset)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2438,7 +2462,7 @@ " --delete-after slett filer lokalt nÃ¥ de er ferdig lastet " "ned\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2448,7 +2472,7 @@ "eller CSS-filer,\n" " slik at de peker pÃ¥ lokale filer\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2456,7 +2480,7 @@ " --convert-file-only bare konverter fil-del av adresser " "(vanligvis kjent som basenavn eller «basename»)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2464,7 +2488,7 @@ " --backups=N rullér pÃ¥ N antall sikkerhetskopier før " "fil X lagres\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2472,7 +2496,7 @@ " -K, --backup-converted sikkerhetskopier fil X som X_orig før den " "konverteres\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2480,7 +2504,7 @@ " -K, --backup-converted sikkerhetskopier fil X som X_orig før den " "konverteres\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2488,7 +2512,7 @@ " -m, --mirror tilsvarer «-N -r -l inf --no-remove-" "listing»\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2496,7 +2520,7 @@ " -p, --page-requisites hent alle bilder osv. som behøves for Ã¥ " "vise aktuelle HTML-sider\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2504,11 +2528,11 @@ " --strict-comments slÃ¥ pÃ¥ streng hÃ¥ndtering av HTML-" "kommentarer (SGML)\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Godkjenning/avvisning i hierarkier:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2516,7 +2540,7 @@ " -A, --accept=LISTE kommaseparert liste over filetternavn som " "skal godtas\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2524,45 +2548,45 @@ " -R, --reject=LISTE kommaseparert liste over filetternavn som " "skal avvises\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REG.UTTR. uttrykk for nettadresser som skal godtas\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REG.UTTR. uttrykk for nettadresser som skal " "avvises\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TYPE uttrykkstype (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYPE uttrykkstype (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr " --follow-ftp følg FTP-lenker i HTML-dokumenter\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2570,7 +2594,7 @@ " --follow-tags=LISTE kommaseparert liste over HTML-tagger som " "skal følges\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2578,21 +2602,21 @@ " --ignore-tags=LISTE kommaseparert liste over HTML-tagger som " "skal ignoreres\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative bare følg relative lenker\n" -#: src/main.c:1018 +#: src/main.c:1019 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:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2601,89 +2625,90 @@ " --trust-server-names bruk navn fra siste del av " "videresendingsadressen\n" -#: src/main.c:1023 +#: src/main.c:1024 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:1025 +#: src/main.c:1026 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:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" -msgstr "Send feilrapporter og forslag til \n" +msgstr "Send feilrapporter, spørsmÃ¥l og diskusjoner til \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"og/eller send inn problemrapporter pÃ¥ https://savannah.gnu.org/bugs/?" +"func=additem&group=wget.\n" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Passord for %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Passord: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Klarte ikke Ã¥ lage datarør\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Brukernavn for «%s%s»: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Passord «%s%s@%s»: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Region: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Kompilering: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Lenke: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2692,29 +2717,29 @@ "GNU Wget %s bygget %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (miljø)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (bruker)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Opphavsrett (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2729,7 +2754,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2737,36 +2762,36 @@ "\n" "Opprinnelig skrevet av Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "Send feilrapporter og spørsmÃ¥l til.\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Minnetidelingsfeil\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Avslutter pÃ¥ grunn av problemer med %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Prøv «%s --help» for flere valg.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: «-n%c» er et ugyldig valg\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2775,7 +2800,7 @@ "Du har valgt bÃ¥de «--no-clobber» og «--convert-links». Det er bare «--" "convert-links» som blir brukt.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2784,23 +2809,23 @@ "Du har valgt bÃ¥de «--no-clobber» og «--convert-file-only». Kun sistnevnt " "blir brukt.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2812,7 +2837,7 @@ "«-p» eller «-r» er valgt. Se bruksanvisning for mer info.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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 +2848,7 @@ "legges i den ene fila du valgte.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2833,7 +2858,7 @@ "Les bruksanvisninga for ytterligere info.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2841,7 +2866,7 @@ "WARC-utdata fungerer ikke i kombinasjon med «--no-clobber». «--no-clobber» " "blir derfor slÃ¥tt av.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2849,12 +2874,12 @@ "WARC-utdata fungerer ikke i kombinasjon med tidsstempling. Tidsstempling " "blir derfor slÃ¥tt av.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC-utdata fungerer ikke i kombinasjon med «--spider».\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2863,7 +2888,7 @@ "WARC-utdata fungerer ikke i kombinasjon med «--continue». Begge deler blir " "derfor slÃ¥tt av.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2871,21 +2896,21 @@ "Kontrollsummering er slÃ¥tt av. WARCs anti-duplikatverktøy er ute av stand " "til Ã¥ finne duplikater.\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"WARC-utdata fungerer ikke i kombinasjon med «--continue». Begge deler blir " -"derfor slÃ¥tt av.\n" +"Komprimering fungerer ikke med «--continue» eller «--start-pos». Begge deler " +"blir derfor slÃ¥tt av.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2894,17 +2919,17 @@ "Bruk av «--start-pos» og «--continue» samtidig anbefales ikke. «--continue» " "blir derofr slÃ¥tt av.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: nettadresse mangler\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2913,7 +2938,7 @@ "«--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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2922,17 +2947,17 @@ "Valgene «--body-data» eller «--body-file» krever at du velger «--method=HTTP-" "METODE» .\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Denne versjonen støtter ikke IRI-er\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2940,7 +2965,7 @@ "Valgene «-k» og «-r» kan bare brukes samtidig med «-O» hvis utdata er en " "vanlig fil.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2949,42 +2974,42 @@ "valgene «--convert-links» og «--convert-file-only» kan bare brukes samtidig " "hvis utdata er en vanlig fil.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Klarte ikke Ã¥ starte libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Klarte ikke Ã¥ starte «c-ares»-kanal\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Klarte ikke Ã¥ tolke IP-adresse «%s»\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Fant ingen nettadresser i %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Klarte ikke Ã¥ lese metalink-fila %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2995,7 +3020,7 @@ "Totalt medgÃ¥tt tid: %s\n" "Lastet ned: %d filer, %s pÃ¥ %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Nedlastingsgrense pÃ¥ %s OVERSKREDET!\n" @@ -3161,7 +3186,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Fortsetter i bakgrunnen med PID %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Utdata blir skrevet til %s.\n" @@ -3206,68 +3231,66 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: klarte ikke Ã¥ lage statistikk av %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "ADVARSEL: du bruker en svak kilde for vilkÃ¥rlighetsdata.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "Installert OpenSSL-versjon er for gammel til Ã¥ støtte TLSv1.1\n" +msgstr "Installert OpenSSL-versjon er for gammel til Ã¥ støtte TLSv1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: %s er en ugyldig nettadresse. %s\n" +msgstr "OpenSSL: Ugyldig algoritmeliste: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: 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" +"Klarte ikke Ã¥ bruke hente data fra PRNG. Du bør vurdere Ã¥ bruke valget «--" +"random-file».\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Klarte ikke Ã¥ bekrefte utgiverens autoritet lokalt.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Mottok selvgenerert sertifikat.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Mottatt sertifikat er ikke gyldig ennÃ¥.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Mottatt sertifikat er utgÃ¥tt.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3276,14 +3299,14 @@ "%s: ingen alternative navn pÃ¥ sertifikatsubjektet\n" "\tsamsvarer med vertsnavn %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, 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:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3294,7 +3317,7 @@ " 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:1042 +#: src/openssl.c:1046 #, 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" @@ -3343,22 +3366,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Laster inn «robots.txt». Ignorer feilmeldinger.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Feil ved tolkning av nettadressen %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d videresendinger overskredet.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3366,7 +3389,7 @@ "Gir opp.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3438,97 +3461,108 @@ msgid "HTTPS support not compiled in" msgstr "HTTPS-støtte er ikke innebygget i denne versjonen" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "Fant ufullstendig eller ugyldig multibyte-sekvens\n" +msgstr "Fant multibyte-sekvens som ikke lar seg konvertere\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Fortsetter i bakgrunnen med PID %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Klarte ikke Ã¥ starte libcares\n" +msgstr "Klarte ikke Ã¥ utføre Fopen pÃ¥ fil %s\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Klarte ikke Ã¥ endre tillatelser til %s.\n" +msgstr "Klarte ikke Ã¥ hente FD for fil %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Klarte ikke Ã¥ endre tillatelser til %s.\n" +msgstr "Klarte ikke Ã¥ hente info om fil %s, (kontroller tillatelser)\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Fila %s er blitt changed siden forrige sjekk. Sikkerhetskontroll mislyktes." -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Klarte ikke Ã¥ tolke IP-adresse «%s»\n" +msgstr "Klarte ikke Ã¥ Ã¥pne fil %s. Ã…rsak :%s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Klarte ikke Ã¥ endre tillatelser til %s.\n" +msgstr "Klarte ikke Ã¥ hente info om fil %s. Feil: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"Prøver Ã¥ Ã¥pne fila %s, men den er blitt endret siden forrige sjekk. " +"Sikkerhetskontroll mislyktes." + +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Regulært uttrykk %s er ugyldig. PCRE2-feil %d\n" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "%s er et ugyldig regulært uttrykk. %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Feil ved bruk av %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "Hopper over nøkkel med feil størrelse (%d/%d): %s\n" + +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Klarte ikke Ã¥ duplisere fildeskriptor for WARC-fil.\n" -#: src/warc.c:223 +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Feil ved Ã¥pning av GZIP-strøm til WARC-fil.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Feil ved skriving av warcinfo-oppføring til WARC-file.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3537,26 +3571,26 @@ "Ã…pner WARC-fil %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Feil ved Ã¥pning av WARC-fil %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" "CDX-fil inneholder ikke originale nettadresser (kolonne «a» mangler).\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "CDX-fil inneholder ikke kontrollsummer (kolonne «k» mangler).\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" "CDX-fil- inneholder ikke ID-er for oppføringer (kolonne «u» mangler).\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3571,32 +3605,32 @@ "Lastet inn %d oppføringer fra CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Klarte ikke Ã¥ lese CDX-fila %s for Ã¥ se etter duplikater.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Klarte ikke Ã¥ Ã¥pne midlertidig WARC-manifestfil.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Klarte ikke Ã¥ Ã¥pne midlertidig WARC-loggfil.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Klarte ikke Ã¥ Ã¥pne WARC-fil.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Klarte ikke Ã¥ Ã¥pne CDX-fil for skriving av utdata.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Klarte ikke Ã¥ Ã¥pne midlertidig WARC-fil.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Fant identisk oppføring i CDX-fil. Lagrer oppføring for tilbakesporing i " Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/nl.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/nl.gmo differ diff -Nru wget-1.19.5/po/nl.po wget-1.20.1/po/nl.po --- wget-1.19.5/po/nl.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/nl.po 2018-12-26 20:10:50.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: wget 1.16.3.124\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2015-09-23 11:42+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" @@ -237,17 +237,17 @@ msgid "Unmatched ) or \\)" msgstr "Ongepaarde ) of \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Geen eerdere reguliere expressie" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "kan geen pijp aanmaken" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -312,7 +312,7 @@ msgid "failed: %s.\n" msgstr "mislukt: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: kan host-adres '%s' niet herleiden\n" @@ -435,12 +435,12 @@ msgid "Length: %s" msgstr "Lengte: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) resterend" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s resterend" @@ -609,7 +609,7 @@ "Bestand of map '%s' bestaat niet.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s is zojuist ontstaan.\n" @@ -632,17 +632,17 @@ msgid "Data transfer aborted.\n" msgstr "Gegevensoverdracht is afgebroken.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(poging %2d) " -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -651,7 +651,7 @@ "%s (%s) - weggeschreven naar standaarduitvoer %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -660,8 +660,8 @@ "%s (%s) - '%s' opgeslagen [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Verwijderen van %s.\n" @@ -762,161 +762,178 @@ "Er wordt niet afgedaald naar '%s', want deze is uitgesloten of niet " "ingesloten.\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "'%s' wordt verworpen.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "'%s' wordt verworpen.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" +"Er wordt niet afgedaald naar '%s', want deze is uitgesloten of niet " +"ingesloten.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Fout bij vergelijken van '%s' met '%s': %s.\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Geen overeenkomsten met patroon '%s'.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, 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:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Index is in HTML-vorm naar '%s' geschreven.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "FOUT: Kan map %s niet openen.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "FOUT: Kan certificaat %s niet openen: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "CA-certificaat '%s' is geladen\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "CRL-bestand '%s' is geladen\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Uw OpenSSL-versie is te oud om TLSv1.1 te ondersteunen.\n" + +#: src/gnutls.c:676 #, 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:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Rapporteer dit gebrek aan .\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: niet-geïmplementeerde 'secure-protocol'-optiewaarde %d\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "FOUT" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "WAARSCHUWING" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Geen certificaat aangeboden door %s.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Het certificaat van '%s' heeft een onbekende uitgever.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Het certificaat van '%s' is herroepen.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Het certificaat van '%s' is verlopen.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Fout tijdens initialiseren van X509-certificaat: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Geen certificaat gevonden\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Fout tijdens ontleden van certificaat: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Het certificaat is nog niet geactiveerd\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Het certificaat is verlopen\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Het certificaat moet een X.509 zijn.\n" @@ -956,11 +973,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Schrijven van HTTP-verzoek is mislukt: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Geen kopregels aanwezig; HTTP/0.9 aangenomen." -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -969,66 +986,66 @@ "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" "Functie gmtime() is mislukt. Dit is waarschijnlijk een programmafout.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY-gegevensbestand '%s' ontbreekt: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Verbinding met [%s]:%d wordt hergebruikt.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Verbinding met %s:%d wordt hergebruikt.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Lezen van proxy-antwoord is mislukt: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s Fout %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Onjuiste statusregel" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Het tunnelen door een proxy is mislukt: %s." -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Onbekend aanmeldingsschema.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Geselecteerde authenticatie: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Wordt opgeslagen als: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1037,72 +1054,72 @@ "Bij downloaden van ondertekening:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Wegens fouten wordt SSL uitgeschakeld.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-verzoek is verzonden; wachten op antwoord... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Geen gegevens ontvangen.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Leesfout (%s) in kopregels.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(geen omschrijving)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Locatie: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "niet-opgegeven" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [volgen...]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1110,7 +1127,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1120,82 +1137,82 @@ " Het bestand is reeds volledig opgehaald; er is niets te doen.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Lengte: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "genegeerd" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Waarschuwing: jokertekens zijn bij HTTP niet mogelijk.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Spider-modus: controleren of bestand bestaat op server.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kan niet naar '%s' schrijven (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Vereiste eigenschap ontbreekt in ontvangen kopregels.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Authenticatie met gebruikersnaam/wachtwoord is mislukt.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Kan niet naar WARC-bestand schrijven.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Kan niet naar tijdelijk WARC-bestand schrijven.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Kan geen SSL-verbinding maken.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Kan %s niet verwijderen (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "Fout: doorverwijzing (%d) zonder locatie.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Bestand bestaat niet op server -- verbroken hyperlink!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "'Last-modified'-kopregel ontbreekt -- tijdsstempels worden uitgeschakeld.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "'Last-modified'-kopregel is ongeldig -- tijdsstempel wordt genegeerd.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1205,16 +1222,16 @@ "opgehaald.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Bestand op server is nieuwer -- ophalen.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1223,7 +1240,7 @@ "Bestand bestaat op server en zou hyperlinks kunnen bevatten -- ophalen.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1231,7 +1248,7 @@ "Bestand bestaat op server maar bevat geen hyperlinks -- wordt niet " "opgehaald.\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1240,7 +1257,7 @@ "Bestand bestaat op server en zou verdere hyperlinks kunnen bevatten,\n" "maar recursie is uitgeschakeld -- wordt niet opgehaald.\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1248,12 +1265,12 @@ "Bestand bestaat op server.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1262,7 +1279,7 @@ "%s (%s) - geschreven naar standaarduitvoer %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1271,58 +1288,58 @@ "%s (%s) - '%s' opgeslagen [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Verbinding werd verbroken bij byte %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Leesfout bij byte %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Leesfout bij byte %s/%s (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Niet-ondersteunde beschermingskwaliteit '%s'.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Niet-ondersteund algoritme '%s'.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan '%s' niet lezen (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Fout in %s op regel %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaxfout in %s op regel %d.\n" -#: src/init.c:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1333,7 +1350,7 @@ "Controleer de inhoud van '%s',\n" "of geef een ander bestand op met '--config'.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1344,76 +1361,76 @@ "Controleer de inhoud van '%s',\n" "of geef een ander bestand op met '--config'.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Ongeldige opdracht '%s' bij '--execute'.\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ongeldig aantal '%s'.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s mag slechts één keer gebruikt worden\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ongeldige byte-waarde '%s'\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ongeldig tijdsinterval '%s'\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ongeldige waarde '%s'\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ongeldige kopregel '%s'\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ongeldige WARC-kopregel '%s'\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ongeldig voortgangstype '%s'.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1427,16 +1444,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Codering %s is niet geldig\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Incomplete of ongeldige multibyte-volgorde aangetroffen\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Onafgehandeld foutnummer %d\n" @@ -1469,12 +1486,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; bijhouden van logboek wordt uitgeschakeld.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Gebruik: %s [OPTIE]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1482,67 +1499,67 @@ "(De argumenten bij lange opties gelden ook voor de korte vormen.)\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Opstarten:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version programmaversie tonen en stoppen\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help deze hulptekst tonen en stoppen\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background na opstarten naar de achtergrond gaan\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=OPDRACHT deze OPDRACHT (in '.wgetrc'-stijl) uitvoeren\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Logboek en invoerbestand:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=BESTAND meldingen opslaan in BESTAND\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=BESTAND meldingen toevoegen aan BESTAND\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug uitgebreide debuguitvoer tonen\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug 'Watt-32'-debuguitvoer tonen\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet stil zijn (geen uitvoer produceren)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose gedetailleerde uitvoer produceren " "(standaard)\n" -#: src/main.c:624 +#: src/main.c:625 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:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1550,13 +1567,13 @@ " --report-speed=TYPE bandbreedte tonen als TYPE; TYPE kan 'bits' " "zijn\n" -#: src/main.c:628 +#: src/main.c:629 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:631 +#: src/main.c:632 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1565,11 +1582,11 @@ " --metalink-file URL's uit lokaal of extern metalink bestand " "lezen\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html invoerbestand als HTML behandelen\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1577,25 +1594,25 @@ " -B, --base=URL koppelingen in HTML-invoerbestanden (-i -F)\n" " herleiden relatief tot URL\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=BESTAND te gebruiken configuratiebestand\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-config geen configuratiebestand lezen\n" -#: src/main.c:643 +#: src/main.c:644 #, 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Downloaden:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1603,27 +1620,27 @@ " -t, --tries=AANTAL maximaal dit AANTAL herhalingspogingen doen\n" " ('0' voor onbegrensd)\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused ook bij geweigerde verbinding opnieuw " "proberen\n" -#: src/main.c:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr " --ignore-tags=LIJST deze HTML-tags negeren\n" -#: src/main.c:655 +#: src/main.c:656 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:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1631,14 +1648,14 @@ " -nc, --no-clobber downloads overslaan die bestaande bestanden\n" " zouden overschrijven\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-config geen configuratiebestand lezen\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1646,7 +1663,7 @@ " -c, --continue voortzetten van gedeeltelijk opgehaald " "bestand\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1654,17 +1671,17 @@ " --start-pos=POSITIE downloaden starten vanaf deze POSITIE " "(0=begin)\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYPE dit TYPE voortgangsmeter gebruiken\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --show-progress de voortgangsbalk tonen\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1674,7 +1691,7 @@ "nieuwer\n" " zijn dan lokale bestanden\n" -#: src/main.c:673 +#: src/main.c:674 #, fuzzy msgid "" " --no-if-modified-since don't use conditional if-modified-since " @@ -1685,7 +1702,7 @@ "kopiëren\n" " van die op de server\n" -#: src/main.c:676 +#: src/main.c:677 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1695,26 +1712,26 @@ "kopiëren\n" " van die op de server\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response antwoord van server tonen\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider niets ophalen, alleen kijken\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SECONDEN alle wachttijden instellen op SECONDEN\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1723,27 +1740,27 @@ " --bind-address=ADRES binden aan ADRES (hostnaam of IP) op " "localhost\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SCNDN verbindingswachttijd instellen op SCNDN\n" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SECONDEN leeswachttijd instellen op SECONDEN\n" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SECONDEN tussen bestanden dit aantal SECONDEN " "wachten\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1751,7 +1768,7 @@ " --waitretry=SECONDEN 1..SECONDEN wachten tussen herhaalde " "pogingen\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1759,17 +1776,17 @@ " --random-wait tussen bestanden 0,5..1,5 keer gewone tijd " "wachten\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy geen proxy gebruiken\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=AANTAL downloadquotum is AANTAL (Kilo- of " "Megabytes)\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1777,18 +1794,18 @@ " --bind-address=ADRES binden aan ADRES (hostnaam of IP) op " "localhost\n" -#: src/main.c:709 +#: src/main.c:710 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:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache bufferen van DNS-zoekacties uitschakelen\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1796,7 +1813,7 @@ " --restrict-file-names=OS tekens in bestandsnamen beperken tot die\n" " welke besturingssysteem OS toestaat\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1805,15 +1822,15 @@ "negeren\n" " bij vergelijken van bestands- en mapnamen\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only alleen met IPv4-adressen verbinden\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only alleen met IPv6-adressen verbinden\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1822,20 +1839,20 @@ " --prefer-family=SOORT eerst met deze SOORT adressen verbinden\n" " ('IPv6', 'IPv4', of 'none')\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password vragen om wachtwoorden\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1846,108 +1863,108 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri IRI-ondersteuning uitschakelen\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink bestand verwijderen alvorens te " "overschrijven\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 #, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" -msgstr " --no-glob bestandsnaam-'globbing' uitschakelen\n" +msgstr " --warc-cdx CDX-indexbestanden aanmaken\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Mappen:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories geen mappen aanmaken\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories aanmaken van mappen afdwingen\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories geen host-mappen maken\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories in mappen het gegeven protocol gebruiken\n" -#: src/main.c:771 +#: src/main.c:772 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:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" " --cut-dirs=AANTAL dit AANTAL padcomponenten op server negeren\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP-opties:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=GEBRUIKER de GEBRUIKER voor HTTP\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-passwd=WACHTWRD het WACHTWRD voor HTTP\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache server-gebufferde data niet toestaan\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1955,7 +1972,7 @@ " --default-page=NAAM de standaardpaginanaam aanpassen\n" " (normaliter is dit 'index.html')\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1964,38 +1981,37 @@ "passende\n" " extensies\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length de 'Content-Length'-kopregel negeren\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=TEKENREEKS deze TEKENREEKS tussen kopregels invoegen\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TYPE dit TYPE voortgangsmeter gebruiken\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximum aantal doorverwijzingen per pagina\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=GEBRUIKER de GEBRUIKER voor de proxy\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-passwd=WACHTWRD het WACHTWRD voor de proxy\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2003,11 +2019,11 @@ " --referer=URL een 'Referer'-kopregel met deze URL " "gebruiken\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers HTTP-kopregels in bestand opslaan\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2015,29 +2031,29 @@ " -U, --user-agent=AGENT als AGENT identificeren, niet als Wget/" "VERSIE\n" -#: src/main.c:810 +#: src/main.c:811 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:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies geen cookies gebruiken\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2045,27 +2061,27 @@ " --keep-session-cookies de (tijdelijke) sessiecookies laden en " "opslaan\n" -#: src/main.c:820 +#: src/main.c:821 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:822 +#: src/main.c:823 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:824 +#: src/main.c:825 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:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2073,7 +2089,7 @@ " --body-file=TEKST deze TEKST als gegevens verzenden;\n" " optie '--method' moet gegeven zijn\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2081,7 +2097,7 @@ " --body-file=BESTAND inhoud van dit BESTAND verzenden;\n" " optie '--method' moet gegeven zijn\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2093,7 +2109,7 @@ " keuze van lokale bestandsnamen " "[EXPERIMENTEEL]\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2101,7 +2117,7 @@ " --content-on-error bij serverfouten de ontvangen berichten " "tonen\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2113,11 +2129,11 @@ " zonder te wachten op de vraag van de " "server\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS-opties (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2128,52 +2144,52 @@ " ('auto', 'SSLv2', 'SSLv3', 'TLSv1', of " "'PFS')\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only alleen veilige (HTTPS) hyperlinks volgen\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate servercertificaat niet controleren\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=BESTAND BESTAND dat cliëntcertificaat bevat\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=BESTAND BESTAND dat de privésleutels bevat\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 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:861 +#: src/main.c:862 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:863 +#: src/main.c:864 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:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2183,20 +2199,20 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 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:875 +#: src/main.c:876 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:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2206,16 +2222,16 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "HSTS-opties:\n" -#: src/main.c:888 +#: src/main.c:889 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-cache server-gebufferde data niet toestaan\n" -#: src/main.c:890 +#: src/main.c:891 #, fuzzy msgid "" " --hsts-file path of HSTS database (will override " @@ -2224,11 +2240,11 @@ " -v, --verbose gedetailleerde uitvoer produceren " "(standaard)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP-opties:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2236,36 +2252,36 @@ " --ftp-stmlf Stream_LF gebruiken voor alle binaire\n" " FTP-bestanden\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=GEBRUIKER de GEBRUIKER voor FTP\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=WACHTWRD het WACHTWRD voor FTP\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing '.listing'-bestanden niet verwijderen\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob bestandsnaam-'globbing' uitschakelen\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp niet de \"passieve\" overdrachtsmodus " "gebruiken\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions toegangsrechten overnemen van ginds bestand\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2273,11 +2289,11 @@ " --retr-symlinks symbolisch-gekoppelde bestanden ook ophalen\n" " (bij recursie), maar geen mappen\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTPS-opties:\n" -#: src/main.c:920 +#: src/main.c:921 #, fuzzy msgid "" " --ftps-implicit use implicit FTPS (default port is " @@ -2286,7 +2302,7 @@ " --ftp-stmlf Stream_LF gebruiken voor alle binaire\n" " FTP-bestanden\n" -#: src/main.c:922 +#: src/main.c:923 #, fuzzy msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " @@ -2296,23 +2312,23 @@ " --trust-server-names de naam uit de doorverwijzings-URL " "gebruiken\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC-opties:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2320,41 +2336,41 @@ " --warc-file=BESTANDSNAAM verzoeks- en responsgegevens hierin " "opslaan\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx CDX-indexbestanden aanmaken\n" -#: src/main.c:941 +#: src/main.c:942 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:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests geen SHA1-controlesommen berekenen\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2362,7 +2378,7 @@ " --no-warc-keep-log logbestand niet opslaan in een WARC-" "record\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2370,28 +2386,28 @@ msgstr "" " --warc-tempdir=MAP plaats voor tijdelijke WARC-bestanden\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Recursief downloaden:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive recursief downloaden\n" -#: src/main.c:960 +#: src/main.c:961 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:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after bestanden na downloaden lokaal wissen\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2401,13 +2417,13 @@ "bestanden\n" " naar lokale bestanden laten wijzen\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2415,7 +2431,7 @@ " --backups=AANTAL alvorens een bestand te schrijven, maximaal dit\n" " aantal reservekopie-bestanden roteren\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2424,7 +2440,7 @@ "XX\n" " te converteren\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2433,7 +2449,7 @@ "XX\n" " te converteren\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2441,7 +2457,7 @@ " -m, --mirror gelijk aan '-r -N -l inf --no-remove-listing' " "samen\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2449,98 +2465,98 @@ " -p, --page-requisites alle plaatjes enzovoort voor HTML-weergave " "ophalen\n" -#: src/main.c:983 +#: src/main.c:984 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:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "" "Recursief accepteren/weigeren (de LIJSTen zijn kommagescheiden " "opsommingen):\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=LIJST geaccepteerde achtervoegsels\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=LIJST geweigerde achtervoegsels\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGEXP reguliere expressie voor te accepteren " "URL's\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGEXP reguliere expressie voor te negeren URL's\n" -#: src/main.c:998 +#: src/main.c:999 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:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TYPE het type van de reguliere expressie (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr " -D, --domains=LIJST geaccepteerde domeinen\n" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr " --exclude-domains=LIJST geweigerde domeinen\n" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp FTP-hyperlinks in HTML-documenten " "volgen\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr " --follow-tags=LIJST deze HTML-tags volgen\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr " --ignore-tags=LIJST deze HTML-tags negeren\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative alleen relatieve hyperlinks volgen\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LIJST geaccepteerde mappen\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2549,17 +2565,17 @@ " --trust-server-names de naam uit de doorverwijzings-URL " "gebruiken\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LIJST uitgesloten mappen\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "" @@ -2567,13 +2583,13 @@ "org>;\n" "meld fouten in de vertaling aan .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "" @@ -2583,63 +2599,63 @@ "netwerk.\n" "\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Wachtwoord voor gebruiker %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Wachtwoord: " -#: src/main.c:1103 +#: src/main.c:1104 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "kan geen pijp aanmaken" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Wachtwoord voor gebruiker %s: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Locale: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Gecompileerd: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Gelinkt: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2648,29 +2664,29 @@ "GNU Wget %s gecompileerd op %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (user)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2684,7 +2700,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2692,41 +2708,41 @@ "\n" "Oorspronkelijk geschreven door Hrvoje NikÅ¡ić .\n" -#: src/main.c:1337 +#: src/main.c:1338 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:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Onvoldoende geheugen beschikbaar\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Gestopt wegens fout in %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Typ '%s --help' voor meer opties.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ongeldige optie -- '-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2735,7 +2751,7 @@ "Zowel '--no-clobber' als '--convert-links' werden opgegeven; alleen '--" "convert-links' wordt gebruikt.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, fuzzy, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2744,23 +2760,23 @@ "Zowel '--no-clobber' als '--convert-links' werden opgegeven; alleen '--" "convert-links' wordt gebruikt.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2771,7 +2787,7 @@ "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:1666 +#: src/main.c:1667 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" @@ -2781,7 +2797,7 @@ "wat opgehaald wordt in het ene opgegeven bestand geplaatst wordt.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2791,7 +2807,7 @@ "O'.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2799,7 +2815,7 @@ "WARC-uitvoer werkt niet met '--no-clobber'; '--no-clobber' wordt " "uitgeschakeld.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2807,12 +2823,12 @@ "WARC-uitvoer werkt niet met tijdsstempels; tijdsstempels worden " "uitgeschakeld.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC-uitvoer werkt niet met '--spider'.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2821,7 +2837,7 @@ "WARC-uitvoer werkt niet met '--continue' of '--start-pos'; deze worden " "uitgeschakeld.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2829,7 +2845,7 @@ "Controlesommen zijn uitgeschakeld; WARC-ontdubbeling zal geen dubbele " "records vinden.\n" -#: src/main.c:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2838,12 +2854,12 @@ "WARC-uitvoer werkt niet met '--continue' of '--start-pos'; deze worden " "uitgeschakeld.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Opties '--ask-password' en '--password' gaan niet samen.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2852,17 +2868,17 @@ "Opties '--start-pos' en '--continue' samen wordt ontraden; '--continue' " "wordt uitgeschakeld.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: ontbrekende URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2872,7 +2888,7 @@ "optie '--method' verwacht gegevens via de opties '--body-data' of '--body-" "file'." -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2881,17 +2897,17 @@ "U dient via '--method=HTTP-METHODE' een methode op te geven om te gebruiken " "met '--body-data' of '--body-file'.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, 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:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2899,7 +2915,7 @@ "Optie '-k' of '-r' gaat alleen samen met '-O' bij uitvoer naar een normaal " "bestand.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2908,42 +2924,42 @@ "Optie '-k' of '-r' gaat alleen samen met '-O' bij uitvoer naar een normaal " "bestand.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Verwijderen van symbolische koppeling '%s' is mislukt: %s\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: kan host-adres '%s' niet herleiden\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Geen URL's gevonden in %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Kan '%s' niet verwijderen: %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2954,7 +2970,7 @@ "Totaal verlopen tijd: %s\n" "Opgehaald: %d bestanden, %s in %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Downloadquotum van %s bytes is overschreden!\n" @@ -3127,7 +3143,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Voortzetting in de achtergrond, proces-ID %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Uitvoer wordt naar '%s' geschreven.\n" @@ -3175,67 +3191,67 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: kan status van %s niet opvragen: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" "WAARSCHUWING: er wordt een zwakke 'seed' voor de toevalsgenerator gebruikt.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "Uw OpenSSL-versie is te oud om TLSv1.1 te ondersteunen.\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: niet-geïmplementeerde 'secure-protocol'-optiewaarde %d\n" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: Ongeldige URL '%s': %s.\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "" "Kan geen 'seed' voor PRNG vinden; gebruik eventueel '--random-file'.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 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:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Zelf-ondertekend certificaat gevonden.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Certificaat is nog niet geldig.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Certificaat is verlopen.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3244,7 +3260,7 @@ "%s: geen van de alternatieve namen in het certificaat komt\n" " overeen met de gevraagde hostnaam '%s'.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3252,7 +3268,7 @@ " %s: naam '%s' in certificaat komt niet overeen met gevraagde hostnaam " "'%s'.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3263,7 +3279,7 @@ " 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:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3316,22 +3332,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Laden van 'robots.txt'; fouten kunnen worden genegeerd.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fout tijdens ontleden van proxy-URL '%s': %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "Maximum van %d doorverwijzingen is overschreden.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3339,7 +3355,7 @@ "Pogingen worden gestaakt.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3411,100 +3427,110 @@ msgid "HTTPS support not compiled in" msgstr "Ondersteuning voor HTTPS is niet meegecompileerd" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Incomplete of ongeldige multibyte-volgorde aangetroffen\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Voortzetting in de achtergrond, proces-ID %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Verwijderen van symbolische koppeling '%s' is mislukt: %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Kan geen cookie verkrijgen voor %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Kan geen cookie verkrijgen voor %s\n" +msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Ongeldige reguliere expressie %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Ongeldige reguliere expressie %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Fout tijdens zoeken naar %s: %d.\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Fout bij openen van WARC-bestand %s.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Fout bij openen van GZIP-stream naar WARC-bestand.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Fout bij schrijven van 'warcinfo'-record naar WARC-bestand.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3513,24 +3539,24 @@ "Openen van WARC-bestand %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Fout bij openen van WARC-bestand %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "CDX-bestand bevat geen originele URL's. (Kolom 'a' ontbreekt.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "CDX-bestand bevat geen controlesommen. (Kolom 'k' ontbreekt.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "CDX-bestand bevat geen record-ID's. (Kolom 'u' ontbreekt.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3545,32 +3571,32 @@ "Er zijn %d records geladen uit CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Kan CDX-bestand %s niet lezen voor ontdubbeling.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Kan tijdelijk WARC-manifestbestand niet openen.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Kan tijdelijk WARC-log-bestand niet openen.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Kan WARC-bestand niet openen.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Kan CDX-bestand niet openen voor uitvoer.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Kan tijdelijk WARC-bestand niet openen.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Exacte overeenkomst gevonden in CDX-bestand. Opslaan van herbezoek-record in " @@ -3591,9 +3617,6 @@ #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: optie '-W %s' vereist een argument\n" -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" - #~ msgid "Invalid UTF-8 sequence: %s\n" #~ msgstr "Ongeldige UTF-8-reeks: %s\n" @@ -3607,6 +3630,9 @@ #~ "\n" #~ "%s ontvangen.\n" +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" + #~ msgid "Authorization failed.\n" #~ msgstr "Aanmelding is mislukt.\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/pl.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/pl.gmo differ diff -Nru wget-1.19.5/po/pl.po wget-1.20.1/po/pl.po --- wget-1.19.5/po/pl.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/pl.po 2018-12-26 20:10:50.000000000 +0000 @@ -2,7 +2,7 @@ # Copyright (C) 2002, 2008, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Wojciech Kotwica , 2002 -# Jakub Bogusz , 2005-2017 +# Jakub Bogusz , 2005-2018 # based on unofficial translation of wget-1.6 by # Arkadiusz MiÅ›kiewicz , 1998-2000. # Wojciech Kotwica 2002-03-20 11:12+01:00 @@ -11,10 +11,10 @@ # msgid "" msgstr "" -"Project-Id-Version: wget 1.18.109\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-01-19 17:45+0100\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-13 20:18+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -106,29 +106,29 @@ msgstr "Nieznany bÅ‚Ä…d" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: opcja '%s' jest niejednoznaczna\n" +msgstr "%s: opcja '%s%s' jest niejednoznaczna\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: opcja '%s' jest niejednoznaczna; możliwoÅ›ci:" +msgstr "%s: opcja '%s%s' jest niejednoznaczna; możliwoÅ›ci:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: nieznana opcja '%c%s'\n" +msgstr "%s: nieznana opcja '%s%s'\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, 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" +msgstr "%s: opcja '%s%s' nie może mieć argumentów\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: opcja '--%s' musi mieć argument\n" +msgstr "%s: opcja '%s%s' musi mieć argument\n" #: lib/getopt.c:621 #, c-format @@ -237,17 +237,17 @@ msgid "Unmatched ) or \\)" msgstr "Niesparowane ) lub \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Brak poprzedniego wyrażenia regularnego" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "nie można utworzyć potoku" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -311,7 +311,7 @@ msgid "failed: %s.\n" msgstr "nieudane: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: nie udaÅ‚o siÄ™ rozwiÄ…zać adresu hosta %s\n" @@ -436,12 +436,12 @@ msgid "Length: %s" msgstr "DÅ‚ugość: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) pozostaÅ‚o" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s pozostaÅ‚o" @@ -610,7 +610,7 @@ "Nie ma pliku ani katalogu %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s zaczÄ…Å‚ istnieć.\n" @@ -633,17 +633,17 @@ msgid "Data transfer aborted.\n" msgstr "Przerwano przesyÅ‚anie danych.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Plik %s już istnieje, bez pobierania.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(próba:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -652,7 +652,7 @@ "%s (%s) - zapisano na standardowe wyjÅ›cie %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -661,8 +661,8 @@ "%s (%s) - zapisano %s [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Usuwanie %s.\n" @@ -759,160 +759,176 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Odrzucanie %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Odrzucanie %s (bÅ‚Ä™dny wpis).\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s jest wykluczony/nie wÅ‚Ä…czony poprzez wyrażenie regularne.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "BÅ‚Ä…d podczas dopasowywania %s wzglÄ™dem %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Brak pasujÄ…cych do wzorca %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, 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:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Zapisano indeks w postaci HTML-a w %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "BÅÄ„D: Nie można otworzyć katalogu %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, 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:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "ZaÅ‚adowano certyfikat CA '%s'\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "ZaÅ‚adowano plik CRL '%s'\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Użyta wersja GnuTLS jest zbyt stara, aby obsÅ‚użyć TLS 1.3\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: nie zaimplementowana wartość opcji 'secure-protocol' %d\n" +msgstr "GnuTLS: nie zaimplementowana wartość opcji 'secure-protocol' %u\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: nie zaimplementowana wartość opcji 'secure-protocol' %d\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: Nie można ustawić bezpoÅ›rednio Å‚aÅ„cucha prio. Awaryjne przejÅ›cie do " +"domyÅ›lnego priorytetu.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "BÅÄ„D" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "UWAGA" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Å»aden certyfikat nie zostaÅ‚ przedstawiony przez %s.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Certyfikat %s nie ma znanego wystawcy.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certyfikat %s zostaÅ‚ unieważniony.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Certyfikat %s wygasÅ‚.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "BÅ‚Ä…d inicjalizacji certyfikatu X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Nie znaleziono certyfikatu\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "BÅ‚Ä…d podczas analizy certyfikatu: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Certyfikat nie zostaÅ‚ jeszcze aktywowany.\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Certyfikat wygasÅ‚.\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Certyfikat musi być w formacie X.509\n" @@ -953,11 +969,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Nie powiodÅ‚o siÄ™ wysyÅ‚anie żądania HTTP: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Brak nagłówków, przyjÄ™to HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -966,11 +982,11 @@ "Plik %s już istnieje, bez pobierania.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime nie powiodÅ‚o siÄ™. To prawdopodobnie bÅ‚Ä…d.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -978,55 +994,55 @@ "Nie można przeksztaÅ‚cić znacznika czasu na format http. Degradacja do czasu " "0 jako czasu ostatniej modyfikacji.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Brak pliku danych BODY %s: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Ponowne użycie poÅ‚Ä…czenia do [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Ponowne użycie poÅ‚Ä…czenia do %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Nie powiodÅ‚o siÄ™ odczytanie odpowiedzi proxy: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s BÅÄ„D %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Źle sformuÅ‚owana linia statusu" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tunelowanie proxy nie powiodÅ‚o siÄ™: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Nieznana metoda uwierzytelniania.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Wybrano uwierzytelnienie: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Zapis do: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1035,22 +1051,22 @@ "Podczas pobierania podpisu:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "NieprawidÅ‚owa wartość pri. Domniemano %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1058,42 +1074,42 @@ "Nie udaÅ‚o siÄ™ odnaleźć akceptowalnego skrótu dla zasobów Metalink.\n" "Zignorowano je.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "WyÅ‚Ä…czenie SSL ze wzglÄ™du na napotkane bÅ‚Ä™dy\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "Żądanie %s wysÅ‚ano, oczekiwanie na odpowiedź... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Brak danych w odpowiedzi.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "BÅ‚Ä…d odczytu (%s) w nagłówkach.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(brak opisu)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Lokalizacja: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "nieznana" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [podążanie]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1102,7 +1118,7 @@ "Plik %s nie zostaÅ‚ zmodyfikowany na serwerze. PominiÄ™to pobranie.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1113,7 +1129,7 @@ "Może warto dodać opcjÄ™ --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1123,58 +1139,58 @@ " Plik już zostaÅ‚ w peÅ‚ni pobrany; nic do roboty.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "DÅ‚ugość: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "zignorowano" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Ostrzeżenie: znaki globalne nie sÄ… obsÅ‚ugiwane w HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Tryb spider wÅ‚Ä…czony. Sprawdź czy zdalny plik istnieje.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nie można zapisać do %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "W odebranym nagłówku brak wymaganego atrybutu.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Uwierzytelnienie użytkownik/hasÅ‚o nie powiodÅ‚o siÄ™.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Nie można zapisać do pliku WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Nie można zapisać do tymczasowego pliku WARC.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Niemożliwe utworzenie poÅ‚Ä…czenia SSL.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nie można usunąć %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "BÅÄ„D: Przekierowanie (%d) bez lokalizacji.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1182,23 +1198,23 @@ "Nie udaÅ‚o siÄ™ odnaleźć danych Metalink w odpowiedzi HTTP. Pobieranie pliku " "przy użyciu HTTP GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Napotkano nagłówek Metalink. PrzeÅ‚Ä…czanie w tryb Metalink.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Zdalny plik nie istnieje -- zepsuty odnoÅ›nik!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Brak nagłówka Last-modified -- znaczniki czasu wyÅ‚Ä…czone.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "BÅ‚Ä™dny nagłówek Last-modified -- znacznik czasu zignorowany.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1207,16 +1223,16 @@ "Plik po stronie serwera nie nowszy niż plik lokalny %s -- bez pobierania.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Rozmiary siÄ™ różniÄ… (lokalny %s) -- pobieranie.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Plik na zdalnym serwerze jest nowszy, pobieranie.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1225,7 +1241,7 @@ "Plik po stronie serwera istnieje i zawiera odnoÅ›niki do innych źródeÅ‚ -- " "pobieranie.\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1234,7 +1250,7 @@ "pobieram.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1244,7 +1260,7 @@ "jednak rekurencja jest wyÅ‚Ä…czona -- nie pobieram.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1252,12 +1268,12 @@ "Plik na zdalnym serwerze istnieje.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1266,7 +1282,7 @@ "%s (%s) - zapisano na standardowe wyjÅ›cie %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1275,58 +1291,59 @@ "%s (%s) - zapisano %s [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - PoÅ‚Ä…czenie zamkniÄ™te przy %s bajcie. " -#: src/http.c:4772 +#: src/http.c:4780 #, 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:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "NieobsÅ‚ugiwana jakość zabezpieczenia '%s'.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "NieobsÅ‚ugiwany algorytm '%s'.\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, 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" +msgstr "" +"%s: WGETRC wskazuje na %s, do którego nie ma dostÄ™pu z powodu bÅ‚Ä™du: %s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nie można odczytać %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: BÅ‚Ä…d w %s w linii %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1337,7 +1354,7 @@ "ProszÄ™ sprawdzić '%s',\n" "lub wskazać inny plik przy użyciu --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1348,49 +1365,49 @@ "'%s',\n" "lub wskazać inny plik przy użyciu --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: NieprawidÅ‚owe polecenie --execute %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: NiewÅ‚aÅ›ciwa liczba %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s musi być użyte tylko raz\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: NieprawidÅ‚owa wartość bajtu %s.\n" # c-format -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: NieprawidÅ‚owa wartość okresu czasu %s.\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1400,28 +1417,28 @@ "WGET_ASKPASS lub SSH_ASKPASS.\n" # c-format -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: NieprawidÅ‚owa wartość %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: NieprawidÅ‚owy nagłówek %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: NieprawidÅ‚owy nagłówek WARC %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, 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:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1436,16 +1453,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Kodowanie %s nie jest prawidÅ‚owe\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Napotkano niekompletnÄ… lub nieprawidÅ‚owÄ… sekwencjÄ™ wielobajtowÄ…\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "NieobsÅ‚ugiwane errno %d\n" @@ -1479,12 +1496,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; logowanie zostaÅ‚o wyÅ‚Ä…czone.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "SkÅ‚adnia: %s [OPCJE]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1492,64 +1509,64 @@ "ObowiÄ…zkowe argumenty dÅ‚ugich opcji sÄ… też obowiÄ…zkowe dla opcji krótkich.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Uruchamianie:\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help wypisuje tÄ™ pomoc\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background przejÅ›cie w tÅ‚o po uruchomieniu\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=KOMENDA wykonuje polecenie jak z `.wgetrc'\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Rejestracja pracy i plik wejÅ›ciowy:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=PLIK rejestruje komunikaty w PLIKu\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=PLIK doÅ‚Ä…cza komunikaty do PLIKu\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug wypisuje informacje diagnostyczne\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug wypisuje informacje diagnostyczne z " "Watt-32\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet cisza (żadnych komunikatów)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose szczegółowe komunikaty (zachowanie " "domyÅ›lne)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1557,7 +1574,7 @@ " -nv, --no-verbose bez szczegółowych komunikatów, ale nie " "cisza\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1565,7 +1582,7 @@ " --report-speed=JAK wypisuje szybkość w podany sposób; może " "być \"bits\"\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1573,7 +1590,7 @@ " -i, --input-file=PLIK wczytuje URL-e z lokalnego lub " "zewnÄ™trznego PLIKu\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1581,11 +1598,11 @@ " --input-metalink=PLIK wczytuje pliki obecne w lokalnym PLIKu " "Metalink\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html traktuje plik wejÅ›ciowy jako HTML\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1594,28 +1611,28 @@ "HTML\n" " (-i -F) wzglÄ™dem URL-a\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=PLIK okreÅ›la plik konfiguracyjny do użycia\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" " --no-config pomija odczyt pliku konfiguracyjnego\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Pobieranie:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1623,28 +1640,26 @@ " -t, --tries=LICZBA ustawia LICZBĘ ponownych prób (0 bez " "limitu)\n" -#: src/main.c:651 +#: src/main.c:652 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:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=LISTA lista oddzielonych przecinkami " -"znaczników\n" -" HTML, które majÄ… być ignorowane\n" +" --retry-on-http-error=BÅĘDY rozdzielona przecinkami lista bÅ‚Ä™dów\n" +" HTTP do wznowienia\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=PLIK zapisuje dokumenty do PLIKu\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1652,15 +1667,15 @@ " -nc, --no-clobber zakazuje nadpisywania istniejÄ…cych " "plików\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -" --no-config pomija odczyt pliku konfiguracyjnego\n" +" --no-netrc bez próby odczytu danych użytkownika ." +"netrc\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1668,7 +1683,7 @@ " -c, --continue wznawia Å›ciÄ…ganie częściowo pobranego " "pliku\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1676,12 +1691,12 @@ " --start-pos=OFFSET rozpoczyna pobieranie od podanego " "OFFSETu\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TYP ustawia tryb wizualizacji postÄ™pów\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1689,7 +1704,7 @@ " --show-progress pasek postÄ™pu niezależnie od trybu " "komunikatów\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1698,7 +1713,7 @@ " -N, --timestamping nie pobiera ponownie plików, chyba że sÄ…\n" " nowsze niż lokalne.\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1708,7 +1723,7 @@ " if-modified-since w trybie ze zn. " "czasu\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1716,21 +1731,21 @@ " --no-use-server-timestamps bez ustawiania czasu pliku lokalnego na\n" " czas taki, jak na serwerze\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response wyÅ›wietla odpowiedzi serwera\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider nie pobiera niczego\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1738,7 +1753,7 @@ " --dns-servers=ADRESY lista serwerów DNS do odpytania (z " "przecinkami)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1746,29 +1761,29 @@ " --bind-dns-address=ADRES dowiÄ…zanie klienta DNS do lokalnego " "ADRESu (nazwy lub IP)\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUND czeka SEKUND pomiÄ™dzy pobraniami\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1776,7 +1791,7 @@ " --waitretry=SEKUND czeka 1...SEKUND pomiÄ™dzy ponownÄ… próbÄ…\n" " wznowienia pobrania\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1784,37 +1799,37 @@ " --random-wait czeka 0.5*WAIT...1.5*WAIT sekund miÄ™dzy " "pobraniami\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy jawnie wyÅ‚Ä…cza proxy\n" -#: src/main.c:705 +#: src/main.c:706 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:707 +#: src/main.c:708 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:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=SZYBKOŚĆ ogranicza szybkość pobierania do " "SZYBKOŚĆ\n" -#: src/main.c:711 +#: src/main.c:712 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:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1823,7 +1838,7 @@ " obsÅ‚ugiwanych przez system operacyjny " "OS\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1831,15 +1846,15 @@ " --ignore-case ignorowanie wielkoÅ›ci liter podczas\n" " dopasowywania plików/katalogów.\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only Å‚Ä…czenie wyÅ‚Ä…cznie na adresy IPv4\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only Å‚Ä…czenie wyÅ‚Ä…cznie na adresy IPv6\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1848,21 +1863,21 @@ " --prefer-family=RODZINA Å‚Ä…czenie najpierw z adresami z podanej\n" " rodziny: IPv6, IPv4, none\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password prosi o podanie haseÅ‚\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1879,28 +1894,28 @@ " Å›rodowiskowa WGET_ASKPASS lub " "SSH_ASKPASS.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri wyÅ‚Ä…cza obsÅ‚ugÄ™ IRI\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink usuwanie plików przed nadpisaniem\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1908,7 +1923,7 @@ " --keep-badhash zachowanie plików z niezgodnÄ… sumÄ… " "(doÅ‚Ä…cza .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1916,7 +1931,7 @@ " --metalink-index=LICZBA LICZBA porzÄ…dkowa metaurla metalink " "application/metalink4+xml\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1924,49 +1939,50 @@ " --metalink-over-http użycie metadanych Metalink z nagłówków " "odpowiedzi HTTP\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location preferowana lokalizacja zasobów Metalink\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr wyÅ‚Ä…cza zapisywanie metadanych w " "rozszerzonych atrybutach\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Katalogi:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories zakazuje tworzenia katalogów\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories wymusza tworzenie katalogów\n" -#: src/main.c:767 +#: src/main.c:768 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:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories użycie nazwy protokoÅ‚u w katalogach\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PRZEDR zapis plików w PRZEDR/...\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1974,25 +1990,25 @@ " --cut-dirs=LICZBA ignoruje okreÅ›lonÄ… LICZBĘ zdalnych " "katalogów\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Opcje HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=UÅ»YTKOWNIK ustawia UÅ»YTKOWNIKA dla http\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=HASÅO ustawia HASÅO dla http\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache zakazuje korzystania z buforowania\n" " danych przez serwer.\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2001,7 +2017,7 @@ "jest\n" " to index.html).\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2009,42 +2025,42 @@ " -E, --adjust-extension zapis dokumentów HTML/CSS z wÅ‚aÅ›ciwymi\n" " rozszerzeniami.\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignorowanie pola `Content-Length' " "nagłówka\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=ÅAŃCUCH wstawienie ÅAŃCUCHa w nagłówki\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=TYP ustawia tryb wizualizacji postÄ™pów\n" +" --compression=RODZAJ wybór kompresji: auto, gzip, none " +"(domyÅ›lnie: none)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maksymalna dozwolona liczba przekierowaÅ„ " "na stronie.\n" -#: src/main.c:800 +#: src/main.c:801 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:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-passwd=HASÅO ustawia HASÅO dla proxy\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2052,11 +2068,11 @@ " --referer=URL doÅ‚Ä…cza nagłówek `Referer: URL' do " "żądania HTTP\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers zapis nagłówków HTTP w pliku\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2064,7 +2080,7 @@ " -U, --user-agent=AGENT identyfikacja jako AGENT zamiast Wget/" "WERSJA\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2072,22 +2088,22 @@ " --no-http-keep-alive wyÅ‚Ä…cza HTTP keep-alive (trwaÅ‚e " "poÅ‚Ä…czenia)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies bez używania ciasteczek\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2095,7 +2111,7 @@ " --keep-session-cookies wczytuje i zapisuje ciasteczka sesji " "(nietrwaÅ‚e)\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2103,7 +2119,7 @@ " --post-data=ÅAŃCUCH użycie metody POST z ÅAŃCUCHem jako " "danymi\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2111,12 +2127,12 @@ " --post-file=PLIK użycie metody POST z wysÅ‚aniem zawartoÅ›ci " "PLIKu\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr " --method=MetodaHTTP użycie podanej metody w żądaniu\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2124,7 +2140,7 @@ " --body-data=ÅAŃCUCH wysÅ‚anie ÅAŃCUCHA jako danych; wymagane --" "method\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2132,7 +2148,7 @@ " --body-file=PLIK wysÅ‚anie zawartoÅ›ci PLIKu; wymagane --" "method\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2145,7 +2161,7 @@ "pliku\n" " (EKSPERYMENTALNE).\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2153,7 +2169,7 @@ " --content-on-error wypisanie otrzymanej treÅ›ci po bÅ‚Ä™dzie " "serwera\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2165,12 +2181,11 @@ " HTTP bez oczekiwania na wywoÅ‚anie ze\n" " strony serwera\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opcje HTTPS (SSL/TLS):\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" @@ -2178,54 +2193,54 @@ msgstr "" " --secure-protocol=PR wybór bezpiecznego protokoÅ‚u: auto, " "SSLv2,\n" -" SSLv3, TLSv1, PFS\n" +" SSLv3, TLSv1, TLSv1_1, TLSv1_2, PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only podążanie tylko za bezpiecznymi " "odnoÅ›nikami HTTPS\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate bez sprawdzania certyfikatu serwera\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=PLIK plik z certyfikatem klienta\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=PLIK plik klucza prywatnego\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=PLIK plik z zestawem CA\n" -#: src/main.c:861 +#: src/main.c:862 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:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=PLIK plik z zestawem CRL\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2241,7 +2256,7 @@ " rozdzielonych ';' do sprawdzenia drugiej\n" " strony poÅ‚Ä…czenia\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2249,7 +2264,7 @@ " --random-file=PLIK plik z danymi losowymi do karmienia PRNG " "SSL\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2257,7 +2272,7 @@ " --egd-file=PLIK nazwa pliku gniazda EGD z danymi " "losowymi\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2266,16 +2281,22 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=ÅAŃCUCH BezpoÅ›rednie ustawienie Å‚aÅ„cucha priorytetów " +"(GnuTLS) lub listy szyfrów (OpenSSL).\n" +" Używać z rozwagÄ…. Opcja ta nadpisuje --" +"secure-protocol.\n" +" Format i skÅ‚adnia tego Å‚aÅ„cucha zależy od " +"konkretnego silnika SSL/TLS.\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "Opcje HSTS:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts wyÅ‚Ä…cza HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2283,11 +2304,11 @@ " --hsts-file Å›cieżka bazy danych HSTS (przykrywa " "domyÅ›lnÄ…)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Opcje FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2295,36 +2316,36 @@ " --ftp-stmlf użycie formatu Stream_LF dla wszystkich\n" " binarnych plików FTP\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=UÅ»YTKOWNIK ustawia UÅ»YTKOWNIKA dla ftp\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=HASÅO ustawia HASÅO dla ftp\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing bez usuwania plików '.listing'\n" -#: src/main.c:907 +#: src/main.c:908 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:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp wyÅ‚Ä…cza \"pasywny\" tryb przesyÅ‚ania\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions zachowanie uprawnieÅ„ plików zdalnych\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2334,11 +2355,11 @@ " (nie katalogów), do których sÄ… " "dowiÄ…zania\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "Opcje FTPS:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2346,7 +2367,7 @@ " --ftps-implicit użycie domniemanego FTPS (port " "domyÅ›lny 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2357,7 +2378,7 @@ " sterujÄ…cym przy otwieraniu " "poÅ‚Ä…czenia danych\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2365,7 +2386,7 @@ " --ftps-clear-data-connection szyfrowanie tylko kanaÅ‚u sterujÄ…cego; " "wszystkie dane nieszyfrowane\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2373,11 +2394,11 @@ " --ftps-fallback-to-ftp degradowanie do FTP jeÅ›li FTPS nie " "jest obsÅ‚ugiwane przez serwer\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Opcje WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2385,23 +2406,23 @@ " --warc-file=PLIK zapis danych żądanie/odpowiedź do pliku ." "warc.gz.\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx zapis plików indeksowych CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2409,23 +2430,23 @@ " --warc-dedup=PLIK bez zapisu rekordów wymienionych w PLIKu " "CDX\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests bez obliczania skrótów SHA1\n" -#: src/main.c:949 +#: src/main.c:950 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:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2435,15 +2456,15 @@ "przy\n" " zapisie WARC.\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Pobieranie rekurencyjne:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive praca rekurencyjna\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2452,7 +2473,7 @@ "rekurencji\n" " (inf lub 0 oznacza brak ograniczeÅ„)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2460,7 +2481,7 @@ " --delete-after usuniÄ™cie plików lokalnie po ich " "pobraniu\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2470,7 +2491,7 @@ "HTML\n" " i CSS, aby wskazywaÅ‚y na pliki lokalne\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2478,7 +2499,7 @@ " --convert-file-only przeksztaÅ‚cenie tylko plikowej części URL-" "i (nazw bazowych)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2486,7 +2507,7 @@ " --backups=N przed zapisem pliku X rotacja do N kopii " "zapasowych\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2494,7 +2515,7 @@ " -K, --backup-converted przed konwersjÄ… pliku X zapis jego kopii\n" " jako X_orig\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2502,7 +2523,7 @@ " -K, --backup-converted przed konwersjÄ… pliku X zapis jego kopii\n" " jako X.orig\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2510,7 +2531,7 @@ " -m, --mirror skrót dla -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2518,7 +2539,7 @@ " -p, --page-requisites pobranie wszystkich obrazków itp.\n" " potrzebnych by wyÅ›wietlić stronÄ™ HTML\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2526,11 +2547,11 @@ " --strict-comments wÅ‚Ä…cza Å›cisÅ‚Ä… (SGML) interpretacjÄ™ " "komentarzy HTML\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Akceptowanie/odrzucanie przy pracy rekurencyjnej:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2539,7 +2560,7 @@ "akceptowanych\n" " rozszerzeÅ„\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2548,29 +2569,29 @@ "odrzucanych\n" " rozszerzeÅ„\n" -#: src/main.c:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=RODZAJ rodzaj wyrażeÅ„ regularnych (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=RODZAJ rodzaj wyrażeÅ„ regularnych (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" @@ -2578,7 +2599,7 @@ "akceptowanych\n" " domen\n" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" @@ -2586,14 +2607,14 @@ "odrzucanych\n" " domen\n" -#: src/main.c:1008 +#: src/main.c:1009 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:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2602,7 +2623,7 @@ "znaczników\n" " HTML, za którymi program ma podążać\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2611,23 +2632,23 @@ "znaczników\n" " HTML, które majÄ… być ignorowane\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative podążanie tylko za odnoÅ›nikami " "wzglÄ™dnymi\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTA lista dozwolonych katalogów\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2636,89 +2657,92 @@ " --trust-server-names użycie nazw podanych jako ostatnich\n" " elementów URL-i przekierowaÅ„\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTA lista odrzucanych katalogów\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" -msgstr "Prosimy o zgÅ‚aszanie bÅ‚Ä™dów i propozycji na adres \n" +msgstr "" +"Prosimy o wysyÅ‚anie zgÅ‚oszeÅ„ bÅ‚Ä™dów, pytaÅ„ i dyskusji na adres \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"i/lub otwieranie zgÅ‚oszeÅ„ pod https://savannah.gnu.org/bugs/?" +"func=additem&group=wget.\n" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, nie-interaktywny pobieracz sieciowy.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "HasÅ‚o dla użytkownika %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "HasÅ‚o: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Nie można utworzyć potoku\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Nazwa użytkownika dla '%s%s': " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "HasÅ‚o dla '%s%s@%s': " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Lokalizacja: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Kompilacja: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "OdnoÅ›nik: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2727,29 +2751,29 @@ "GNU Wget %s zbudowany na systemie %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (Å›rodowisko)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (użytkownik)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2764,7 +2788,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2772,37 +2796,37 @@ "\n" "Autor oryginaÅ‚u Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 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:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Problem z przydzieleniem pamiÄ™ci\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "ZakoÅ„czenie z powodu bÅ‚Ä™du w %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Polecenie `%s --help' wyÅ›wietli wiÄ™cej opcji.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nieprawidÅ‚owa opcja -- `n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2811,7 +2835,7 @@ "Podano jednoczeÅ›nie --no-clobber i --convert-links, zostanie użyte tylko --" "convert-links.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2820,26 +2844,26 @@ "Podano jednoczeÅ›nie --no-clobber i --convert-file-only, zostanie użyte tylko " "--convert-file-only.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2851,7 +2875,7 @@ "lub w poÅ‚Ä…czeniu z -p lub -r. WiÄ™cej informacji w podrÄ™czniku.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2861,7 +2885,7 @@ "we wskazanym pliku.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2871,25 +2895,25 @@ "Szczegóły w podrÄ™czniku.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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:1699 +#: src/main.c:1700 #, 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:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WyjÅ›cie WARC nie dziaÅ‚a z --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2898,28 +2922,28 @@ "WyjÅ›cie WARC nie dziaÅ‚a z --continue ani --start-pos, opcje te zostanÄ… " "wyÅ‚Ä…czone.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, 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:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"WyjÅ›cie WARC nie dziaÅ‚a z --continue ani --start-pos, opcje te zostanÄ… " +"Kompresja nie dziaÅ‚a z --continue ani --start-pos, opcje te zostanÄ… " "wyÅ‚Ä…czone.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2928,17 +2952,17 @@ "OkreÅ›lenie jednoczeÅ›nie --start-pos oraz --continue nie jest zalecane; --" "continue zostanie wyÅ‚Ä…czone.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: brakujÄ…cy URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2947,7 +2971,7 @@ "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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2956,24 +2980,24 @@ "Å»eby użyć parametru --body-data lub --mody-file, trzeba okreÅ›lić metodÄ™ " "przez --method=MetodaHTTP.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Ta wersja nie obsÅ‚uguje IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, 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:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2982,42 +3006,42 @@ "--convert-links lub --convert-file-only można użyć razem tylko jeÅ›li " "wyjÅ›ciem jest zwykÅ‚y plik.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Nie udaÅ‚o siÄ™ zainicjować biblioteki libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Nie udaÅ‚o siÄ™ zainicjować kanaÅ‚u c-ares\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Nie udaÅ‚o siÄ™ odczytać adresu IP '%s'\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Nie znaleziono URL-i w %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Nie udaÅ‚o siÄ™ przeanalizować pliku metalink %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3028,7 +3052,7 @@ "CaÅ‚kowity czas zegarowy: %s\n" "Pobrano: %d plików, %s w %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Ograniczenie na ilość pobieranych danych (%s bajtów) PRZEKROCZONE!\n" @@ -3194,7 +3218,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Kontynuacja w tle, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "WyjÅ›cie zostanie zapisane do %s.\n" @@ -3241,65 +3265,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: nie można pobrać informacji o %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "UWAGA: użycie sÅ‚abego zarodka liczb losowych.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "Użyta wersja OpenSSL jest zbyt stara, aby obsÅ‚użyć TLSv1.1\n" +msgstr "Użyta wersja OpenSSL jest zbyt stara, aby obsÅ‚użyć TLS 1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: nie zaimplementowana wartość opcji 'secure-protocol' %d\n" # c-format -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: NieprawidÅ‚owy URL %s: %s\n" +msgstr "OpenSSL: BÅ‚Ä™dna lista szyfrów: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "Nie udaÅ‚o siÄ™ nakarmić PRNG; proszÄ™ rozważyć użycie --random-file.\n" +msgstr "" +"UWAGA: Nie udaÅ‚o siÄ™ nakarmić PRNG; proszÄ™ rozważyć użycie --random-file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " BÅ‚Ä…d lokalnej kontroli centrum certyfikacji.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Napotkano samodzielnie podpisany certyfikat.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Wydany certyfikat nie jest jeszcze ważny.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Wydany certyfikat wygasÅ‚.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3308,14 +3331,14 @@ "%s: żadna z alternatywnych nazw w certyfikacie nie pasuje\n" "\tdo żądanej nazwy hosta %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, 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:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3326,7 +3349,7 @@ " Może to oznaczać, że host nie jest tym, za który siÄ™ podaje\n" " (tzn. nie jest prawdziwym %s).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3378,22 +3401,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Wczytywanie robots.txt; proszÄ™ zignorować bÅ‚Ä™dy.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, 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:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "przekroczono %d przekierowaÅ„.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3401,7 +3424,7 @@ "Program nie może sobie poradzić.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3476,99 +3499,112 @@ msgid "HTTPS support not compiled in" msgstr "ObsÅ‚uga HTTPS nie zostaÅ‚a wkompilowana" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "Napotkano niekompletnÄ… lub nieprawidÅ‚owÄ… sekwencjÄ™ wielobajtowÄ…\n" +msgstr "Napotkano niemożliwÄ… do przeksztaÅ‚cenia sekwencjÄ™ wielobajtowÄ…\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Kontynuacja w tle, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Nie udaÅ‚o siÄ™ zainicjować biblioteki libcares\n" +msgstr "Nie udaÅ‚o otworzyć przez Fopen pliku %s\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Nie udaÅ‚o siÄ™ ustawić uprawnieÅ„ %s.\n" +msgstr "Nie udaÅ‚o siÄ™ uzyskać FD dla pliku %s.\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Nie udaÅ‚o siÄ™ ustawić uprawnieÅ„ %s.\n" +msgstr "" +"Nie udaÅ‚o siÄ™ wykonać stat na pliku %s (proszÄ™ sprawdzić uprawnienia).\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Plik %s zmieniÅ‚ siÄ™ od ostatniego sprawdzenia. Kontrola bezpieczeÅ„stwa nie " +"powiodÅ‚a siÄ™." -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Nie udaÅ‚o siÄ™ odczytać adresu IP '%s'\n" +msgstr "Nie udaÅ‚o siÄ™ otworzyć pliku %s, powód: %s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Nie udaÅ‚o siÄ™ ustawić uprawnieÅ„ %s.\n" +msgstr "Nie udaÅ‚o siÄ™ wykonać stat na %s, bÅ‚Ä…d: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"Próba otwarcia pliku %s, ale zmieniÅ‚ siÄ™ od ostatniego sprawdzenia. Kontrola " +"bezpieczeÅ„stwa nie powiodÅ‚a siÄ™." -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "BÅ‚Ä™dne wyrażenie regularne %s, bÅ‚Ä…d PCRE2 %d\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "BÅ‚Ä™dne wyrażenie regularne %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "BÅ‚Ä…d podczas dopasowywania %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "PominiÄ™to klucz o niewÅ‚aÅ›ciwym rozmiarze (%d/%d): %s\n" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "BÅ‚Ä…d przy powielaniu deskryptora pliku WARC.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "BÅ‚Ä…d otwierania strumienia GZIP do pliku WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "BÅ‚Ä…d zapisu rekordu warcinfo do pliku WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3577,24 +3613,24 @@ "Otwieranie pliku WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "BÅ‚Ä…d otwierania pliku WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Plik CDX nie zawiera oryginalnych URL-i (brak kolumny 'a').\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Plik CDX nie zawiera sum kontrolnych (brak kolumny 'k').\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "Plik CDX nie zawiera id rekordów (brak kolumny 'u').\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3612,50 +3648,32 @@ "Wczytano %d rekordów z pliku CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Nie udaÅ‚o siÄ™ odczytać pliku CDX %s do deduplikacji.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Nie udaÅ‚o siÄ™ otworzyć pliku tymczasowego manifestu WARC.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Nie udaÅ‚o siÄ™ otworzyć pliku tymczasowego logu WARC.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Nie udaÅ‚o siÄ™ otworzyć pliku WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Nie udaÅ‚o siÄ™ otworzyć pliku CDX do zapisu.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Nie udaÅ‚o siÄ™ otworzyć pliku tymczasowego WARC.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 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" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/pt_BR.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/pt_BR.gmo differ diff -Nru wget-1.19.5/po/pt_BR.po wget-1.20.1/po/pt_BR.po --- wget-1.19.5/po/pt_BR.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/pt_BR.po 2018-12-26 20:10:50.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: wget-1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2017-02-11 14:39-0200\n" "Last-Translator: Rodolfo Ribeiro Gomes \n" "Language-Team: Brazilian Portuguese \n" msgstr "Envie relatos de problemas e sugestões para \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Senha para o usuário %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Senha: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Não foi possível criar redirecionamento\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Nome de usuário para \"%s%s\": " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Senha para \"%s%s@%s\": " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Localidade: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Compilação: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Link: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2824,29 +2839,29 @@ "GNU Wget %s construído em %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (ambiente)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (usuário)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2860,7 +2875,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2868,39 +2883,39 @@ "\n" "Escrito originalmente por Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "" "Por favor, envie relatos de problemas e sugestões para .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Problema de alocação de memória\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Saindo devido a erro em %s\n" # , c-format -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Tente \"%s --help\" para mais opções.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: a opção é ilegal -- \"-n%c\"\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2909,7 +2924,7 @@ "Tanto --no-clobber como --convert-links foram especificadas; somente --" "convert-links será usada.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2918,25 +2933,25 @@ "Tanto --no-clobber como --convert-file-only foram especificadas; somente --" "convert-file-only será usada.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2948,7 +2963,7 @@ "detalhes.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2958,7 +2973,7 @@ "colocado em um único arquivo que você especificou.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2968,14 +2983,14 @@ "para detalhes.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2983,12 +2998,12 @@ "A saída WARC não funciona com marcação de data/hora; a marcação será " "desabilitada.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, 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:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2997,7 +3012,7 @@ "A saída WARC não funciona com --continue ou --start-pos; elas serão " "desabilitadas.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -3005,7 +3020,7 @@ "As resenhas (digests) estão desabilitadas; não se encontrará registros " "duplicados para serem removidos.\n" -#: src/main.c:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -3014,13 +3029,13 @@ "A saída WARC não funciona com --continue ou --start-pos; elas serão " "desabilitadas.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3029,17 +3044,17 @@ "Não é recomendado especificar --start-pos e --continue ao mesmo tempo; --" "continue será desabilitado.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: falta o URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3048,7 +3063,7 @@ "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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3057,17 +3072,17 @@ "Você deve especificar um método através de --method=HTTPMethod para usar com " "--body-data ou --body-file.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, 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:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -3075,7 +3090,7 @@ "-k ou -r pode ser usada juntamente com -O somente se a saída for um arquivo " "comum.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3085,46 +3100,46 @@ "for um arquivo comum.\n" # , c-format -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Falha ao iniciar libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Falhou em iniciar o canal c-ares\n" -#: src/main.c:2045 +#: src/main.c:2052 #, 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:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Nenhum URL foi encontrado em %s.\n" # , c-format -#: src/main.c:2200 +#: src/main.c:2207 #, 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:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3136,7 +3151,7 @@ "Baixados: %d arquivos, %s em %s (%s)\n" # , c-format -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "EXCEDIDA a cota de download de %s!\n" @@ -3310,7 +3325,7 @@ msgstr "Continuando em plano de fundo, pid %lu.\n" # , c-format -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "A saída será escrita em %s.\n" @@ -3361,67 +3376,67 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: não foi possível acessar %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "AVISO: usando uma semente fraca de aleatoriedade.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "Sua versão do OpenSSL é muito antiga para suportar TLSv1.1\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: O URL %s é inválido: %s.\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: 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:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 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:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Foi encontrado um certificado auto-assinado.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Certificado emitido ainda não é válido.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Certificado emitido expirou.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3430,7 +3445,7 @@ "%s: o nome alternativo do sujeito do certificado não coincide\n" "\tcom o nome de máquina solicitado %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3438,7 +3453,7 @@ " %s: o nome comum no certificado %s não coincide com o nome de máquina " "solicitado %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3449,7 +3464,7 @@ " 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:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3505,24 +3520,24 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Carregando robots.txt; por favor ignore qualquer erro.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, 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:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "Excedeu os %d redirecionamentos.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3530,7 +3545,7 @@ "Desistindo.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3602,105 +3617,115 @@ msgid "HTTPS support not compiled in" msgstr "Compilado sem suporte a HTTPS" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Encontrou-se uma sequência multibyte inválida ou incompleta\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Continuando em plano de fundo, pid %d.\n" # , c-format -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Falha ao iniciar libcares\n" # , c-format -#: src/utils.c:865 +#: src/utils.c:871 #, 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:872 +#: src/utils.c:878 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Incapaz de obter permissões para %s.\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Incapaz de obter permissões para %s.\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Expressão regular inválida %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Expressão regular inválida %s, %s\n" # , c-format -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Erro ao comparar %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Erro ao abrir o arquivo WARC %s.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Erro ao abrir fluxo GZIP para arquivo WARC.\n" # , c-format -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Erro ao escrever registro warcinfo em arquivo WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3709,27 +3734,27 @@ "Abrindo arquivo WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Erro ao abrir o arquivo WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Arquivo CDX não lista os URLs originais (falta a coluna \"a\").\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" "Arquivo CDX não lista as somas de verificação (falta a coluna \"k\").\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" "Arquivo CDX não lista os identificadores de registro (falta a coluna \"u" "\").\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3744,36 +3769,36 @@ "%d registros carregados de CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Não foi possível ler o arquivo CDX %s para remover duplicatas.\n" # , c-format -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Não foi possível abrir arquivo de manifesto WARC.\n" # , c-format -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Não foi possível abrir arquivo de registro WARC temporário.\n" # , c-format -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Não foi possível abrir arquivo WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Não foi possível abrir o arquivo CDX para saída.\n" # , c-format -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Não foi possível abrir arquivo WARC temporário.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Encontrou entrada exata no arquivo CDX. Salvando registro revisitado em " Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/pt.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/pt.gmo differ diff -Nru wget-1.19.5/po/pt.po wget-1.20.1/po/pt.po --- wget-1.19.5/po/pt.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/pt.po 2018-12-26 20:10:50.000000000 +0000 @@ -1,15 +1,16 @@ # Portuguese translation of the "wget" messages -# Copyright (C) 2005 Free Software Foundation, Inc. +# Copyright (C) 2018 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Helder Correia , 2005-2008. +# Pedro Albuquerque , 2018. # msgid "" msgstr "" -"Project-Id-Version: wget 1.14.128\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2013-07-03 22:22+0000\n" -"Last-Translator: Helder Correia \n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-14 06:09+0000\n" +"Last-Translator: Pedro Albuquerque \n" "Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -17,16 +18,15 @@ "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.7\n" #: lib/error.c:195 -#, fuzzy msgid "Unknown system error" -msgstr "Erro desconhecido" +msgstr "Erro de sistema desconhecido" #: lib/gai_strerror.c:57 -#, fuzzy msgid "Address family for hostname not supported" -msgstr "Endereços IPv6 não suportados" +msgstr "Família de endereço para nome de servidor não suportado" #: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" @@ -34,109 +34,106 @@ #: lib/gai_strerror.c:59 msgid "Bad value for ai_flags" -msgstr "" +msgstr "Valor errado para ai_flags" #: lib/gai_strerror.c:60 -#, fuzzy msgid "Non-recoverable failure in name resolution" -msgstr "Falha temporária na resolução de nome" +msgstr "Falha irrecuperável na resolução de nome" #: lib/gai_strerror.c:61 msgid "ai_family not supported" -msgstr "" +msgstr "ai_family não suportado" #: lib/gai_strerror.c:62 msgid "Memory allocation failure" -msgstr "" +msgstr "Falha na alocação de memória" #: lib/gai_strerror.c:63 msgid "No address associated with hostname" -msgstr "" +msgstr "Sem endereço associado ao nome de servidor" #: lib/gai_strerror.c:64 msgid "Name or service not known" -msgstr "" +msgstr "Nome ou serviço desconhecidos" #: lib/gai_strerror.c:65 msgid "Servname not supported for ai_socktype" -msgstr "" +msgstr "Nome de servidor não suportado para ai_socktype" #: lib/gai_strerror.c:66 -#, fuzzy msgid "ai_socktype not supported" -msgstr "Endereços IPv6 não suportados" +msgstr "ai_socktype não suportado" #: lib/gai_strerror.c:67 -#, fuzzy msgid "System error" -msgstr "Sem erros" +msgstr "Erro de sistema" #: lib/gai_strerror.c:68 msgid "Argument buffer too small" -msgstr "" +msgstr "Buffer de argumentos muito pequeno" #: lib/gai_strerror.c:70 msgid "Processing request in progress" -msgstr "" +msgstr "A processar pedido em curso" #: lib/gai_strerror.c:71 msgid "Request canceled" -msgstr "" +msgstr "Pedido cancelado" #: lib/gai_strerror.c:72 msgid "Request not canceled" -msgstr "" +msgstr "Pedido não cancelado" #: lib/gai_strerror.c:73 msgid "All requests done" -msgstr "" +msgstr "Todos os pedidos feitos" #: lib/gai_strerror.c:74 msgid "Interrupted by a signal" -msgstr "" +msgstr "Interrompido por um sinal" #: lib/gai_strerror.c:75 msgid "Parameter string not correctly encoded" -msgstr "" +msgstr "Cadeia parâmetro incorrectamente codificada" #: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Erro desconhecido" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: a opção '-W %s' é ambígua\n" +msgstr "%s: a opção \"%s%s\" é ambígua\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: a opção '%s' é ambígua\n" +msgstr "%s: a opção \"%s%s\" é ambígua; possibilidades:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: opção '%c%s' desconhecida\n" +msgstr "%s: opção \"%s%s\" desconhecida\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, 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" +msgstr "%s: a opção \"%s%s\" não permite um argumento\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: a opção '%s' requere um argumento\n" +msgstr "\"%s: a opção \"%s%s\" requer um argumento\n" #: lib/getopt.c:621 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: opção inválida -- %c\n" +msgstr "%s: opção inválida -- \"%c\"\n" #: lib/getopt.c:636 lib/getopt.c:682 -#, fuzzy, c-format +#, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s a opção requere um argumento -- %c\n" +msgstr "%s: a opção requer um argumento -- \"%c\"\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -161,216 +158,214 @@ #. and use glyphs suitable for your language. #: lib/quotearg.c:362 msgid "`" -msgstr "" +msgstr "\"" #: lib/quotearg.c:363 msgid "'" -msgstr "" +msgstr "\"" #: lib/regcomp.c:135 msgid "Success" -msgstr "" +msgstr "Sucesso" #: lib/regcomp.c:138 msgid "No match" -msgstr "" +msgstr "Sem correspondência" #: lib/regcomp.c:141 msgid "Invalid regular expression" -msgstr "" +msgstr "Expressão regular inválida" #: lib/regcomp.c:144 msgid "Invalid collation character" -msgstr "" +msgstr "Carácter de agrupamento inválido" #: lib/regcomp.c:147 -#, fuzzy msgid "Invalid character class name" -msgstr "Nome de máquina inválido" +msgstr "Nome de classe de carácter inválido" #: lib/regcomp.c:150 msgid "Trailing backslash" -msgstr "" +msgstr "Barra invertida final" #: lib/regcomp.c:153 -#, fuzzy msgid "Invalid back reference" -msgstr "Nome de utilizador inválido" +msgstr "Referência de retorno inválida" #: lib/regcomp.c:156 msgid "Unmatched [, [^, [:, [., or [=" -msgstr "" +msgstr "[, [^, [:, [., ou [= sem par" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" -msgstr "" +msgstr "( ou \\( não correspondido" #: lib/regcomp.c:162 msgid "Unmatched \\{" -msgstr "" +msgstr "\\{ não correspondido" #: lib/regcomp.c:165 msgid "Invalid content of \\{\\}" -msgstr "" +msgstr "Conteúdo de \\{\\} inválido" #: lib/regcomp.c:168 -#, fuzzy msgid "Invalid range end" -msgstr "Nome de utilizador inválido" +msgstr "Final de intervalo inválido" #: lib/regcomp.c:171 msgid "Memory exhausted" -msgstr "" +msgstr "Memória esgotada" #: lib/regcomp.c:174 msgid "Invalid preceding regular expression" -msgstr "" +msgstr "Expressão regular precedente inválida" #: lib/regcomp.c:177 msgid "Premature end of regular expression" -msgstr "" +msgstr "Fim prematuro de expressão regular" #: lib/regcomp.c:180 msgid "Regular expression too big" -msgstr "" +msgstr "Expressão regular muito grande" #: lib/regcomp.c:183 msgid "Unmatched ) or \\)" -msgstr "" +msgstr ") ou \\) sem par" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" -msgstr "" +msgstr "Sem expressão regular prévia" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" -msgstr "" +msgstr "impossível criar túnel" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" -msgstr "" +msgstr "sub-processo %s falhou" #: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" -msgstr "" +msgstr "_open_osfhandle falhou" #: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" -msgstr "" +msgstr "impossível restaurar fd %d: dup2 falhou" #: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317 #, c-format msgid "%s subprocess" -msgstr "" +msgstr "sub-processo %s" #: lib/wait-process.c:274 lib/wait-process.c:346 #, c-format msgid "%s subprocess got fatal signal %d" -msgstr "" +msgstr "sub-processo %s obteve sinal fatal %d" #: lib/xalloc-die.c:34 msgid "memory exhausted" -msgstr "" +msgstr "Memória esgotada" #: src/connect.c:200 -#, fuzzy, c-format +#, 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" +"%s: impossível resolver o endereço de associação \"%s\"; a desactivar a " +"associação.\n" #: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " -msgstr "A conectar %s|%s|:%d... " +msgstr "A ligar a %s|%s|:%d... " #: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " -msgstr "A conectar %s:%d... " +msgstr "A ligar a %s:%d... " #: src/connect.c:292 -#, fuzzy, c-format +#, c-format msgid "Connecting to [%s]:%d... " -msgstr "A conectar %s:%d... " +msgstr "A ligar a [%s]:%d... " #: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" -msgstr "" +msgstr "setsockopt SO_RCVBUF falhou: %s\n" #: src/connect.c:356 msgid "connected.\n" -msgstr "conectado.\n" +msgstr "ligado.\n" #: src/connect.c:375 src/host.c:914 src/host.c:952 #, c-format msgid "failed: %s.\n" msgstr "falhou: %s.\n" -#: src/connect.c:399 src/http.c:2105 -#, fuzzy, c-format +#: src/connect.c:399 src/http.c:2108 +#, c-format msgid "%s: unable to resolve host address %s\n" -msgstr "%s: incapaz de processar o endereço '%s'\n" +msgstr "%s: impossível resolver o endereço do servidor %s\n" #: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" -msgstr "" +msgstr "setsockopt SO_REUSEADDR falhou: %s\n" #: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" -msgstr "" +msgstr "Demasiados fds abertos. Impossível usar selecção num fd >= %d\n" #: src/convert.c:198 -#, fuzzy, c-format +#, c-format msgid "Converted links in %d files in %s seconds.\n" -msgstr "%d ficheiros convertidos em %s segundos.\n" +msgstr "Ligações convertidas em %d ficheiros em %s segundos.\n" #: src/convert.c:227 -#, fuzzy, c-format +#, c-format msgid "Converting links in %s... " -msgstr "A converter %s..." +msgstr "A converter ligações em %s... " #: src/convert.c:240 msgid "nothing to do.\n" -msgstr "nada para fazer.\n" +msgstr "nada a fazer.\n" #: src/convert.c:248 src/convert.c:272 #, c-format msgid "Cannot convert links in %s: %s\n" -msgstr "Não é possível converter as ligações em %s: %s\n" +msgstr "Impossível converter ligações em %s: %s\n" #: src/convert.c:263 -#, fuzzy, c-format +#, c-format msgid "Unable to delete %s: %s\n" -msgstr "Não é possível remover '%s': %s\n" +msgstr "Impossível eliminar %s: %s\n" #: src/convert.c:578 #, c-format msgid "Cannot back up %s as %s: %s\n" -msgstr "Não é possível salvaguardar %s como %s: %s\n" +msgstr "Impossível fazer segurança de %s como %s: %s\n" #: src/cookies.c:310 -#, fuzzy, c-format +#, c-format msgid "Unable to get cookie for %s\n" -msgstr "Não é possível remover '%s': %s\n" +msgstr "Impossível obter cookie para %s\n" #: 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" +msgstr "Erro de sintaxe em Set-Cookie: %s na posição %d.\n" #: src/cookies.c:771 -#, fuzzy, c-format +#, 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" +msgstr "O \"cookie\" vindo de %s tentou definir o domínio como " #: src/cookies.c:774 src/spider.c:92 #, c-format @@ -378,19 +373,19 @@ msgstr "%s\n" #: src/cookies.c:1225 src/cookies.c:1346 -#, fuzzy, c-format +#, c-format msgid "Cannot open cookies file %s: %s\n" -msgstr "Não é possível abrir o ficheiro de cookies '%s': %s\n" +msgstr "Impossível abrir o ficheiro de cookies %s: %s\n" #: src/cookies.c:1383 -#, fuzzy, c-format +#, c-format msgid "Error writing to %s: %s\n" -msgstr "Erro ao escrever para '%s': %s\n" +msgstr "Erro ao escrever em %s: %s\n" #: src/cookies.c:1386 -#, fuzzy, c-format +#, c-format msgid "Error closing %s: %s\n" -msgstr "Erro ao fechar '%s': %s\n" +msgstr "Erro ao fechar %s: %s\n" #: src/ftp-ls.c:1045 msgid "Unsupported listing type, trying Unix listing parser.\n" @@ -437,15 +432,15 @@ msgid "Length: %s" msgstr "Tamanho: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" -msgstr ", %s (%s) em falta" +msgstr ", %s (%s) restante" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" -msgstr ", %s em falta" +msgstr ", %s restante" #: src/ftp.c:238 msgid " (unauthoritative)\n" @@ -453,18 +448,18 @@ #: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." -msgstr "" +msgstr "Impossível inicializar SSL. Será desactivado." #: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " -msgstr "A entrar como %s ... " +msgstr "A iniciar sessão como %s... " #: 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" +msgstr "Erro na resposta do servidor, a fechar a ligação de controlo.\n" #: src/ftp.c:511 msgid "Error in server greeting.\n" @@ -473,32 +468,32 @@ #: 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" +msgstr "A escrita falhou, a fechar a ligação de controlo.\n" #: src/ftp.c:524 msgid "The server refuses login.\n" -msgstr "O servidor recusa a entrada.\n" +msgstr "O servidor recusa a sessão.\n" #: src/ftp.c:530 msgid "Login incorrect.\n" -msgstr "Entrada incorrecta.\n" +msgstr "Início incorrecto.\n" #: src/ftp.c:536 msgid "Logged in!\n" -msgstr "Entrada com sucesso!\n" +msgstr "Sessão iniciada!\n" #: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" -msgstr "" +msgstr "O servidor não aceitou o comando \"PBSZ 0\".\n" #: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" -msgstr "" +msgstr "O servidor não aceitou o comando \"PROT %c\".\n" #: 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" +msgstr "Erro do servidor, impossível determinar o tipo de sistema.\n" #: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " @@ -511,7 +506,7 @@ #: 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" +msgstr "Tipo \"%c\" desconhecido, a fechar a ligação de controlo.\n" #: src/ftp.c:749 msgid "done. " @@ -523,7 +518,7 @@ #: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" -msgstr "" +msgstr "Secção logicamente impossível atingida em getftp()" #: src/ftp.c:940 #, c-format @@ -532,14 +527,17 @@ "cwd_start: %d\n" "cwd_end: %d\n" msgstr "" +"cwd_count: %d\n" +"cwd_start: %d\n" +"cwd_end: %d\n" #: src/ftp.c:970 -#, fuzzy, c-format +#, c-format msgid "" "No such directory %s.\n" "\n" msgstr "" -"Pasta '%s' inexistente.\n" +"Pasta %s inexistente.\n" "\n" #: src/ftp.c:991 @@ -547,31 +545,30 @@ msgstr "==> CWD não requerido.\n" #: src/ftp.c:1034 -#, fuzzy msgid "File has already been retrieved.\n" -msgstr "O ficheiro '%s' já existe; a não transferir.\n" +msgstr "O ficheiro já foi obtido.\n" #: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" -msgstr "Não é possível iniciar a transferência PASV.\n" +msgstr "Impossível iniciar a transferência PASV.\n" #: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" -msgstr "Não é possível analisar a resposta PASV.\n" +msgstr "Impossível analisar a resposta PASV.\n" #: 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" +msgstr "impossível ligar a %s porta %d: %s\n" #: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" -msgstr "Erro de cobertura (%s).\n" +msgstr "Erro de associação (%s).\n" #: src/ftp.c:1151 msgid "Invalid PORT.\n" -msgstr "PORT inválido.\n" +msgstr "PORTA inválida.\n" #: src/ftp.c:1197 msgid "" @@ -582,38 +579,38 @@ "REST falhou, a reiniciar.\n" #: src/ftp.c:1240 -#, fuzzy, c-format +#, c-format msgid "File %s exists.\n" msgstr "" -"O ficheiro remoto existe.\n" +"Ficheiro %s existe.\n" "\n" #: src/ftp.c:1246 -#, fuzzy, c-format +#, c-format msgid "No such file %s.\n" msgstr "" -"O ficheiro '%s' não existe.\n" +"Ficheiro %s não existe.\n" "\n" #: src/ftp.c:1296 -#, fuzzy, c-format +#, c-format msgid "" "No such file %s.\n" "\n" msgstr "" -"O ficheiro '%s' não existe.\n" +"Ficheiro %s não existe.\n" "\n" #: src/ftp.c:1346 -#, fuzzy, c-format +#, c-format msgid "" "No such file or directory %s.\n" "\n" msgstr "" -"Ficheiro ou pasta '%s' inexistente.\n" +"Ficheiro ou pasta %s inexistente.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s formou-se de repente.\n" @@ -621,64 +618,64 @@ #: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" -msgstr "%s: %s, a fechar a conexão de controlo.\n" +msgstr "%s: %s, a fechar a ligação de controlo.\n" #: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " -msgstr "%s (%s) - conexão de dados: %s; " +msgstr "%s (%s) - ligação de dados: %s; " #: src/ftp.c:1621 msgid "Control connection closed.\n" -msgstr "Conexão de controlo fechada.\n" +msgstr "Ligação de controlo fechada.\n" #: src/ftp.c:1639 msgid "Data transfer aborted.\n" -msgstr "Transferência de dados cancelada.\n" +msgstr "Transferência de dados abortada.\n" -#: src/ftp.c:1863 src/main.c:1681 -#, fuzzy, c-format +#: src/ftp.c:1863 src/main.c:1682 +#, c-format msgid "File %s already there; not retrieving.\n" -msgstr "O ficheiro '%s' já existe; a não transferir.\n" +msgstr "O ficheiro %s já existe; a não obter.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(tentativa:%2d)" -#: src/ftp.c:2039 src/http.c:4723 -#, fuzzy, c-format +#: src/ftp.c:2039 src/http.c:4731 +#, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -"%s (%s) - '%s' gravado [%s/%s]\n" +"%s (%s) - escrito em stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 -#, fuzzy, c-format +#: src/ftp.c:2040 src/http.c:4732 +#, c-format msgid "" "%s (%s) - %s saved [%s]\n" "\n" msgstr "" -"%s (%s) - '%s' gravado [%s]\n" +"%s (%s) - %s gravado [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "A remover %s.\n" #: src/ftp.c:2157 -#, fuzzy, c-format +#, c-format msgid "Using %s as listing tmp file.\n" -msgstr "A usar '%s' como ficheiro de listagem temporário.\n" +msgstr "A usar %s como ficheiro de listagem temporário.\n" #: src/ftp.c:2174 -#, fuzzy, c-format +#, c-format msgid "Removed %s.\n" -msgstr "'%s' removido.\n" +msgstr "%s removido.\n" #: src/ftp.c:2213 #, c-format @@ -686,19 +683,17 @@ msgstr "Profundidade de recursividade %d excedeu a profundidade máxima %d.\n" #: src/ftp.c:2283 -#, fuzzy, c-format +#, 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" +msgstr "Ficheiro remoto mais antigo que o ficheiro local %s -- a não obter.\n" #: src/ftp.c:2291 -#, fuzzy, c-format +#, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "" -"O ficheiro remoto é mais recente que o ficheiro local '%s' -- a transferir.\n" +"Ficheiro remoto mais recente que o ficheiro local %s -- a obter.\n" "\n" #: src/ftp.c:2298 @@ -707,7 +702,7 @@ "The sizes do not match (local %s) -- retrieving.\n" "\n" msgstr "" -"Os tamanhos não coincidem (local %s) -- a transferir.\n" +"Os tamanhos não coincidem (local %s) -- a obter.\n" "\n" #: src/ftp.c:2316 @@ -727,15 +722,14 @@ msgstr "A criar a ligação simbólica %s -> %s\n" #: src/ftp.c:2352 -#, fuzzy, c-format +#, 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" +msgstr "Ligações simbólicas não suportadas, a ignorar ligação simbólica %s.\n" #: src/ftp.c:2367 -#, fuzzy, c-format +#, c-format msgid "Skipping directory %s.\n" -msgstr "A ignorar a pasta '%s'.\n" +msgstr "A ignorar a pasta %s.\n" #: src/ftp.c:2380 #, c-format @@ -745,194 +739,204 @@ #: src/ftp.c:2404 #, c-format msgid "Failed to set permissions for %s.\n" -msgstr "" +msgstr "Falha ao definir permissões para %s.\n" #: src/ftp.c:2425 #, c-format msgid "%s: corrupt time-stamp.\n" -msgstr "%s: selo temporal corrompido.\n" +msgstr "%s: carimbo corrompido.\n" #: src/ftp.c:2449 #, 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 " +"As pastas não serão transferidas, uma vez que a profundidade é %d (máx. " "%d).\n" #: src/ftp.c:2500 -#, fuzzy, c-format +#, 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" +msgstr "A não descer até %s, uma vez que está excluída/não incluída.\n" -#: src/ftp.c:2590 src/ftp.c:2604 -#, fuzzy, c-format +#: src/ftp.c:2613 +#, c-format msgid "Rejecting %s.\n" -msgstr "A rejeitar '%s'.\n" +msgstr "A rejeitar %s.\n" + +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "A rejeitar %s (entrada inválida).\n" -#: src/ftp.c:2627 +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s está excluída/não incluída através de regexp.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" -msgstr "Erro ao corresponder %s com %s: %s\n" +msgstr "Erro ao comparar %s com %s: %s\n" -#: src/ftp.c:2683 -#, fuzzy, c-format +#: src/ftp.c:2685 +#, c-format msgid "No matches on pattern %s.\n" -msgstr "Não há correspondências com o padrão '%s'.\n" +msgstr "Não há correspondências com o padrão %s.\n" -#: src/ftp.c:2755 -#, fuzzy, c-format +#: src/ftp.c:2757 +#, c-format msgid "Wrote HTML-ized index to %s [%s].\n" -msgstr "Ãndice em HTML gravado para '%s' [%s].\n" +msgstr "Ãndice HTMLescrito em %s [%s].\n" -#: src/ftp.c:2760 -#, fuzzy, c-format +#: src/ftp.c:2762 +#, c-format msgid "Wrote HTML-ized index to %s.\n" -msgstr "Ãndice HTML gravado para '%s'.\n" +msgstr "Ãndice HTML escrito em %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" -msgstr "" +msgstr "ERRO: impossível abrir pasta %s\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" -msgstr "" +msgstr "ERRO: falha ao abrir cert %s: (%d).\n" -#: src/gnutls.c:169 -#, fuzzy, c-format +#: src/gnutls.c:174 +#, c-format msgid "Loaded CA certificate '%s'\n" -msgstr "Erro ao analisar URL %s do 'proxy': %s.\n" +msgstr "Carregado certificado CA \"%s\"\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" -msgstr "" +msgstr "ERRO: falha ao carregar ficheiro CRL \"%s\": (%d)\n" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" -msgstr "" +msgstr "Carregado ficheiro CRL \"%s\"\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" -msgstr "" +msgstr "ERRO: GnuTLS requer que a chave e o certificado sejam do mesmo tipo.\n" + +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "A sua versão GnuTLS é demasiado antiga para suportar TLS 1.3\n" -#: src/gnutls.c:576 +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "" +msgstr "GnuTLS: valor da opção \"secure-protocol\" %u não implementado\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 -#, fuzzy +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" -msgstr "Envie erros e sugestões para .\n" +msgstr "Por favor, reporte este erro a .\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" -msgstr "" +msgstr "GnuTLS: valor da opção \"secure-protocol\" %d não implementado\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: impossível definir a cadeia prio directamente. A recuar para a " +"prioridade predefinida.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ERRO" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "AVISO" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" -msgstr "%s: Certificado não apresentado por %s.\n" +msgstr "%s: sem certificado apresentado por %s.\n" -#: src/gnutls.c:807 -#, fuzzy, c-format +#: src/gnutls.c:931 +#, c-format msgid "%s: The certificate of %s is not trusted.\n" -msgstr "%s: Certificado não apresentado por %s.\n" +msgstr "%s: o certificado de %s não é de confiança.\n" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" -msgstr "" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" +msgstr "%s: o certificada de %s não tem um utilizador conhecido.\n" -#: src/gnutls.c:809 -#, fuzzy, c-format +#: src/gnutls.c:933 +#, c-format msgid "%s: The certificate of %s has been revoked.\n" -msgstr " Certificado emitido expirado.\n" +msgstr "%s: o certificado de %s foi revogado.\n" -#: src/gnutls.c:810 -#, fuzzy, c-format +#: src/gnutls.c:934 +#, c-format msgid "%s: The certificate signer of %s was not a CA.\n" -msgstr "%s: Certificado não apresentado por %s.\n" +msgstr "%s: o signatário do certificado %s não é um CA.\n" -#: src/gnutls.c:811 -#, fuzzy, c-format +#: src/gnutls.c:935 +#, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" -msgstr " Certificado emitido expirado.\n" +msgstr "%s: o certificado de %s foi assinado usando um algoritmo inseguro.\n" -#: src/gnutls.c:812 -#, fuzzy, c-format +#: src/gnutls.c:936 +#, c-format msgid "%s: The certificate of %s is not yet activated.\n" -msgstr "%s: Certificado não apresentado por %s.\n" +msgstr "%s: o certificado de %s ainda não foi activado.\n" -#: src/gnutls.c:813 -#, fuzzy, c-format +#: src/gnutls.c:937 +#, c-format msgid "%s: The certificate of %s has expired.\n" -msgstr " Certificado emitido expirado.\n" +msgstr "%s: o certificado de %s expirou.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" -msgstr "" +msgstr "Erro ao initializar o certificado X509: %s\n" -#: src/gnutls.c:834 -#, fuzzy +#: src/gnutls.c:958 msgid "No certificate found\n" -msgstr "%s: Certificado não apresentado por %s.\n" +msgstr "Sem certificados\n" -#: src/gnutls.c:841 -#, fuzzy, c-format +#: src/gnutls.c:965 +#, c-format msgid "Error parsing certificate: %s\n" -msgstr "Erro ao analisar URL %s do 'proxy': %s.\n" +msgstr "Erro ao analisar o certificado: %s.\n" -#: src/gnutls.c:848 -#, fuzzy +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" -msgstr " Certificado emitido ainda inválido.\n" +msgstr "O certificado ainda não foi activado\n" -#: src/gnutls.c:853 -#, fuzzy +#: src/gnutls.c:977 msgid "The certificate has expired\n" -msgstr " Certificado emitido expirado.\n" +msgstr "O certificado expirou\n" -#: src/gnutls.c:860 -#, fuzzy, c-format +#: src/gnutls.c:984 +#, 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" +msgstr "O dono do certificado não corresponde ao nome do servidor %s\n" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" -msgstr "" +msgstr "A chave pública não corresponde à chave pública afixada!\n" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" -msgstr "" +msgstr "O certificado tem de ser X.509\n" #: src/host.c:156 msgid "Error in handling the address list.\n" -msgstr "" +msgstr "Erro ao gerir a lista de endereços.\n" #: src/host.c:367 msgid "Unknown host" -msgstr "Máquina desconhecida" +msgstr "Servidor desconhecido" #: src/host.c:849 #, c-format @@ -941,7 +945,7 @@ #: src/host.c:925 msgid "failed: No IPv4/IPv6 addresses for host.\n" -msgstr "falhou: Endereços IPv4/IPv6 inexistentes para a máquina.\n" +msgstr "falhou: sem endereços IPv4/IPv6 para o servidor.\n" #: src/host.c:955 msgid "failed: timed out.\n" @@ -950,297 +954,312 @@ #: 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" +msgstr "%s: impossível resolver a ligação incompleta %s.\n" #: src/html-url.c:939 #, c-format msgid "%s: Invalid URL %s: %s\n" -msgstr "%s: Endereço '%s' inválido: %s\n" +msgstr "%s: URL inválido %s: %s\n" #: 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:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Sem cabeçalhos, a assumir HTTP/0.9" -#: src/http.c:1620 -#, fuzzy, c-format +#: src/http.c:1623 +#, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "" -"O ficheiro '%s' já existe, a não transferir.\n" +"O ficheiro %s já existe, a não obter.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" -msgstr "" +msgstr "gmtime falhou. Isto é provavelmente um erro.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" +"Impossível converter a datação para formato http. A recuar para hora 0 como " +"última modificação.\n" -#: src/http.c:1995 -#, fuzzy, c-format +#: src/http.c:1998 +#, c-format msgid "BODY data file %s missing: %s\n" -msgstr "Ficheiro de dados POST '%s' em falta: %s\n" +msgstr "Ficheiro de dados BODY %s em falta: %s\n" -#: src/http.c:2087 -#, fuzzy, c-format +#: src/http.c:2090 +#, c-format msgid "Reusing existing connection to [%s]:%d.\n" -msgstr "A reutilizar a conexão existente com %s:%d.\n" +msgstr "A reutilizar ligação existente a [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" -msgstr "A reutilizar a conexão existente com %s:%d.\n" +msgstr "A reutilizar ligação existente a %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" -msgstr "Falha ao ler a resposta do procurador ('proxy'): %s\n" +msgstr "Falha ao ler a resposta do proxy: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRO %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" -msgstr "Linha de estado mal-formada" +msgstr "Linha de estado mal formada" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" -msgstr "Falhou o 'túnel' com o procurador ('proxy'): %s" +msgstr "Túnel proxy falhou: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Esquema de autenticação desconhecido.\n" -#: src/http.c:2444 -#, fuzzy, c-format +#: src/http.c:2447 +#, c-format msgid "Authentication selected: %s\n" -msgstr "Esquema de autenticação desconhecido.\n" +msgstr "Autenticação seleccionada: %s\n" -#: src/http.c:2575 -#, fuzzy, c-format +#: src/http.c:2578 +#, c-format msgid "Saving to: %s\n" -msgstr "A gravar em: '%s'\n" +msgstr "A gravar em: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" +"Ao transferir assinatura:\n" +"%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" +"Impossível ler conteúdo da assinatura do ficheiro temporário. A saltar.\n" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" +"Impossível criar ficheiro temporário. A saltar a transferência da " +"assinatura.\n" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" -msgstr "" +msgstr "Valor pri inválido. A assumir %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" +"Impossível encontrar informação aceitável para recursos Metalink.\n" +"A ignorá-los.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" -msgstr "A desactivar o SSL devido a erros encontrados.\n" +msgstr "A desactivar SSL devido a erros encontrados.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "Pedido %s enviado, a aguardar resposta..." -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Nenhuns dados recebidos.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Erro de leitura (%s) nos cabeçalhos.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(sem descrição)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Localização: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "não especificado" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [a seguir]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" +"Ficheiro %s não modificado no servidor. A omitir transferência.\n" +"\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" "You might want to add --no-if-modified-since option.\n" "\n" msgstr "" +"Servidor ignorado Cabeçalho If-Modified-Since para o ficheiro %s.\n" +"Poderá querer adicionar a opção --no-if-modified-since.\n" +"\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" "\n" msgstr "" "\n" -" O ficheiro já está todo transferido; nada para fazer.\n" +" O ficheiro já foi obtido; nada a fazer.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Tamanho: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignorado" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" -msgstr "Aviso: carácteres de expansão ('wildcards') não suportados no HTTP.\n" +msgstr "Aviso: caracteres universais não são suportados em HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 -#, fuzzy, c-format +#: src/http.c:4380 +#, c-format msgid "Cannot write to %s (%s).\n" -msgstr "Não é possível escrever para '%s' (%s).\n" +msgstr "Impossível escrever em %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" -msgstr "" +msgstr "Atributo requerido em falta no cabeçalho recebido.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" -msgstr "" +msgstr "Autenticação Utilizador/Senha falhou.\n" -#: src/http.c:4409 -#, fuzzy +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" -msgstr "Não é possível escrever para '%s' (%s).\n" +msgstr "Impossível escrever no ficheiro WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" -msgstr "" +msgstr "Impossível escrever no ficheiro temporário WARC.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" -msgstr "Incapaz de estabelecer a conexão SSL.\n" +msgstr "Impossível estabelecer ligação SSL.\n" -#: src/http.c:4426 -#, fuzzy, c-format +#: src/http.c:4432 +#, c-format msgid "Cannot unlink %s (%s).\n" -msgstr "Não é possível escrever para '%s' (%s).\n" +msgstr "Impossível desligar %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" -msgstr "ERRO: Redireccionamento (%d) sem localização.\n" +msgstr "ERRO: redireccionamento (%d) sem localização.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" +"Impossível encontrar dados Metalink na resposta HTTP. A transferir ficheiro " +"com HTTP GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" -msgstr "" +msgstr "Encontrados cabeçalhos Metalink. A mudar para modo Metalink.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "O ficheiro remoto não existe -- ligação quebrada!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" -msgstr "Falta o último cabeçalho modificado -- selos temporais desactivados.\n" +msgstr "Último cabeçalho modificado em falta -- carimbos desactivados.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" -msgstr "Último cabeçalho modificado inválido -- selo temporal ignorado.\n" +msgstr "Último cabeçalho modificado inválido -- carimbo ignorado.\n" -#: src/http.c:4572 -#, fuzzy, c-format +#: src/http.c:4580 +#, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "" -"O ficheiro do servidor não é mais recente que o ficheiro local '%s' -- a não " -"transferir.\n" +"O ficheiro do servidor não é mais recente que o ficheiro local %s -- a não " +"obter.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" -msgstr "Os tamanhos não coincidem (local %s) -- a transferir.\n" +msgstr "Os tamanhos não coincidem (local %s) -- a obter.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" -msgstr "O ficheiro remoto é mais recente, a transferir.\n" +msgstr "O ficheiro remoto é mais recente, a obter.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" "\n" msgstr "" -"O ficheiro remoto existe e pode conter ligações para outros recursos -- a " -"transferir.\n" +"O ficheiro remoto existe e pode conter ligações a outros recursos -- a " +"obter.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" -"O ficheiro remoto existe mas não contém ligações -- não transferir.\n" +"O ficheiro remoto existe mas não contém ligações -- a não obter.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" "O ficheiro remoto existe e pode conter mais ligações,\n" -"mas recursividade está desactivada -- a não transferir.\n" +"mas a recursividade está desactivada -- a não obter.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1248,620 +1267,608 @@ "O ficheiro remoto existe.\n" "\n" -#: src/http.c:4637 -#, fuzzy, c-format +#: src/http.c:4645 +#, c-format msgid "%s URL: %s %2d %s\n" -msgstr "%s: Endereço '%s' inválido: %s\n" +msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 -#, fuzzy, c-format +#: src/http.c:4695 +#, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -"%s (%s) - '%s' gravado [%s/%s]\n" +"%s (%s) - escrito em stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 -#, fuzzy, c-format +#: src/http.c:4696 +#, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" "\n" msgstr "" -"%s (%s) - '%s' gravado [%s/%s]\n" +"%s (%s) - %s gravado [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " -msgstr "%s (%s) - Conexão fechada ao byte %s. " +msgstr "%s (%s) - ligação fechada no byte %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." -msgstr "%s (%s) - Erro de leitura no byte %s (%s)." +msgstr "%s (%s) - erro de leitura no byte %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " -msgstr "%s (%s) - Erro de leitura no byte %s/%s (%s). " +msgstr "%s (%s) - erro de leitura no byte %s/%s (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" -msgstr "" +msgstr "Qualidade de protecção \"%s\" não suportada.\n" -#: src/http.c:5024 -#, fuzzy, c-format +#: src/http.c:5032 +#, c-format msgid "Unsupported algorithm '%s'.\n" -msgstr "Esquema não suportado" +msgstr "Algoritmo \"%s\" não suportado.\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, 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" +msgstr "" +"%s: WGETRC aponta para %s, o qual não pôde ser acedido devido a erro: %s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" -msgstr "%s: Não é possível ler %s (%s).\n" +msgstr "%s: impossível ler %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" -msgstr "%s: Erro em %s na linha %d.\n" +msgstr "%s: erro em %s na linha %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" -msgstr "%s: Erro de sintaxe em %s na linha %d.\n" +msgstr "%s: erro de sintaxe em %s na linha %d.\n" -#: src/init.c:713 -#, fuzzy, c-format +#: src/init.c:706 +#, c-format msgid "%s: Unknown command %s in %s at line %d.\n" -msgstr "%s: Comando desconhecido '%s' em %s na linha %d.\n" +msgstr "%s: comando desconhecido %s em %s na linha %d.\n" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" "'%s',\n" "or specify a different file using --config.\n" msgstr "" +"Análise do ficheiro de sistema wgetrc (env SYSTEM_WGETRC) falhou. Por favor, " +"verifique\n" +"\"%s\",\n" +"ou especifique um ficheiro diferente , usando --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" "'%s',\n" "or specify a different file using --config.\n" msgstr "" +"Análise do ficheiro de sistema wgetrc falhou. Por favor, verifique\n" +"\"%s\",\n" +"ou especifique um ficheiro diferente, usando --config.\n" -#: src/init.c:783 -#, fuzzy, c-format +#: src/init.c:776 +#, 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" +"%s: aviso: o ficheiro de sistema e o de utilizador wgetrc apontam para %s.\n" -#: src/init.c:983 -#, fuzzy, c-format +#: src/init.c:977 +#, c-format msgid "%s: Invalid --execute command %s\n" -msgstr "%s: Comando --execute '%s' inválido\n" +msgstr "%s: Comando %s --execute inválido\n" -#: src/init.c:1043 -#, fuzzy, c-format +#: src/init.c:1037 +#, 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" +msgstr "%s: %s: valor lógico %s inválido; use \"on\" ou \"off\".\n" -#: src/init.c:1076 -#, fuzzy, c-format +#: src/init.c:1070 +#, 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" +msgstr "%s: %s: valor lógico %s inválido; use \"on\" ou \"off\".\n" -#: src/init.c:1096 -#, fuzzy, c-format +#: src/init.c:1090 +#, c-format msgid "%s: %s: Invalid number %s.\n" -msgstr "%s: %s: Número '%s' inválido.\n" +msgstr "%s: %s: Número %s inválido.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" -msgstr "" +msgstr "%s: %s só deve ser usado uma vez\n" -#: src/init.c:1333 src/init.c:1354 -#, fuzzy, c-format +#: src/init.c:1327 src/init.c:1348 +#, c-format msgid "%s: %s: Invalid byte value %s\n" -msgstr "%s: %s: Valor de byte '%s' inválido\n" +msgstr "%s: %s: valor de byte %s inválido\n" -#: src/init.c:1379 -#, fuzzy, c-format +#: src/init.c:1373 +#, c-format msgid "%s: %s: Invalid time period %s\n" -msgstr "%s: %s Período de tempo '%s' inválido\n" +msgstr "%s: %s período de tempo %s inválido\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" +"use-askpass requer uma cadeia ou que esteja definida uma das variáveis de " +"ambiente WGET_ASKPASS ou SSH_ASKPASS.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 -#, fuzzy, c-format +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 +#, c-format msgid "%s: %s: Invalid value %s.\n" -msgstr "%s: %s: Valor '%s' inválido.\n" +msgstr "%s: %s: valor %s inválido.\n" -#: src/init.c:1515 -#, fuzzy, c-format +#: src/init.c:1509 +#, c-format msgid "%s: %s: Invalid header %s.\n" -msgstr "%s: %s: Cabeçãlho '%s' inválido.\n" +msgstr "%s: %s: cabeçalho %s inválido.\n" -#: src/init.c:1536 -#, fuzzy, c-format +#: src/init.c:1530 +#, c-format msgid "%s: %s: Invalid WARC header %s.\n" -msgstr "%s: %s: Cabeçãlho '%s' inválido.\n" +msgstr "%s: %s: cabeçalho WARC %s inválido.\n" -#: src/init.c:1602 -#, fuzzy, c-format +#: src/init.c:1596 +#, c-format msgid "%s: %s: Invalid progress type %s.\n" -msgstr "%s: %s: Tipo de progresso '%s' inválido.\n" +msgstr "%s: %s: tipo de progresso %s inválido.\n" -#: src/init.c:1684 -#, fuzzy, c-format +#: src/init.c:1678 +#, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "" -"%s: %s: Restrição '%s' inválida, use [unix|windows],[lowercase|uppercase]," -"[nocontrol].\n" +"%s: %s: restrição %s inválida,\n" +" use [unix|vms|windows],[lowercase|uppercase],[nocontrol], [ascii].\n" #: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" -msgstr "" +msgstr "Codificação %s inválida\n" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" -msgstr "" +msgstr "Conversão de %s para %s não suportada\n" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" -msgstr "" +msgstr "Encontrada sequência multi-byte incompleta ou inválida\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" -msgstr "" +msgstr "Erro %d não gerido\n" #: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" -msgstr "" +msgstr "locale_to_utf8: idioma não definido\n" #: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" -msgstr "" +msgstr "idn_encode falhou (%d): %s\n" +# lower pode ser "minúsculas" #: src/iri.c:288 -#, fuzzy, c-format +#, c-format msgid "Failed to convert to lower: %d: %s\n" -msgstr "não foi possível conectar %s porto %d: %s\n" +msgstr "Falha ao converter para menor: %d: %s\n" #: src/log.c:931 src/log.c:950 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Redirecting output to %s.\n" msgstr "" "\n" -"%s recebido, a redireccionar saída para '%s'.\n" +"a redireccionar saída para %s.\n" #: src/log.c:943 #, c-format msgid "%s: %s; disabling logging.\n" -msgstr "%s: %s; a desactivar registo.\n" +msgstr "%s: %s; a desactivar diário.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" -msgstr "Utilização: %s [OPÇÃO]... [ENDEREÇO]...\n" +msgstr "Uso: %s [OPÇÃO]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" msgstr "" -"Argumentos mandatórios para opções longas são também mandatórios para opções " -"curtas.\n" +"Argumentos obrigatórios para opções longas são também obrigatórios para " +"opções curtas.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Arranque:\n" -#: src/main.c:596 -#, fuzzy +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" -msgstr " -V, --version exibir a versão do Wget e terminar.\n" +msgstr " -V, --version mostra a versão do Wget e sai\n" -#: src/main.c:598 -#, fuzzy +#: src/main.c:599 msgid " -h, --help print this help\n" -msgstr " -h, --help exibir esta ajuda.\n" +msgstr " -h, --help mostra esta mensagem\n" -#: src/main.c:600 -#, fuzzy +#: src/main.c:601 msgid " -b, --background go to background after startup\n" -msgstr "" -" -b, --background executar em segundo plano após o arranque.\n" +msgstr " -b, --background vai para 2º plano após o arranque\n" -#: src/main.c:602 -#, fuzzy +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" -msgstr " -e, --execute=COMANDO executar um comando do estilo '.wgetrc'.\n" +msgstr "" +" -e, --execute=COMANDO executa um comando estilo \".wgetrc\"\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" -msgstr "Registo e ficheiro de entrada:\n" +msgstr "Diário e ficheiro de entrada:\n" -#: src/main.c:608 -#, fuzzy +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" -msgstr " -o, --output-file=FICH registar mensagens em FICH.\n" +msgstr " -o, --output-file=FICHEIRO regista as mensagens em FICHEIRO\n" -#: src/main.c:610 -#, fuzzy +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" -msgstr " -a, --append-output=FICH acrescentar mensagens a FICH.\n" +msgstr " -a, --append-output=FICHEIRO anexa mensagens a FICHEIRO\n" -#: src/main.c:613 -#, fuzzy +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" -msgstr " -d, --debug exibir informação de depuração.\n" +msgstr "" +" -d, --debug mostra bastante informação de depuração\n" -#: src/main.c:617 -#, fuzzy +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" -msgstr " --wdebug exibir informação de depuração Watt-32.\n" +msgstr " --wdebug mostra saída de depuração Watt-32\n" -#: src/main.c:620 -#, fuzzy +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" -msgstr " -q, --quiet modo silencioso.\n" +msgstr " -q, --quiet silencioso (sem saída)\n" -#: src/main.c:622 -#, fuzzy +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" -msgstr " -v, --verbose modo verboso (activado por omissão).\n" +msgstr " -v, --verbose verboso (predefinição)\n" -#: src/main.c:624 -#, fuzzy +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -" -nv, --no-verbose desactivar a verbosidade, sem silenciar.\n" +" -nv, --no-verbose desactiva a verbosidade, sem ser " +"silencioso\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" +" --report-speed=TIPO mostra largura de banda como TIPO. TIPO " +"pode ser bits\n" -#: src/main.c:628 -#, fuzzy +#: src/main.c:629 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" +msgstr "" +" -i, --input-file=FICHEIRO transferir URLs encontrados em FICHEIRO " +"local ou externo\n" -#: src/main.c:631 -#, fuzzy +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" -msgstr " -i, --input-file=FICH transferir endereços contidos em FICH.\n" +msgstr "" +" --input-metalink=FICHEIRO transferir ficheiros em FICHEIRO local " +"Metalink\n" -#: src/main.c:634 -#, fuzzy +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" -msgstr " -F, --force-html tratar o ficheiro de entrada como HTML.\n" +msgstr "" +" -F, --force-html trata o ficheiro de entrada como HTML\n" -#: src/main.c:636 -#, fuzzy +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -" -N, --timestamping não transferir ficheiros de novo mais " -"antigos\n" -" que o local.\n" +" -B, --base=URL resolve ligações HTML do ficheiro de " +"entrada (-i -F)\n" +" relativas ao URL\n" -#: src/main.c:639 -#, fuzzy +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" -msgstr " --certificate=FICH FICHeiro do certificado do cliente.\n" +msgstr "" +" --config=FICHEIRO especifica o ficheiro config a usar\n" -#: src/main.c:641 -#, fuzzy +#: src/main.c:642 msgid " --no-config do not read any config file\n" -msgstr " --no-cookies não usar 'cookies'.\n" +msgstr " --no-config não lê nenhum ficheiro config\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" +" --rejected-log=FILE regista motivos para rejeição de FICHEIRO " +"pelo URL\n" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Transferência:\n" -#: src/main.c:649 -#, fuzzy +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -" -t, --tries=NÚMERO definir NÚMERO de tentativas (0 para " +" -t, --tries=NÚMERO define NÚMERO de tentativas (0 para " "ilimitado).\n" -#: src/main.c:651 -#, fuzzy +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -" --retry-connrefused tentar de novo se a conexão for recusada.\n" +" --retry-connrefused repete, mesmo se a ligação for recusada\n" -#: src/main.c:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=LISTA LISTA de elementos HTML para ignorar.\n" +" --retry-on-http-error=ERROS lista separada por vírgulas de erros " +"HTTP para tentar de novo\n" -#: src/main.c:655 -#, fuzzy +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" -msgstr " -O, --output-document=FICH escrever documentos para FICH.\n" +msgstr " -O, --output-document=FICHEIRO escreve os documentos em FICHEIRO\n" -#: src/main.c:657 -#, fuzzy +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -" -nc, --no-clobber saltar transferências que sobreporiam\n" -" ficheiros existentes.\n" +" -nc, --no-clobber salta transferências que iriam " +"sobrescrever\n" +" ficheiros existentes\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-cookies não usar 'cookies'.\n" +msgstr "" +" --no-netrc não tenta obter credenciais de .netrc\n" -#: src/main.c:662 -#, fuzzy +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -" -c, --continue continuar transferência parcial de " -"ficheiro.\n" +" -c, --continue retoma a obtenção de um ficheiro " +"parcialmente transferido\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" +" --start-pos=DESVIO começa a transferência da posição baseada " +"em zero DESVIO\n" -#: src/main.c:666 -#, fuzzy +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -" --progress=TIPO definir o TIPO de escala de progresso.\n" +" --progress=TYPE selecciona o tipo de manómetro do " +"progresso\n" -#: src/main.c:668 -#, fuzzy +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -" --progress=TIPO definir o TIPO de escala de progresso.\n" +" --show-progress mostra o progresso em qualquer modo de " +"verbosidade\n" -#: src/main.c:670 -#, fuzzy +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -" -N, --timestamping não transferir ficheiros de novo mais " -"antigos\n" -" que o local.\n" +" -N, --timestamping não re-obtém ficheiros, a não ser os mais " +"recentes que o\n" +" local\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" +" --no-if-modified-since não usa a condicional if-modified-since\n" +" obtém pedidos em modo de datação\n" -#: src/main.c:676 -#, fuzzy +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -" -N, --timestamping não transferir ficheiros de novo mais " -"antigos\n" -" que o local.\n" +" --no-use-server-timestamps não define a datação do ficheiro local " +"pelo\n" +" do que está no servidor\n" -#: src/main.c:679 -#, fuzzy +#: src/main.c:680 msgid " -S, --server-response print server response\n" -msgstr " -S, --server-response exibir a resposta do servidor.\n" +msgstr " -S, --server-response mostra a resposta do servidor\n" -#: src/main.c:681 -#, fuzzy +#: src/main.c:682 msgid " --spider don't download anything\n" -msgstr " --spider não transferir os ficheiros.\n" +msgstr " --spider não transfere nada\n" -#: src/main.c:683 -#, fuzzy +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -" -T, --timeout=SEGUNDOS definir tempo máximo de todas as " -"tentativas.\n" +" -T, --timeout=SEGUNDOS define todos os tempos de expiração para " +"SEGUNDOS\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" +" --dns-servers=ENDEREÇOS lista de servidores DNS a questionar " +"(separada por vírgulas)\n" -#: src/main.c:688 -#, fuzzy +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -" --bind-address=ENDEREÇO ligar a ENDEREÇO (nome ou IP) na máquina " -"local.\n" +" --bind-dns-address=ENDEREÇO associa o solucionador DNS a ENDEREÇO " +"(nome ou IP) na máquina local\n" -#: src/main.c:691 -#, fuzzy +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" -msgstr " --dns-timeout=SEGS definir o tempo máximo de pesquisa.\n" +msgstr "" +" --dns-timeout=SEGUNDOS define a expiração da procura DNS para " +"SEGUNDOS\n" -#: src/main.c:693 -#, fuzzy +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" -msgstr " --connect-timeout=SEGS definir o tempo máximo de conexão.\n" +msgstr "" +" --connect-timeout=SEGUNDOS define a expiração da ligação para " +"SEGUNDOS\n" -#: src/main.c:695 -#, fuzzy +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" -msgstr " --read-timeout=SEGS definir o tempo máximo de leitura.\n" +msgstr "" +" --read-timeout=SEGUNDOS define a expiração de leitura para " +"SEGUNDOS\n" -#: src/main.c:697 -#, fuzzy +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" -msgstr "" -" -w, --wait=SEGUNDOS esperar SEGUNDOS entre transferências.\n" +msgstr " -w, --wait=SEGUNDOS espera SEGUNDOS entre obtenções\n" -#: src/main.c:699 -#, fuzzy +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -" --waitretry=SEGUNDOS esperar 1..SEGUNDOS entre tentativas.\n" +" --waitretry=SEGUNDOS espera de 1..SEGUNDOS entre tentativas de " +"obtenção\n" -#: src/main.c:701 -#, fuzzy +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -" --random-wait esperar de 0...2*N segundos entre transf.\n" +" --random-wait espera de 0.5*ESPERA...1.5*ESPERA segs " +"entre obtenções\n" -#: src/main.c:703 -#, fuzzy +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" -msgstr "" -" --no-proxy desativar procurador ('proxy') " -"implicitamente.\n" +msgstr " --no-proxy desactivar proxy explicitamente\n" -#: src/main.c:705 -#, fuzzy +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -" -Q, --quota=NUMERO definir quota de transferência NÚMERO.\n" +" -Q, --quota=NÚMERO define a quota de obtenção como NÚMERO\n" -#: src/main.c:707 -#, fuzzy +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -" --bind-address=ENDEREÇO ligar a ENDEREÇO (nome ou IP) na máquina " -"local.\n" +" --bind-address=ENDEREÇO associar a ENDEREÇO (nome ou IP) na " +"máquina local\n" -#: src/main.c:709 -#, fuzzy +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" -msgstr " --limit-rate=TAXA limitar TAXA de transferência.\n" +msgstr "" +" --limit-rate=TAXA limita a taxa de transferência a TAXA\n" -#: src/main.c:711 -#, fuzzy +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" -msgstr "" -" --no-dns-cache desactivar esconderijo ('cache') de " -"pesquisas DNS.\n" +msgstr " --no-dns-cache desactiva a cache de procuras DNS\n" -#: src/main.c:713 -#, fuzzy +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -" --restrict-file-names=OS restringir a caracteres do sistema para " -"nomes de ficheiros.\n" +" --restrict-file-names=OS restringe caracteres nos nomes de " +"ficheiro aos permitdos por OS\n" -#: src/main.c:715 -#, fuzzy +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -" --ignore-case ignorar capitalização ao verificar " -"ficheiros/pastas.\n" +" --ignore-case ignora maiúsculas ao comparar ficheiros/" +"pastas\n" -#: src/main.c:718 -#, fuzzy +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" -msgstr " -4, --inet4-only conectar apenas a endereços IPv4.\n" +msgstr " -4, --inet4-only ligar só a endereços IPv4\n" -#: src/main.c:720 -#, fuzzy +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" -msgstr " -6, --inet6-only conectar apenas a endereços IPv6.\n" +msgstr " -6, --inet6-only ligar só a endereços IPv6\n" -#: src/main.c:722 -#, fuzzy +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -" --prefer-family=FAMÃLIA conectar primeiro a endereços da família " -"especificada,\n" -" um de IPv6, IPv4 ou nenhum.\n" +" --prefer-family=FAMÃLIA ligar 1º a endereços de FAMÃLIA,\n" +" uma de IPv6, IPv4 ou nenhuma\n" -#: src/main.c:726 -#, fuzzy +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" -msgstr " --user=UTILIZADOR definir UTILIZADOR FTP e HTTP.\n" +msgstr "" +" --user=UTILIZADOR define os utilizadores ftp e http como " +"UTILIZADOR\n" -#: src/main.c:728 -#, fuzzy +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" -msgstr " --password=SENHA definir a SENHA FTP e HTTP.\n" +msgstr "" +" --password=SENHA define as senhas ftp e http como SENHA\n" -#: src/main.c:730 -#, fuzzy +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" -msgstr " --password=SENHA definir a SENHA FTP e HTTP.\n" +msgstr " --ask-password pede as senhas\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1871,380 +1878,365 @@ "SSH_ASKPASS \n" " environment variable is used.\n" msgstr "" +" --use-askpass=COMANDO especifica o gestor de credenciais para " +"pedir\n" +" utilizador e senha. Se não especificar " +"COMANDO\n" +" será usada uma das variáveis de " +"ambiente\n" +" WGET_ASKPASS ou SSH_ASKPASS.\n" -#: src/main.c:737 -#, fuzzy +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" -msgstr "" -" --no-proxy desativar procurador ('proxy') " -"implicitamente.\n" +msgstr " --no-iri desactiva o suporte a IRI\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" +" --local-encoding=COD usa COD como codificação local para IRIs\n" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" +" --remote-encoding=COD usa COD como codificação remota " +"predefinida\n" -#: src/main.c:743 -#, fuzzy +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" -" --no-glob desactivar alterações de nome de ficheiros " -"FTP.\n" +" --unlink remove o ficheiro antes de sobrescrever\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" +" --keep-badhash mantém ficheiros com checksum trocada " +"(anexa .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" +" --metalink-index=NÚMERO NÚMERO ordinal de metaurl de aplicação/" +"metalink4+xml Metalink\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" +" --metalink-over-http usa meta-dados Metalink dos cabeçalhos de " +"resposta HTTP\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" +" --preferred-location localização preferida para recursos " +"Metalink\n" -#: src/main.c:756 +#: src/main.c:757 #, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -" --no-proxy desativar procurador ('proxy') " -"implicitamente.\n" +" --no-xattr desactiva armazenagem de mate-dados em " +"atributos de ficheiro estendidos\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Pastas:\n" -#: src/main.c:763 -#, fuzzy +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" -msgstr " -nd, --no-directories não criar pastas.\n" +msgstr " -nd, --no-directoriess não criar pastas.\n" -#: src/main.c:765 -#, fuzzy +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" -msgstr " -x, --force-directories forçar a criação de pastas.\n" +msgstr " -x, --force-directories forçar a criação de pastas.\n" -#: src/main.c:767 -#, fuzzy +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" -msgstr " -nH, --no-host-directories não criar pastas do servidor.\n" +msgstr " -nH, --no-host-directories não criar pastas do servidor.\n" -#: src/main.c:769 -#, fuzzy +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -" --protocol-directories usar o nome do protocolo nas pastas.\n" +" --protocol-directories usar o nome do protocolo nas pastas.\n" -#: src/main.c:771 -#, fuzzy +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" -msgstr " -P, --directory-prefix=PREFIX gravar ficheiros para PREFIX/...\n" +msgstr " -P, --directory-prefix=PREFIXO gravar ficheiros em PREFIXO/..\n" -#: src/main.c:773 -#, fuzzy +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -" --cut-dirs=NÚMERO ignorar NÚMERO componentes de pasta " +" --cut-dirs=NÚMERO ignorar NÚMERO componentes de pasta " "remotos.\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Opções HTTP:\n" -#: src/main.c:779 -#, fuzzy +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" -msgstr " --http-user=UTILIZADOR definir o UTILIZADOR HTTP.\n" +msgstr "" +" --http-user=UTILIZADOR define o utilizador HTTP como UTILIZADOR\n" -#: src/main.c:781 -#, fuzzy +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" -msgstr " --http-password=SENHA definir a SENHA HTTP.\n" +msgstr " --http-password=SENHA define a senha HTTP como SENHA\n" -#: src/main.c:783 -#, fuzzy +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" -" --no-cache não permitir dados em esconderijo ('cache') " -"no servidor.\n" +" --no-cache proibir dados em cache no servidor\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" +" --default-page=NAME altera o nome predefinido da página " +"(normalmente\n" +" é \"index.html\".)\n" -#: src/main.c:788 -#, fuzzy +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -" -E, --html-extension gravar documentos HTML com extensão '.html'.\n" +" -E, --adjust-extension grava documentos HTML/CSS com as " +"extensões apropriadas\n" -#: src/main.c:790 -#, fuzzy +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -" --ignore-length ignorar campo de cabeçalho `Content-Length'.\n" +" --ignore-length ignora o campo de cabeçalho \"Content-" +"Length\"\n" -#: src/main.c:792 -#, fuzzy +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" -msgstr "" -" --header=EXPRESSÃO inserir EXPRESSÃO entre os cabeçalhos.\n" +msgstr " --header=CADEIA insere CADEIA entre os cabeçalhos\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=TIPO definir o TIPO de escala de progresso.\n" +" --compression=TIPO escolhe a compressão entre auto, gzip e " +"none (predefinição: none)\n" -#: src/main.c:798 -#, fuzzy +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -" --max-redirect máximo de redireccionamentos permitido por " -"página.\n" +" --max-redirect máximo de redireccionamentos permitidos " +"por página\n" -#: src/main.c:800 -#, fuzzy +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -" --proxy-user=UTILIZAD definir UTILIZADor do procurador ('proxy').\n" +" --proxy-user=UTILIZADOR define UTILIZADOR como utilizador do " +"proxy\n" -#: src/main.c:802 -#, fuzzy +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" -msgstr "" -" --proxy-password=SENHA definir SENHA do procurador ('proxy').\n" +msgstr " --proxy-password=SENHA define SENHA como senha do proxy\n" -#: src/main.c:804 -#, fuzzy +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -" --referer=ENDEREÇO incluir o cabeçalho 'Referer: ENDEREÇO' no " -"pedido.\n" +" --referer=URL inclui o cabeçalho 'Referer: URL' no " +"pedido HTTP\n" -#: src/main.c:806 -#, fuzzy +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -" --save-headers gravar os cabeçalhos HTTP no ficheiro.\n" +" --save-headers grava os cabeçalhos HTTP num ficheiro\n" -#: src/main.c:808 -#, fuzzy +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -" -U, --user-agent=AGENTE identificar como AGENTE ao invés de Wget/" -"VERSÃO.\n" +" -U, --user-agent=AGENTE identifica como AGENTE em vez de Wget/" +"VERSÃO\n" -#: src/main.c:810 -#, fuzzy +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -" --no-http-keep-alive desactivar 'HTTP keep-alive' (conexões " -"persistentes).\n" +" --no-http-keep-alive desactiva HTTP keep-alive (ligações " +"persistentes)\n" -#: src/main.c:812 -#, fuzzy +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" -msgstr " --no-cookies não usar 'cookies'.\n" +msgstr " --no-cookies não usa cookies\n" -#: src/main.c:814 -#, fuzzy +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -" --load-cookies=FICH carregar 'cookies' de FICHeiro antes da " -"sessão.\n" +" --load-cookies=FICHEIRO carrega cookies de FICHEIRO antes da " +"sessão\n" -#: src/main.c:816 -#, fuzzy +#: src/main.c:817 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" +" --save-cookies=FICHEIRO grava cookies em FICHEIRO após a sessão\n" -#: src/main.c:818 -#, fuzzy +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -" --keep-session-cookies carregar e gravar os 'cookies' da sessão (não " -"permanentes).\n" +" --keep-session-cookies carrega e grava cookies (não-permanente) " +"da sessão\n" -#: src/main.c:820 -#, fuzzy +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -" --post-data=EXPRESSÃO usar o método POST; enviar EXPRESSÃO como " -"dados.\n" +" --post-data=CADEIA usa o método POST; envia CADEIA como " +"dados\n" -#: src/main.c:822 -#, fuzzy +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -" --post-file=FICHEIRO usar o método POST; enviar conteúdo de " -"FICHEIRO.\n" +" --post-file=FICHEIRO usa o método POST; envia o conteúdo do " +"FICHEIRO\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" +" --method=HTTPMethod usa o método \"HTTPMethod\" no pedido\n" -#: src/main.c:826 -#, fuzzy +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -" --post-data=EXPRESSÃO usar o método POST; enviar EXPRESSÃO como " -"dados.\n" +" --body-data=CADEIA envia CADEIA como dados. --method TEM de " +"estar definido\n" -#: src/main.c:828 -#, fuzzy +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -" --post-file=FICHEIRO usar o método POST; enviar conteúdo de " -"FICHEIRO.\n" +" --body-file=FICHEIRO envia o conteúdo de FICHEIRO. --method " +"TEM de estar definido\n" -#: src/main.c:830 -#, fuzzy +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" " choosing local file names " "(EXPERIMENTAL)\n" msgstr "" -" --content-disposition honrar o cabeçalho Content-Disposition ao\n" -" escolher nomes de fich. locais " -"(EXPERIMENTAL).\n" +" --content-disposition honrar o cabeçalho Content-Disposition ao " +"escolher\n" +" nomes de ficheiro locais " +"(EXPERIMENTAL)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" +" --content-on-error põe na saída o conteúdo recebido nos " +"erros do servidor\n" -#: src/main.c:835 -#, fuzzy +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" " without first waiting for the server's\n" " challenge\n" msgstr "" -" --auth-no-challenge Enviar informação de autenticação HTTP " -"básica\n" -" sem primeiro esperar pelo desafio do\n" -" servidor.\n" +" --auth-no-challenge envia informação de autenticação básica " +"HTTP\n" +" sem primeiro esperar pelo desafio do\n" +" servidor\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opções HTTPS (SSL/TLS):\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -" --secure-protocol=PR escolher protocolo de segurança, auto, " -"SSLv2,\n" -" SSLv3 ou TLSv1.\n" +" --secure-protocol=PR escolhe o protocolo de segurança, um de " +"auto, SSLv2,\n" +" SSLv3, TLSv1, TLSv1_1, TLSv1_2 e PFS\n" -#: src/main.c:847 -#, fuzzy +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" -msgstr " -L, --relative seguir apenas ligações relativas.\n" +msgstr " --https-only seguir só ligações HTTPS seguras\n" -#: src/main.c:849 -#, fuzzy +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -" --no-check-certificate não validar o certificado do servidor.\n" +" --no-check-certificate não validar o certificado do servidor\n" -#: src/main.c:851 -#, fuzzy +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" -msgstr " --certificate=FICH FICHeiro do certificado do cliente.\n" +msgstr "" +" --certificate=FICHEIRO ficheiro de certificado do cliente\n" -#: src/main.c:853 -#, fuzzy +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -" --certificate-type=TIPO TIPO do certificado do cliente, PEM ou DER.\n" +" --certificate-type=TIPO tipo de certificado do cliente, PEM ou " +"DER\n" -#: src/main.c:855 -#, fuzzy +#: src/main.c:856 msgid " --private-key=FILE private key file\n" -msgstr " --private-key=FICHEIRO FICHEIRO da chave privada.\n" +msgstr " --private-key=FICHEIRO ficheiro de chave privada\n" -#: src/main.c:857 -#, fuzzy +#: src/main.c:858 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" +msgstr " --private-key-type=TIPO tipo de chave privada, PEM ou DER\n" -#: src/main.c:859 -#, fuzzy +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" -msgstr " --ca-certificate=FICH FICHeiro com CAs.\n" +msgstr " --ca-certificate=FILE ficheiro com o conjunto de CAs\n" -#: src/main.c:861 -#, fuzzy +#: src/main.c:862 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" +msgstr "" +" --ca-directory=DIR pasta onde está armazenada a lista de " +"hash dos CAs\n" -#: src/main.c:863 -#, fuzzy +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" -msgstr " --ca-certificate=FICH FICHeiro com CAs.\n" +msgstr " --crl-file=FICHEIRO ficheiro com o conjunto de CRLs\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2253,24 +2245,31 @@ "verify\n" " peer against\n" msgstr "" +" --pinnedpubkey=FICH/HASHES Ficheiro de chave pública (PEM/DER), ou " +"qualquer\n" +" nº de hashes sha256 de base64 precedido " +"de\n" +" 'sha256//' e separado por ';', para " +"verificar\n" +" contra o par\n" -#: src/main.c:871 -#, fuzzy +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -" --random-file=FICH FICHeiro com dados aleatórios para SSL " -"PRNG.\n" +" --random-file=FICHEIRO ficheiro com dados aleatórios para semear " +"o SSL PRNG\n" -#: src/main.c:875 -#, fuzzy +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" -msgstr " --egd-file=FICHEIRO FICHEIRO EGD com dados aleatórios.\n" +msgstr "" +" --egd-file=FICHEIRO ficheiro a nomear a socket EGD com dados " +"aleatórios\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2279,490 +2278,485 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=CADEIA define a cadeia de prioridade (GnuTLS) ou a " +"cadeia de lista de cifra (OpenSSL) directamente.\n" +" Use com cuidado. Esta opção sobrepõe-se a " +"--secure-protocol.\n" +" O formato e sintaxe desta cadeia depende " +"do motor SSL/TLS específico.\n" -#: src/main.c:886 -#, fuzzy +#: src/main.c:887 msgid "HSTS options:\n" -msgstr "Opções HTTP:\n" +msgstr "Opções HSTS:\n" -#: src/main.c:888 -#, fuzzy +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" -msgstr "" -" --no-cache não permitir dados em esconderijo ('cache') " -"no servidor.\n" +msgstr " --no-hsts desactiva HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" +" --hsts-file caminho da base de dados HSTS " +"(sobrescreve a predefinição)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Opções FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" +" --ftp-stmlf usa formato Stream_LF para todos os " +"ficheiros binários FTP\n" -#: src/main.c:901 -#, fuzzy +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" -msgstr " --ftp-user=UTILIZADOR definir UTILIZADOR FTP.\n" +msgstr "" +" --ftp-user=UTILIZADOR define o utilizador FTP como UTILIZADOR\n" -#: src/main.c:903 -#, fuzzy +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" -msgstr " --ftp-password=SENHA definir a SENHA FTP.\n" +msgstr " --ftp-password=SENHA define a senha FTP como SENHA\n" -#: src/main.c:905 -#, fuzzy +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" -msgstr " --no-remove-listing não remover ficheiros '.listing'.\n" +msgstr " --no-remove-listing não remove ficheiros '.listing'\n" -#: src/main.c:907 -#, fuzzy +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -" --no-glob desactivar alterações de nome de ficheiros " -"FTP.\n" +" --no-glob desactiva FTP globbing dos nomes de " +"ficheiro\n" -#: src/main.c:909 -#, fuzzy +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -" --no-passive-ftp desactivar o modo \"passivo\" de " -"transferência.\n" +" --no-passive-ftp desactiva o modo de transferência " +"\"passive\"\n" -#: src/main.c:911 -#, fuzzy +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -" --preserve-permissions preservar as permissões dos ficheiros " -"remotos.\n" +" --preserve-permissions preserva as permissões do ficheiro " +"remoto\n" -#: src/main.c:913 -#, fuzzy +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -" --retr-symlinks em recursividade, obter ficheiros ligados " -"(não pastas).\n" +" --retr-symlinks em recursividade, obter ficheiros ligados-" +"a (não pastas)\n" -#: src/main.c:918 -#, fuzzy +#: src/main.c:919 msgid "FTPS options:\n" -msgstr "Opções FTP:\n" +msgstr "Opções FTPS:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" +" --ftps-implicit usa FTPS implícito (porta predefinida " +"é 990)\n" -#: src/main.c:922 -#, fuzzy +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -" -N, --timestamping não transferir ficheiros de novo mais " -"antigos\n" -" que o local.\n" +" --ftps-resume-ssl retoma a sessão SSL/TLS iniciada na " +"ligação de controlo ao\n" +" abrir uma ligação de dados\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" +" --ftps-clear-data-connection encripta só o canal de controlo; os " +"dados ficam em texto simples\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" +" --ftps-fallback-to-ftp recuar para FTP se FTPS não for " +"suportado pelo servidor alvo\n" -#: src/main.c:931 -#, fuzzy +#: src/main.c:932 msgid "WARC options:\n" -msgstr "Opções FTP:\n" +msgstr "Opções WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" +" --warc-file=NOMEFICH gravar dados de pedido/resposta num " +"ficheiro .warc.gz\n" -#: src/main.c:935 -#, fuzzy +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" -msgstr "" -" --header=EXPRESSÃO inserir EXPRESSÃO entre os cabeçalhos.\n" +msgstr " --warc-header=CADEIA insere CADEIA no registo warcinfo\n" -#: src/main.c:937 -#, fuzzy +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -" -t, --tries=NÚMERO definir NÚMERO de tentativas (0 para " -"ilimitado).\n" +" --warc-max-size=NÚMERO define o tamanho máximo de ficheiros WARC " +"como NÚMERO\n" -#: src/main.c:939 -#, fuzzy +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" -msgstr " --wdebug exibir informação de depuração Watt-32.\n" +msgstr " --warc-cdx escreve ficheiros de índice CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" +" --warc-dedup=NOMEFICH não armazena registos listados neste " +"ficheiro CDX\n" -#: src/main.c:944 -#, fuzzy +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" -msgstr " --no-cookies não usar 'cookies'.\n" +msgstr "" +" --no-warc-compression não comprime ficheiros WARC com GZIP\n" -#: src/main.c:947 -#, fuzzy +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" -msgstr " --no-cookies não usar 'cookies'.\n" +msgstr " --no-warc-digests não calcula resumos SHA1\n" -#: src/main.c:949 -#, fuzzy +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -" --ignore-case ignorar capitalização ao verificar " -"ficheiros/pastas.\n" +" --no-warc-keep-log não armazena o diário num registo WARC\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" +" --warc-tempdir=PASTA localização para ficheiros temporários " +"criados pelo\n" +" escritor WARC\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Transferência recursiva:\n" -#: src/main.c:958 -#, fuzzy +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" -msgstr " -r, --recursive especificar transferência recursiva.\n" +msgstr "" +" -r, --recursive especifica a transferência recursiva\n" -#: src/main.c:960 -#, fuzzy +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -" -l, --level=NÚMERO profundidade máxima (inf ou 0 para infinito).\n" +" -l, --level=NÚMERO profundidade máxima de recursividade (inf " +"ou 0 para infinita)\n" -#: src/main.c:962 -#, fuzzy +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -" --delete-after remover os ficheiros localmente após " -"transferência.\n" +" --delete-after elimina ficheiros locais após transferi-" +"los\n" -#: src/main.c:964 -#, fuzzy +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -" -k, --convert-links apontar as ligações em HTML para ficheiros " -"locais.\n" +" -k, --convert-links aponta ligações nos ficheiros HTML ou " +"CSS\n" +" transferidos para ficheiros locais\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" +" --convert-file-only converte só a secção de ficheiro dos URLs " +"(conhecida como nome-base)\n" -#: src/main.c:969 -#, fuzzy +#: src/main.c:970 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" +msgstr "" +" --backups=N antes de escrever o ficheiro X, roda até " +"N cópias de segurança\n" -#: src/main.c:973 -#, fuzzy +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -" -K, --backup-converted salvaguardar com extensão '.orig' antes de " -"converter.\n" +" -K, --backup-converted antes de converter o ficheiro X, faz uma " +"segurança X_orig\n" -#: src/main.c:976 -#, fuzzy +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -" -K, --backup-converted salvaguardar com extensão '.orig' antes de " -"converter.\n" +" -K, --backup-converted antes de converter o ficheiro X, faz uma " +"segurança X.orig\n" -#: src/main.c:979 -#, fuzzy +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -" -m, --mirror atalho para -N -r -l inf --no-remove-listing.\n" +" -m, --mirror atalho para -N -r -l inf --no-remove-" +"listing\n" -#: src/main.c:981 -#, fuzzy +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -" -p, --page-requisites obter todas as imagens, etc. para exibir a " -"página HTML.\n" +" -p, --page-requisites obtém tudo o necessário para mostrar a " +"página HTML\n" -#: src/main.c:983 -#, fuzzy +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -" --strict-comments activar tratamento severo (SGML) de comentários " -"HTML.\n" +" --strict-comments activa a gestão estrita (SGML) de " +"comentários HTML\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" -msgstr "Aceitação/Rejeitação recursiva:\n" +msgstr "Aceitação/Rejeição recursiva:\n" -#: src/main.c:989 -#, fuzzy +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -" -A, --accept=LISTA LISTA de extensões aceites separadas por " -"vírgula.\n" +" -A, --accept=LISTA lista separada por vírgulas das extensões " +"aceites\n" -#: src/main.c:991 -#, fuzzy +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" -msgstr " -R, --reject=LISTA LISTA de extensões rejeitadas.\n" +msgstr "" +" -R, --reject=LISTA lista separada por vírgulas das extensões " +"rejeitadas\n" -#: src/main.c:993 -#, fuzzy +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -" --progress=TIPO definir o TIPO de escala de progresso.\n" +" --accept-regex=REGEX REGEXg correspondente aos URLs aceites\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" +" --reject-regex=REGEX REGEX correspondente aos URLs rejeitados\n" -#: src/main.c:998 -#, fuzzy +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" -msgstr "" -" --progress=TIPO definir o TIPO de escala de progresso.\n" +msgstr " --regex-type=TIPO TIPO de regex (posix|pcre)\n" -#: src/main.c:1001 -#, fuzzy +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" -msgstr "" -" --progress=TIPO definir o TIPO de escala de progresso.\n" +msgstr " --regex-type=TIPO TIPO de regex (posix)\n" -#: src/main.c:1004 -#, fuzzy +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" -msgstr " -D, --domains=LISTA LISTA de domínios aceites.\n" +msgstr "" +" -D, --domains=LISTA lista separada por vírgulas dos domínios " +"aceites\n" -#: src/main.c:1006 -#, fuzzy +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" -msgstr " --exclude-domains=LISTA LISTA de domínios rejeitados.\n" +msgstr "" +" --exclude-domains=LISTA lista separada por vírgulas dos domínios " +"rejeitados\n" -#: src/main.c:1008 -#, fuzzy +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -" --follow-ftp seguir ligações FTP de documentos HTML.\n" +" --follow-ftp segue ligações FTP de documentos HTML\n" -#: src/main.c:1010 -#, fuzzy +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -" --follow-tags=LISTA LISTA de elementos HTML para seguir.\n" +" --follow-tags=LISTA lista separada por vírgulas das etiquetas " +"HTML seguidas\n" -#: src/main.c:1012 -#, fuzzy +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -" --ignore-tags=LISTA LISTA de elementos HTML para ignorar.\n" +" --ignore-tags=LIST lista separada por vírgulas das etiquetas " +"HTML ignoradas\n" -#: src/main.c:1014 -#, fuzzy +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -" -H, --span-hosts ir para outros servidores quando " -"recursivo.\n" +" -H, --span-hosts vai para servidores estrangeiros quando " +"recursivo\n" -#: src/main.c:1016 -#, fuzzy +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" -msgstr " -L, --relative seguir apenas ligações relativas.\n" +msgstr " -L, --relative segue só ligações relativas\n" -#: src/main.c:1018 -#, fuzzy +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" -msgstr " -I, --include-directories=LISTA LISTA de pastas permitidas.\n" +msgstr " -I, --include-directories=LISTA LISTA de pastas permitidas\n" -#: src/main.c:1020 -#, fuzzy +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -" -N, --timestamping não transferir ficheiros de novo mais " -"antigos\n" -" que o local.\n" +" --trust-server-names usa o nome especificado pelo último\n" +" componente do URL de redireccionamento\n" -#: src/main.c:1023 -#, fuzzy +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" -msgstr " -X, --exclude-directories=LISTA LISTA de pastas excluídas.\n" +msgstr " -X, --exclude-directories=LISTA LISTA de pastas excluídas\n" -#: src/main.c:1025 -#, fuzzy +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" -msgstr " -np, --no-parent não ascender à pasta anterior.\n" +msgstr " -np, --no-parent não sobe à pasta-mãe\n" -#: src/main.c:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" -msgstr "Envie erros e sugestões para .\n" +msgstr "Envie erros, questões e discussões para \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"e/ou abra tópicos em https://savannah.gnu.org/bugs/?" +"func=additem&group=wget.\n" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " -msgstr "" +msgstr "Senha do utilizador %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " -msgstr "" +msgstr "Senha: " -#: src/main.c:1103 -#, fuzzy, c-format +#: src/main.c:1104 +#, c-format msgid "Cannot create pipe\n" -msgstr "Não é possível escrever para '%s' (%s).\n" +msgstr "Impossível criar túnel\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" +"Erro ao inicializar acções de geração de ficheiro para use-askpass: %d\n" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" -msgstr "" +msgstr "Erro ao definir acções de geração de ficheiro para use-askpass: %d\n" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" -msgstr "" +msgstr "Erro ao ler resposta do comando \"%s %s\": %s\n" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " -msgstr "" +msgstr "Utilizador para \"%s%s\": " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " -msgstr "" +msgstr "Senha para \"%s%s@%s\": " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " -msgstr "" +msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " -msgstr "" +msgstr "Idioma: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " -msgstr "" +msgstr "Compilação: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " -msgstr "" +msgstr "Ligação: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" +"GNU Wget %s compilado a %s.\n" +"\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" -msgstr "" +msgstr " %s (ambiente)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" -msgstr "" +msgstr " %s (utilizador)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, c-format msgid " %s (system)\n" -msgstr "" +msgstr " %s (sistema)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1323 -#, fuzzy, c-format +#: src/main.c:1324 +#, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" -msgstr "Copyright (C) 2008 Free Software Foundation, Inc.\n" +msgstr "Copyright (©) %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2771,13 +2765,12 @@ msgstr "" "Licença GPLv3+: GNU GPL versão 3 ou posterior\n" ".\n" -"Este software é livre: é livre de o alterar e redistribuir.\n" -"Não é dada QUALQUER GARANTIA para o programa, até aos limites permitidos por " -"lei aplicável.\n" +"Este software é grátis: é livre de o alterar e redistribuir.\n" +"Não há QUALQUER GARANTIA, até ao limite permitido por Lei.\n" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2785,81 +2778,81 @@ "\n" "Originalmente escrito por Hrvoje Niksic .\n" -#: src/main.c:1337 -#, fuzzy +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" -msgstr "Envie erros e sugestões para .\n" +msgstr "Por favor, envie erros e questões para .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" -msgstr "" +msgstr "Problema de alocação de memória\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" -msgstr "" +msgstr "A sair devido a erro em %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" -msgstr "Tente '%s --help' para mais opções.\n" +msgstr "Tente \"%s --help\" para mais opções.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" -msgstr "%s: opção ilegal -- '-n%c'\n" +msgstr "%s: opção ilegal -- \"-n%c\"\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" -msgstr "" +msgstr "Suporte a depuração não compilado. A ignorar --debug-flag.\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" +"Tanto --no-clobber como --convert-links foram especificadas, só --convert-" +"links será usada.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" +"Tanto --no-clobber como --convert-file-only foram especificadas, só --" +"convert-file-only será usada.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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" +msgstr "Impossível ser simultaneamente verboso e silencioso.\n" -#: src/main.c:1638 +#: src/main.c:1639 #, 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" +msgstr "Impossível datar e não sobrepor ficheiros antigos, simultaneamente.\n" -#: src/main.c:1647 +#: src/main.c:1648 #, 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" +msgstr "Impossível especificar simultaneamente --inet4-only e --inet6-only.\n" -#: src/main.c:1657 -#, fuzzy +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" "with -p or -r. See the manual for details.\n" "\n" msgstr "" -"Não é possível especificar simultaneamente -k e -O quando são fornecidos\n" -"múltiplos endereços ou em combinação com -r. Veja os detalhes no manual.\n" +"Impossível especificar -k ou --convert-file-only e -O simultaneamente se " +"forem dados múltiplos URLs ou em combinação\n" +"com -p ou -r. Veja o manual para detalhes.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2869,358 +2862,370 @@ "serão colocados no ficheiro único que especificou.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -"AVISO: marcação de tempo não tem acção quando combinado com -O. Veja o\n" +"AVISO: a datação não tem acção quando combinada com -O. Veja o\n" "manual para detalhes.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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á desactivada.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" -msgstr "" +msgstr "A saída WARC não funciona com datação, a datação será desactivada.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" -msgstr "" +msgstr "A saída WARC não funciona com --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" +"A saída WARC não funciona com --continue ou --start-pos, serão " +"desactivadas.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" +"Os resumos estão desactivados; O WARC não encontrará registos duplicados.\n" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" +"A compressão não funciona com --continue ou --start-pos, serão " +"desactivadas.\n" -#: src/main.c:1752 -#, fuzzy, c-format +#: src/main.c:1753 +#, c-format msgid "Cannot specify both --ask-password and --password.\n" -msgstr "" -"Não é possível especificar simultaneamente --inet4-only e --inet6-only.\n" +msgstr "Impossível especificar simultaneamente --ask-password e --password.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" +"Especificar --start-pos e --continue não é recomendável; --continue será " +"desactivada.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL em falta\n" -#: src/main.c:1815 -#, fuzzy, c-format +#: src/main.c:1822 +#, 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" +msgstr "Impossível especificar simultaneamente --post-data e --post-file.\n" -#: src/main.c:1820 +#: src/main.c:1827 #, 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 "" +"Não pode usar --post-data ou --post-file com --method. --method espera dados " +"através das opções --body-data e --body-file\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" +"Tem de espcificar um método através de --method=HTTPMethod para usar com --" +"body-data ou --body-file.\n" -#: src/main.c:1835 -#, fuzzy, c-format +#: src/main.c:1842 +#, 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" +msgstr "Impossível especificar simultaneamente --body-data e --body-file.\n" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" -msgstr "" +msgstr "Esta versão não tem suporte para IRIs\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" +"-k ou -r só podem ser usadas em conjunto com -O se a saída for um ficheiro " +"normal.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" +"--convert-links ou --convert-file-only só podem ser usadas em conjunto se a " +"saída for um ficheiro normal.\n" -#: src/main.c:2016 -#, fuzzy, c-format +#: src/main.c:2023 +#, c-format msgid "Failed to init libcares\n" -msgstr "Erro ao remover ligação simbólica '%s': %s\n" +msgstr "Falha ao iniciar libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" -msgstr "" +msgstr "Falha ao iniciar canal c-ares\n" -#: src/main.c:2045 -#, fuzzy, c-format +#: src/main.c:2052 +#, c-format msgid "Failed to parse IP address '%s'\n" -msgstr "%s: incapaz de processar o endereço '%s'\n" +msgstr "Falha ao analisar o enderço IP \"%s\"\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" -msgstr "" +msgstr "Falha ao definir servidor(es) DNS \"%s\" (%d)\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" -msgstr "URLs não encontrados em %s.\n" +msgstr "Sem URLs em %s.\n" -#: src/main.c:2200 -#, fuzzy, c-format +#: src/main.c:2207 +#, c-format msgid "Unable to parse metalink file %s.\n" -msgstr "Não é possível remover '%s': %s\n" +msgstr "Impossível analisar ficheiro Metalink %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" -msgstr "" +msgstr "Impossível transferir todos os recursos de %s.\n" -#: src/main.c:2257 -#, fuzzy, c-format +#: src/main.c:2264 +#, c-format msgid "" "FINISHED --%s--\n" "Total wall clock time: %s\n" "Downloaded: %d files, %s in %s (%s)\n" msgstr "" -"TERMINADO --%s--\n" -"Transferido: %d ficheiros, %s em %s (%s)\n" +"CONCLUÃDO --%s--\n" +"Tempo total: %s\n" +"Transferidos: %d ficheiros, %s em %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Quota de transferência de %s EXCEDIDA!\n" #: src/metalink.c:93 msgid "-O not supported for metalink download. Ignoring.\n" -msgstr "" +msgstr "-O não suportada para transferência Metalink. A ignorar.\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 +#, c-format msgid "Planned metalink file: %s\n" -msgstr "Falhou o 'túnel' com o procurador ('proxy'): %s" +msgstr "Ficheiro Metalink planeado: %s\n" #: src/metalink.c:179 #, c-format msgid "Secured metalink file: %s\n" -msgstr "" +msgstr "Ficheiro Metalink assegurado: %s\n" #: src/metalink.c:184 msgid "Rejecting metalink file. Unsafe name.\n" -msgstr "" +msgstr "A rejeitar ficheiro Metalink. Nome inseguro.\n" #: src/metalink.c:238 #, c-format msgid "Processing metaurl %s...\n" -msgstr "" +msgstr "A processar metaurl %s...\n" #: src/metalink.c:251 #, c-format msgid "Rejecting metaurl file %s. Unsafe name.\n" -msgstr "" +msgstr "A rejeitar ficheiro metaurl %s. Nome inseguro.\n" #: src/metalink.c:268 #, c-format msgid "Failed to download %s. Skipping metaurl.\n" -msgstr "" +msgstr "Falha ao transferir %s. A saltar metaurl.\n" #: src/metalink.c:285 -#, fuzzy, c-format +#, c-format msgid "Unable to parse metaurl file %s.\n" -msgstr "Não é possível remover '%s': %s\n" +msgstr "Impossível analisar ficheiro metaurl %s.\n" #: src/metalink.c:354 msgid "Metaurls processing returned with error.\n" -msgstr "" +msgstr "Processamento de metaurls devolveu um erro.\n" #: src/metalink.c:386 -#, fuzzy, c-format +#, c-format msgid "Resource type %s not supported, ignoring...\n" -msgstr "Endereços IPv6 não suportados" +msgstr "Tipo de recurso %s não suportado, a ignorar...\n" #: src/metalink.c:509 msgid "Could not open downloaded file.\n" -msgstr "" +msgstr "Impossível abrir o ficheiro transferido.\n" #: src/metalink.c:514 #, c-format msgid "Computing size for %s\n" -msgstr "" +msgstr "A calcular tamanho para %s\n" #: src/metalink.c:519 msgid "File size not declared. Skipping check.\n" -msgstr "" +msgstr "Tamamnho de ficheiro não declarado. A saltar verificação.\n" #: src/metalink.c:527 msgid "Could not get downloaded file's size.\n" -msgstr "" +msgstr "Impossível obter tamanho do ficheiro transferido\n" #: src/metalink.c:539 -#, fuzzy, c-format +#, c-format msgid "Size mismatch for file %s.\n" -msgstr "" -"O ficheiro '%s' não existe.\n" -"\n" +msgstr "Tamanho trocado para %s.\n" #: src/metalink.c:547 msgid "Size matches.\n" -msgstr "" +msgstr "Tamanho coincide.\n" #: src/metalink.c:600 #, c-format msgid "Computing checksum for %s\n" -msgstr "" +msgstr "A calcular checksum para %s\n" #: src/metalink.c:678 msgid "Checksum matches.\n" -msgstr "" +msgstr "Checksum coincide.\n" #: src/metalink.c:683 #, c-format msgid "Checksum mismatch for file %s.\n" -msgstr "" +msgstr "Checksum trocada para %s.\n" #: src/metalink.c:722 msgid "Could not open downloaded file for signature verification.\n" -msgstr "" +msgstr "Impossível abrir ficheiro transferido para verificar assinatura.\n" #: src/metalink.c:780 #, c-format msgid "GPGME data_new_from_mem: %s\n" -msgstr "" +msgstr "GPGME data_new_from_mem: %s\n" #: src/metalink.c:792 #, c-format msgid "GPGME op_verify: %s\n" -msgstr "" +msgstr "GPGME op_verify: %s\n" #: src/metalink.c:805 msgid "GPGME op_verify_result: NULL\n" -msgstr "" +msgstr "GPGME op_verify_result: NULL\n" #: src/metalink.c:821 msgid "Signature validation succeeded.\n" -msgstr "" +msgstr "Assinatura validada com sucesso.\n" #: src/metalink.c:829 msgid "Invalid signature. Rejecting resource.\n" -msgstr "" +msgstr "Assinatura inválida. A rejeitar a fonte.\n" #: src/metalink.c:838 msgid "Data matches signature, but signature is not trusted.\n" msgstr "" +"Os dados coincidem com a assinatura, mas a assinatura não é de confiança.\n" #: src/metalink.c:865 -#, fuzzy msgid "No checksums found.\n" -msgstr "%s: Certificado não apresentado por %s.\n" +msgstr "Sem checksums.\n" #: src/metalink.c:871 #, c-format msgid "Failed to download %s. Skipping resource.\n" -msgstr "" +msgstr "Falha ao transferir %s. A saltar recurso.\n" #: src/metalink.c:878 #, c-format msgid "File %s retrieved but size does not match. \n" -msgstr "" +msgstr "Ficheiro %s obtido mas o tamanho não coincide.\n" #: src/metalink.c:885 #, c-format msgid "File %s retrieved but checksum does not match. \n" -msgstr "" +msgstr "Ficheiro %s obtido mas a checksum não coincide.\n" #: src/metalink.c:894 #, c-format msgid "File %s retrieved but signature does not match. \n" -msgstr "" +msgstr "Ficheiro %s obtido mas a assinatura não coincide.\n" #: src/metalink.c:1113 -#, fuzzy, c-format +#, c-format msgid "Renaming %s to %s.\n" -msgstr "A remover %s.\n" +msgstr "A renomear %s para %s.\n" #: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" -msgstr "A continuar em segundo plano (fundo).\n" +msgstr "A continuar em 2º plano.\n" #: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" -msgstr "A continuar em segundo plano, pid %lu.\n" +msgstr "A continuar em 2º plano, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 -#, fuzzy, c-format +#: src/mswindows.c:291 src/utils.c:508 +#, c-format msgid "Output will be written to %s.\n" -msgstr "Resultados serão gravados em '%s'.\n" +msgstr "A saída será escrita em %s.\n" #: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" -msgstr "" +msgstr "fake_fork_child() falhou\n" #: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" -msgstr "" +msgstr "fake_fork() falhou\n" #: src/mswindows.c:460 src/mswindows.c:467 #, c-format msgid "%s: Couldn't find usable socket driver.\n" -msgstr "%s: 'socket driver' utilizável não encontrado.\n" +msgstr "%s: impossível encontrar um controlador de socket utilizável\n" #: src/mswindows.c:647 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" -msgstr "" +msgstr "ioctl() falhou. A socket não pôde ser definida como bloqueando.\n" #: src/netrc.c:371 -#, fuzzy, c-format +#, 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" +msgstr "%s: %s:%d: aviso: a expressão %s aparece antes de um nome de máquina\n" #: src/netrc.c:412 #, c-format @@ -3230,98 +3235,100 @@ #: src/netrc.c:496 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" -msgstr "Utilização: %s NETRC [NOME-DA-MÃQUINA]\n" +msgstr "Uso: %s NETRC [NOME-DA-MÃQUINA]\n" #: src/netrc.c:514 #, c-format msgid "%s: cannot stat %s: %s\n" -msgstr "%s: não é possível analisar %s: %s\n" +msgstr "%s: impossível analisar %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "AVISO: a usar uma semente aleatória fraca.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" -msgstr "Não foi possível gerar PRNG; considere usar --random-file.\n" +msgstr "Impossível semear PRNG; considere usar --random-file.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "" +msgstr "A sua versão OpenSSL é demasiado antiga para suportar TLS 1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" -msgstr "" +msgstr "A sua versão OpenSSL é demasiado antiga para suportar TLSv1.1\n" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" -msgstr "" +msgstr "A sua versão OpenSSL é demasiado antiga para suportar TLSv1.2\n" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" -msgstr "" +msgstr "OpenSSL: valor de opção \"secure-protocol\" %d não implementado\n" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: Endereço '%s' inválido: %s\n" +msgstr "OpenSSL: lista de cifra inválida: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "Não foi possível gerar PRNG; considere usar --random-file.\n" +msgstr "AVISO: impossível semear PRNG. Considere usar --random-file.\n" -#: src/openssl.c:856 -#, fuzzy, c-format +#: src/openssl.c:860 +#, 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" +msgstr "%s: impossível verificar o certificado de %s, emitido por \"%s\":\n" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" -msgstr " Incapaz de verificar localmente a autoridade do emissor.\n" +msgstr " Impossível verificar localmente a autoridade do emissor.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Encontrado certificado auto-assinado.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" -msgstr " Certificado emitido ainda inválido.\n" +msgstr " Certificado emitido ainda não é válido.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Certificado emitido expirado.\n" -#: src/openssl.c:966 -#, fuzzy, c-format +#: src/openssl.c:970 +#, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -"%s: o nome do certificado '%s' não corresponde ao nome da máquina requerida " -"'%s'.\n" +"%s: nenhuma alternativa ao assunto do certificado corresponde\n" +"\tao nome de servidor %s pedido.\n" -#: src/openssl.c:985 -#, fuzzy, c-format +#: src/openssl.c:989 +#, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -"%s: o nome do certificado '%s' não corresponde ao nome da máquina requerida " -"'%s'.\n" +" %s: o nome comum do certificado %s não corresponde ao nome de servidor " +"%s pedido.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" " This may be an indication that the host is not who it claims to be\n" " (that is, it is not the real %s).\n" msgstr "" +" %s: nome comum do certificado inválido (contém um carácter NULO).\n" +" Pode ser indicativo de que o servidor não é quem afirma ser\n" +" (ou seja, não é o real %s).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, 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" +msgstr "Para ligar a %s de forma insegura, use \"--no-check-certificate\".\n" #: src/progress.c:244 #, c-format @@ -3333,57 +3340,57 @@ "%*s[ a saltar %sK ]" #: src/progress.c:465 -#, fuzzy, c-format +#, 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" +msgstr "Especificação de estilo de ponto \"%s\" inválida; a não alterar.\n" +# tre = "tempo restante estimado" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. #: src/progress.c:857 -#, fuzzy, c-format +#, c-format msgid " eta %s" -msgstr " eta %s" +msgstr " tre %s" #: src/progress.c:1147 -#, fuzzy msgid " in " -msgstr " em " +msgstr " em " #: 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" +msgstr "Impossível obter a frequência de relógio em tempo real: %s\n" #: 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" +msgstr "A remover %s, uma vez que deve ser rejeitado.\n" #: src/res.c:394 #, c-format msgid "Cannot open %s: %s" -msgstr "Não é possível abrir %s: %s" +msgstr "Impossível abrir %s: %s" #: src/res.c:553 msgid "Loading robots.txt; please ignore errors.\n" msgstr "A carregar robots.txt; por favor, ignore erros.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" -msgstr "Erro ao analisar URL %s do 'proxy': %s.\n" +msgstr "Erro ao analisar URL do proxy %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" -msgstr "Erro no URL %s do 'proxy': Necessita ser HTTP.\n" +msgstr "Erro no URL do proxy %s: tem de ser HTTP.\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redireccionamentos excedidos.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3391,7 +3398,7 @@ "A desistir.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3404,7 +3411,7 @@ "Found no broken links.\n" "\n" msgstr "" -"Não foram encontradas ligações quebradas.\n" +"Sem ligações quebradas.\n" "\n" #: src/spider.c:82 @@ -3423,13 +3430,13 @@ msgstr "Sem erros" #: src/url.c:676 -#, fuzzy, c-format +#, c-format msgid "Unsupported scheme %s" -msgstr "Esquema não suportado" +msgstr "Esquema %s não suportado" #: src/url.c:678 msgid "Scheme missing" -msgstr "" +msgstr "Esquema em falta" #: src/url.c:680 msgid "Invalid host name" @@ -3437,7 +3444,7 @@ #: src/url.c:682 msgid "Bad port number" -msgstr "Mau número de porto" +msgstr "Mau número de porta" #: src/url.c:684 msgid "Invalid user name" @@ -3445,7 +3452,7 @@ #: src/url.c:686 msgid "Unterminated IPv6 numeric address" -msgstr "Endereço numérico IPv6 não concluído" +msgstr "Endereço numérico IPv6 indeterminado" #: src/url.c:688 msgid "IPv6 addresses not supported" @@ -3457,122 +3464,136 @@ #: src/url.c:1006 msgid "HTTPS support not compiled in" -msgstr "" +msgstr "Suporte a HTTPS não compilado" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "" +msgstr "Encontrada sequência multi-byte inconvertível\n" -#: src/utils.c:125 -#, fuzzy, c-format +#: src/utils.c:128 +#, 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" +msgstr "%s: %s: falha ao alocar memória suficiente; memória esgotada.\n" -#: src/utils.c:131 +#: src/utils.c:134 #, 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" +msgstr "%s: %s: falha ao alocar %ld bytes; memória esgotada.\n" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" -msgstr "" +msgstr "%s: aprintf: buffer de texto muito grande (%d bytes), a abortar.\n" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" -msgstr "A continuar em segundo plano (fundo), pid %d.\n" +msgstr "A continuar em 2º plano, pid %d.\n" -#: src/utils.c:554 -#, fuzzy, c-format +#: src/utils.c:557 +#, c-format msgid "Failed to unlink symlink %s: %s\n" -msgstr "Erro ao remover ligação simbólica '%s': %s\n" +msgstr "Erro ao remover ligação simbólica %s: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Erro ao remover ligação simbólica '%s': %s\n" +msgstr "Falha de Fopen ficheiro %s\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Não é possível remover '%s': %s\n" +msgstr "Falha ao obter FD para o ficheiro %s\n" -#: src/utils.c:872 +#: src/utils.c:878 #, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "" +msgstr "Falha ao analisar o ficheiro %s, (verifique as permissões)\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Ficheiro %s alterado desde a última verificação. Falha no teste de segurança." -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: incapaz de processar o endereço '%s'\n" +msgstr "Falha ao abrir o ficheiro %s, motivo :%s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "não foi possível conectar %s porto %d: %s\n" +msgstr "Falha ao analisar o ficheiro %s, erro: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"A tentar abrir o ficheiro %s mas foi alterado desde a última verificação. " +"Falha no teste de segurança." -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Expressão regular inválida %s, erro PCRE2 %d\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" -msgstr "" +msgstr "Expressão regular inválida %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 -#, fuzzy, c-format +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 +#, c-format msgid "Error while matching %s: %d\n" -msgstr "Erro ao escrever para '%s': %s\n" +msgstr "Erro ao comparar %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "A saltar chave com tamanho errado (%d/%d): %s\n" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Erro ao duplicar o descritor do ficheiro WARC.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" -msgstr "" +msgstr "Erro ao abrir fluxo GZIP para ficheiro WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" -msgstr "" +msgstr "Erro ao escrever o registo warcinfo no ficheiro WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" +"A abrir ficheiro WARC %s.\n" +"\n" -#: src/warc.c:867 -#, fuzzy, c-format +#: src/warc.c:878 +#, c-format msgid "Error opening WARC file %s.\n" -msgstr "Erro ao analisar URL %s do 'proxy': %s.\n" +msgstr "Erro ao abrir ficheiro WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" -msgstr "" +msgstr "O ficheiro CDX não lista os URLs originais (coluna \"a\" em falta).\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" -msgstr "" +msgstr "O ficheiro CDX não lista as checksums (coluna \"k\" em falta).\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" -msgstr "" +msgstr "O ficheiro CDX não lista IDs de registo (coluna \"u\" em falta).\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3581,59 +3602,60 @@ "Loaded %d records from CDX.\n" "\n" msgstr[0] "" +"Carregado %d registo do CDX.\n" +"\n" msgstr[1] "" +"Carregados %d registos do CDX.\n" +"\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" -msgstr "" +msgstr "Impossível ler o ficheiro CDX %s para remover duplicados.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" -msgstr "" +msgstr "Impossível abrir o ficheiro manifest temporário do WARC.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" -msgstr "" +msgstr "Impossível abrir o ficheiro de diário temporário do WARC.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" -msgstr "" +msgstr "Impossível abrir o ficheiro WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" -msgstr "" +msgstr "Impossível abrir o ficheiro CDX para saída.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" -msgstr "" +msgstr "Impossível abrir o ficheiro WARC temporário.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" +"Encontrada correspondência exacta no ficheiro CDX. A gravar registo de " +"visita no WARC.\n" -#, fuzzy #~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: a opção '--%s não permite um argumento\n" +#~ msgstr "%s: opção \"--%s\" não permite argumentos\n" -#, fuzzy #~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s: opção '--%s' desconhecida\n" +#~ msgstr "%s: opção não reconhecida \"--%s\"\n" -#, fuzzy #~ msgid "%s: option '-W %s' is ambiguous\n" -#~ msgstr "%s: a opção '-W %s' é ambígua\n" +#~ msgstr "%s: a opção \"-W %s\" é ambígua\n" -#, fuzzy #~ msgid "%s: option '-W %s' doesn't allow an argument\n" -#~ msgstr "%s: a opção '-W %s' não permite um argumento\n" +#~ msgstr "%s: a opção \"-W %s\" não permite argumentos\n" -#, fuzzy #~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: a opção '%s' requere um argumento\n" +#~ msgstr "%s: a opção \"-W %s\" requer um argumento\n" #~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "O ficheiro '%s' já existe; a não transferir.\n" +#~ msgstr "O ficheiro \"%s\" já existe; a não obter.\n" #~ msgid "Authorization failed.\n" #~ msgstr "A autorização falhou.\n" diff -Nru wget-1.19.5/po/ro.po wget-1.20.1/po/ro.po --- wget-1.19.5/po/ro.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/ro.po 2018-12-26 20:10:50.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: wget 1.9.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2003-11-01 18:02+0200\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" @@ -235,17 +235,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -309,7 +309,7 @@ msgid "failed: %s.\n" msgstr "eºuare: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" @@ -432,12 +432,12 @@ msgid "Length: %s" msgstr "Dimensiune: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr "" @@ -606,7 +606,7 @@ "Nu existã fiºierul sau directorul `%s'.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "" @@ -629,32 +629,32 @@ msgid "Data transfer aborted.\n" msgstr "Transfer de date întrerupt.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, 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:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(încercare:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" "\n" msgstr "%s (%s) - `%s' salvat [%ld]\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "ªterg %s.\n" @@ -749,160 +749,174 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "Refuzare `%s'.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Refuzare `%s'.\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" + +#: src/ftp.c:2645 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "Eroare la scriere în `%s': %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "Nu s-au gãsit potriviri pentru tiparul `%s'.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, 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:2760 +#: src/ftp.c:2762 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "S-a scris indexul HTML în `%s'\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "S-a eºuat în încãrcarea certificatelor din %s\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Eroare în analiza URL proxy: %s: %s.\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -943,145 +957,145 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Scriere cerere HTTP eºuatã: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1620 +#: src/http.c:1623 #, 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:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2087 +#: src/http.c:2090 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Reutilizare conexiune cãtre %s:%hu.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Reutilizare conexiune cãtre %s:%hu.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr "Scriere cerere HTTP eºuatã: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "EROARE %s %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Linie de stare malformatã" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Schemã autentificare necunoscutã.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Schemã autentificare necunoscutã.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "Cerere %s trimisã, se aºteaptã rãspuns... " -#: src/http.c:3392 +#: src/http.c:3395 #, fuzzy msgid "No data received.\n" msgstr "Nici o datã recepþionatã" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Eroare de citire (%s) în headere.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(fãrã descriere)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Locaþie: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "nespecificat(ã)" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [urmeazã]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1089,7 +1103,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1099,81 +1113,81 @@ " Fiºierul este deja complet; nu mai e nimic de fãcut.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Dimensiune: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignorat" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Avertisment: selecþiile globale(wildcards) nu sunt permise în HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4387 +#: src/http.c:4380 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nu se poate scrie în `%s' (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Nu se poate scrie în `%s' (%s).\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Nu s-a putut stabili o conexiune SSL.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nu se poate scrie în `%s' (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "EROARE: Redirectare (%d) fãrã locaþie.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Headerul Last-modified invalid -- identificator de timp ignorat.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1183,16 +1197,16 @@ "aduce.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Dimensiunile diferã (local %ld) -- se aduce.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Fiºierul remote este mai nou, se aduce.\n" -#: src/http.c:4607 +#: src/http.c:4615 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1200,7 +1214,7 @@ "\n" msgstr "Fiºierul remote este mai nou decãt fiºierul local `%s' -- se aduce.\n" -#: src/http.c:4613 +#: src/http.c:4621 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" @@ -1208,33 +1222,33 @@ msgstr "" "Fiºierul remote nu este mai nou decãt fiºierul local `%s'--nu se aduce.\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4628 +#: src/http.c:4636 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "Fiºierul remote este mai nou, se aduce.\n" -#: src/http.c:4637 +#: src/http.c:4645 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "EROARE %s %d: %s.\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4688 +#: src/http.c:4696 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1243,58 +1257,58 @@ "%s(%s) - `%s' salvat [%ld%ld]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexiune închisã la octetul %ld. " -#: src/http.c:4772 +#: src/http.c:4780 #, 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:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Schemã nesuportatã" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nu s-a putut citi %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Eroare în %s la linia %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1302,7 +1316,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1310,80 +1324,80 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Comandã --execute invalidã `%s'\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Numãr invalid `%s'.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Valoare octet invalidã `%s'\n" -#: src/init.c:1379 +#: src/init.c:1373 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Perioadã de timp invalidã `%s'.\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Valoare invalidã `%s'.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Header invalid `%s'.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Header invalid `%s'.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Tip evoluþie `%s' invalid.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1395,16 +1409,16 @@ msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "" @@ -1437,12 +1451,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; logging dezactivat.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Folosire: %s [OPÞIUNE]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1452,297 +1466,297 @@ "Parametrii obligatorii pentru opþiuni lungi sunt obligatorii ºi la cele " "scurte.\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:653 +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:660 +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 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:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1753,212 +1767,212 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:761 +#: src/main.c:762 #, fuzzy msgid "Directories:\n" msgstr "Director " -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:795 +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1966,13 +1980,13 @@ "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1980,58 +1994,58 @@ " challenge\n" msgstr "" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:844 +#: src/main.c:845 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:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2041,19 +2055,19 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2063,400 +2077,400 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Rapoarte de bug-uri prin mail ºi sugestii la .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "" -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "" -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "" -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2003 Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2466,7 +2480,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2474,68 +2488,68 @@ "\n" "Original scris de Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Rapoarte de bug-uri prin mail ºi sugestii la .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Încercaþi `%s --help' pentru mai multe opþiuni.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opþiune ilegalã -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, fuzzy, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "%s: suport de debug necompilat.\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2543,152 +2557,152 @@ "\n" msgstr "" -#: src/main.c:1666 +#: src/main.c:1667 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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL lipsã\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Nici un URL gãsit în %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Nu pot ºterge `%s': %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2699,7 +2713,7 @@ "FINALIZAT --%s--\n" "Downloadat: %s octeþi în %d fiºiere\n" -#: src/main.c:2271 +#: src/main.c:2278 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Cotã de download (%s octeþi) DEPêITÃ!\n" @@ -2865,7 +2879,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Continui în fundal, pid %d.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Output-ul va fi scris în `%s'.\n" @@ -2911,77 +2925,76 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: n-am putut stabili %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:190 +#: src/openssl.c:192 #, fuzzy msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Nu s-a selectat OpenSSL PRNG; dezactivare SSL.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: %s: Valoare invalidã `%s'.\n" +msgstr "" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "Nu s-a selectat OpenSSL PRNG; dezactivare SSL.\n" +msgstr "" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2989,7 +3002,7 @@ " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3038,22 +3051,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Se încarcã robots.txt; ignoraþi erorile.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Eroare în analiza URL proxy: %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirectãri depãºite.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3061,7 +3074,7 @@ "Renunþ.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3129,120 +3142,129 @@ msgid "HTTPS support not compiled in" msgstr "%s: suport de debug necompilat.\n" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Continui în fundal, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nu am putut scoate(unlink) symlinkul `%s': %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, 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:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, 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:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Eroare la scriere în `%s': %s\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, fuzzy, c-format msgid "Error opening WARC file %s.\n" msgstr "Eroare în analiza URL proxy: %s: %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3253,60 +3275,36 @@ msgstr[0] "" msgstr[1] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 #, fuzzy msgid "Could not open CDX file for output.\n" msgstr "Nu s-a putut gãsi serverul proxy.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: opþiunea `--%s' nu permite un parametru\n" - -#, fuzzy -#~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s: opþiune nerecunoscutã `--%s'\n" - -#, fuzzy -#~ msgid "%s: option '-W %s' is ambiguous\n" -#~ msgstr "%s: opþiunea `W %s' este ambiguã\n" - -#, fuzzy -#~ msgid "%s: option '-W %s' doesn't allow an argument\n" -#~ msgstr "%s: opþiunea `-W %s' nu permite parametri\n" - -#, fuzzy -#~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: opþiunea `%s' necesitã un parametru\n" - -#, fuzzy -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "Fiºierul `%s' existã deja, nu se mai aduce.\n" - #~ 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 " @@ -3325,9 +3323,21 @@ #~ 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" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/ru.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/ru.gmo differ diff -Nru wget-1.19.5/po/ru.po wget-1.20.1/po/ru.po --- wget-1.19.5/po/ru.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/ru.po 2018-12-26 20:10:50.000000000 +0000 @@ -5,13 +5,13 @@ # Const Kaplinsky , 1998, 1999, 2000, 2001. # Pavel Maryanov , 2004, 2005, 2006, 2008, 2009. # Pavel Maryanov , 2010, 2011, 2012. -# Yuri Kozlov , 2012, 2013, 2015, 2016, 2017. +# Yuri Kozlov , 2012, 2013, 2015, 2016, 2017, 2018. msgid "" msgstr "" -"Project-Id-Version: wget 1.18.109\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-01-18 20:14+0300\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-30 19:52+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -104,29 +104,29 @@ msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: двуÑмыÑленный параметр «%s»\n" +msgstr "%s: двуÑмыÑленный параметр «%s%s»\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: двуÑмыÑленный параметр «%s»; возможные варианты:" +msgstr "%s: двуÑмыÑленный параметр «%s%s»; возможные варианты:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: нераÑпознанный параметр «%c%s»\n" +msgstr "%s: нераÑпознанный параметр «%s%s»\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%c%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать аргумент\n" +msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать аргумент\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s» требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚\n" +msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s%s» требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚\n" #: lib/getopt.c:621 #, c-format @@ -235,17 +235,17 @@ msgid "Unmatched ) or \\)" msgstr "ÐÐµÐ¿Ð°Ñ€Ð½Ð°Ñ ) или \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Ðет предшеÑтвующего регулÑрного выражениÑ" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "не удалоÑÑŒ Ñоздать канал" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -309,7 +309,7 @@ msgid "failed: %s.\n" msgstr "ошибка: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: не удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ %s\n" @@ -434,12 +434,12 @@ msgid "Length: %s" msgstr "Размер (байт): %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) оÑталоÑÑŒ" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s оÑталоÑÑŒ" @@ -608,7 +608,7 @@ "Ðет такого файла или каталога: %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s вырвалÑÑ Ð² дейÑтвительноÑÑ‚ÑŒ.\n" @@ -631,17 +631,17 @@ msgid "Data transfer aborted.\n" msgstr "Передача данных прервана.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Файл %s уже ÑущеÑтвует; не загружаетÑÑ.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(попытка:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -650,7 +650,7 @@ "%s (%s) - запиÑан в stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -659,8 +659,8 @@ "%s (%s) - %s Ñохранён [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "УдалÑетÑÑ %s.\n" @@ -757,159 +757,175 @@ msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Вход в каталог «%s» не выполнÑетÑÑ, Ñ‚.к. он иÑключён/не включён.\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "ОтклонÑетÑÑ %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "ОтклонÑетÑÑ %s (некорректный Ñлемент).\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "«%s» иÑключён/не включён в ÑоответÑтвии Ñ Ñ€ÐµÐ³ÑƒÐ»Ñрным выражением.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Ошибка ÑопоÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s Ñ %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ðет Ñовпадений Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¾Ð¼ %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð² формате HTML запиÑан в файл «%s» [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð² формате HTML запиÑан в файл «%s».\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ОШИБКÐ: Ðе удалоÑÑŒ открыть каталог %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ОШИБКÐ: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñертификата %s: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Загружен Ñертификат CA «%s»\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ОШИБКÐ: Ðе удалоÑÑŒ загрузить CRL-файл «%s»: (%d).\n" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Загружен CRL-файл «%s»\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "ОШИБКÐ: Ð”Ð»Ñ GnuTLS требуетÑÑ ÐºÐ»ÑŽÑ‡ и Ñертификат одного типа.\n" -#: src/gnutls.c:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Слишком ÑÑ‚Ð°Ñ€Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ GnuTLS, чтобы поддерживать TLS 1.3\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: значение %d параметра «secure-protocol» не реализовано\n" +msgstr "GnuTLS: значение %u параметра «secure-protocol» не реализовано\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Сообщите об Ñтой ошибке по адреÑу bug-wget@gnu.org\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: значение %d параметра «secure-protocol» не реализовано\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: невозможно задать Ñтроку приоритета напрÑмую. ВозвращаемÑÑ Ðº " +"приоритету по умолчанию.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ОШИБКÐ" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "ПРЕДУПРЕЖДЕÐИЕ" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Ðет Ñертификата, предÑтавленного %s.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Ðет Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ñертификату Ð´Ð»Ñ %s.\n" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" -msgstr "%s: Сертификат %s неизвеÑтно кем выпущен.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" +msgstr "%s: ÐеизвеÑтный издатель Ñертификата %s.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Сертификат Ð´Ð»Ñ %s отозван.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: ПодпиÑавший Ñертификат %s отÑутÑтвует в УЦ.\n" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Ð”Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ Ñертификата %s иÑпользован небезопаÑный алгоритм.\n" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Сертификат %s ещё не активирован.\n" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Срок дейÑÑ‚Ð²Ð¸Ñ Ñертификата %s иÑтёк.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Ошибка инициализации Ñертификата X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Сертификат не найден\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Ошибка разбора Ñертификата: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Сертификат ещё не активирован\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Срок дейÑÑ‚Ð²Ð¸Ñ Ñертификата иÑтек\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Владелец Ñертификата не Ñовпадает Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ узла %s\n" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "Открытый ключ не ÑоответÑтвует прикреплённому открытому ключу!\n" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Сертификат должен ÑоответÑтвовать X.509\n" @@ -949,11 +965,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Ошибка запиÑи HTTP-запроÑа: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Заголовки отÑутÑтвуют, подразумеваетÑÑ HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -962,11 +978,11 @@ "Файл %s уже ÑущеÑтвует — не загружаетÑÑ.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "Ошибка gmtime. ВероÑтно, из-за дефекта.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -974,55 +990,55 @@ "Ðевозможно преобразовать отметку времени в формат http. ОткатываемÑÑ ÐºÐ¾ " "времени 0 как времени поÑледнего изменениÑ.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "ОтÑутÑтвует файл BODY-данных %s: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Повторное иÑпользование ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Повторное иÑпользование ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Сбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð²ÐµÑ‚Ð° прокÑи: %s.\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ОШИБКР%d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "ÐÐµÐ¿Ð¾Ð»Ð½Ð°Ñ Ñтрока ÑтатуÑа" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Сбой Ñ‚ÑƒÐ½Ð½ÐµÐ»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾ÐºÑи: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ñхема аутентификации.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Сохранение в: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1031,21 +1047,21 @@ "При Ñкачивании подпиÑи:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Ðевозможно прочитать Ñодержимое подпиÑи из временного файла. ПропуÑкаетÑÑ.\n" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Ðе удалоÑÑŒ Ñоздать временный файл. Скачивание подпиÑи пропуÑкаетÑÑ.\n" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "ÐедопуÑтимое значение pri. Предполагаем %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1053,42 +1069,42 @@ "Ðевозможно найти подходÑщую Ñ…Ñш-Ñумму (digest) Ð´Ð»Ñ Ñ€ÐµÑурÑов Metalink.\n" "Игнорируем.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL отключаетÑÑ Ð¸Ð·-за обнаруженных ошибок.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½. Ожидание ответа… " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Ðе получено никаких данных.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ (%s) в заголовках.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(нет опиÑаниÑ)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "ÐдреÑ: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "нет данных" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [переход]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1097,7 +1113,7 @@ "Файл %s на Ñервере не изменилÑÑ. Скачивание пропуÑкаетÑÑ.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1108,7 +1124,7 @@ "Попробуйте добавить параметр --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1118,58 +1134,58 @@ " Файл уже полноÑтью загружен; нечего выполнÑÑ‚ÑŒ.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Длина: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "игнорируетÑÑ" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Предупреждение: в HTTP маÑки не поддерживаютÑÑ.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Включен режим робота. Проверка ÑущеÑÑ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð³Ð¾ файла.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðевозможно запиÑать в %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "ОбÑзательный атрибут отÑутÑтвует в принÑтом Заголовке.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Ошибка аутентификации пользователÑ/паролÑ.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Ðевозможно запиÑать в файл WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Ðевозможно запиÑать во временный файл WARC.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Ðе удаётÑÑ ÑƒÑтановить SSL-Ñоединение.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðевозможно удалить %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ОШИБКÐ: перенаправление (%d) без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð°Ð´Ñ€ÐµÑа.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1177,24 +1193,24 @@ "Ðевозможно найти данные Metalink в ответе HTTP. Файл ÑкачиваетÑÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ " "HTTP GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Ðайдены заголовки Metalink. Переходим в режим Metalink.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Удалённый файл не ÑущеÑтвует — Ð±Ð¸Ñ‚Ð°Ñ ÑÑылка!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "ОтÑутÑтвует заголовок last-modified — временные отметки выключены.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "ÐедопуÑтимый заголовок last-modified — временные отметки проигнорированы.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1203,16 +1219,16 @@ "Файл на Ñервере не новее локального файла %s — не загружаетÑÑ.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Размеры файлов не Ñовпадают (локальный размер %s) — загружаетÑÑ.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Удалённый файл более новый, загружаетÑÑ.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1221,13 +1237,13 @@ "Удалённый файл ÑущеÑтвует и может Ñодержать ÑÑылки на другие реÑурÑÑ‹ — " "загружаетÑÑ.\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "Удалённый файл ÑущеÑтвует, но не Ñодержит ÑÑылок — не загружаетÑÑ.\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1236,7 +1252,7 @@ "Удалённый файл ÑущеÑтвует и может Ñодержать дополнительные\n" "ÑÑылки, но рекурÑÐ¸Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð° — не загружаетÑÑ.\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1244,12 +1260,12 @@ "Удалённый файл ÑущеÑтвует.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1258,7 +1274,7 @@ "/%s (%s) - запиÑан в stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1267,58 +1283,58 @@ "%s (%s) - %s Ñохранён [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Соединение закрыто, Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Ошибка чтениÑ, Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Ошибка чтениÑ, Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ %s/%s (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ðеподдерживаемый атрибут защиты «%s».\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ðеподдерживаемый алгоритм «%s».\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" -msgstr "%s: WGETRC указывает на неÑущеÑтвующий %s.\n" +msgstr "%s: WGETRC указывает на %s, доÑтуп к которому вызывает ошибку: %s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðевозможно прочитать %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Ошибка в %s в Ñтроке %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Ошибка ÑинтакÑиÑа в %s в Ñтроке %d.\n" -#: src/init.c:713 +#: src/init.c:706 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° %s в %s Ñтроке %d.\n" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1329,7 +1345,7 @@ "«%s»,\n" "или укажите другой файл Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1340,49 +1356,49 @@ "«%s»,\n" "или укажите другой файл Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Предупреждение: ÑиÑтемный и пользовательÑкий wgetrc указывают на %s.\n" -#: src/init.c:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° --execute %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" "%s: %s: Ðеверное логичеÑкое выражение %s; иÑпользуйте «on» или «off».\n" -#: src/init.c:1076 +#: src/init.c:1070 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Ðеверное %s; иÑпользуйте «on», «off» или «quiet».\n" -#: src/init.c:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ðеверное чиÑло %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s должно иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ один раз\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ðеверное значение байта %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ðеверный диапазон времени %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1391,28 +1407,28 @@ "Ð”Ð»Ñ use-askpass требуетÑÑ Ñтрока или уÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ " "WGET_ASKPASS или SSH_ASKPASS.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ðеверное значение %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ðеверный заголовок %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ðеверный заголовок WARC %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ðеверный тип прогреÑÑа %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1427,16 +1443,16 @@ msgid "Encoding %s isn't valid\n" msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° %s\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Ð’Ñтречена Ð½ÐµÐ¿Ð¾Ð»Ð½Ð°Ñ Ð¸Ð»Ð¸ недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð¼Ð½Ð¾Ð³Ð¾Ð±Ð°Ð¹Ñ‚Ð¾Ð²Ð°Ñ Ð¿Ð¾ÑледовательноÑÑ‚ÑŒ\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Код необработанной ошибки %d\n" @@ -1469,12 +1485,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; журналирование отключаетÑÑ.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "ИÑпользование: %s [ПÐРÐМЕТР]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1483,58 +1499,58 @@ "коротких параметров.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "ЗапуÑк:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version показать верÑию Wget и завершить работу\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help показать Ñту Ñправку\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background поÑле запуÑка перейти в фоновый режим\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=КОМÐÐДРвыполнить команду в Ñтиле «.wgetrc»\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Журналирование и входной файл:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=ФÐЙЛ запиÑывать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² ФÐЙЛ\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=ФÐЙЛ допиÑывать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² конец ФÐЙЛÐ\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug показать много отладочной информации\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug показать отладочную информацию Watt-32\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet ничего не выводить\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose показывать подробные ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ (по умолчанию)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1542,7 +1558,7 @@ " -nv, --no-verbose отключить вывод подробных Ñведений (не " "полноÑтью)\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1550,7 +1566,7 @@ " --report-speed=ТИП единицы Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¿ÑƒÑкной ÑпоÑобноÑти\n" " определить ТИПОМ. ТИП может быть равно bits\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1558,7 +1574,7 @@ " -i, --input-file=ФÐЙЛ загрузить URL-Ñ‹ ÑоглаÑно локальному\n" " или внешнему ФÐЙЛУ\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1566,11 +1582,11 @@ " --input-metalink=ФÐЙЛ Ñкачать файлы, перечиÑленные в локальном\n" " ФÐЙЛЕ Metalink\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html Ñчитать, что входной файл — HTML\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1578,25 +1594,25 @@ " -B, --base=URL Ñчитать, что ÑÑылки из входного файла (-i -F)\n" " указаны отноÑительно URL\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=ФÐЙЛ задать файл наÑтроек\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-config не читать файлы наÑтроек\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=ФÐЙЛ протоколировать причины отброÑа URL в ФÐЙЛ\n" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Загрузка:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1604,27 +1620,27 @@ " -t, --tries=ЧИСЛО уÑтановить ЧИСЛО повторных попыток\n" " (0 без ограничениÑ)\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused повторÑÑ‚ÑŒ, даже еÑли в подключении " "отказано\n" -#: src/main.c:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=СПИСОК ÑпиÑок игнорируемых тегов HTML,\n" -" через запÑтую\n" +" --retry-on-http-error=ОШИБКИ\n" +" ÑпиÑок (через запÑтую) ошибок HTTP,\n" +" вызывающих повтор\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=ФÐЙЛ запиÑывать документы в ФÐЙЛ\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1633,14 +1649,14 @@ " загрузке уже ÑущеÑтвующих файлов\n" " (и их перезапиÑи)\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-config не читать файлы наÑтроек\n" +msgstr "" +" --no-netrc не пытатьÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ данные из .netrc\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1648,7 +1664,7 @@ " -c, --continue возобновить загрузку чаÑтично загруженного\n" " файла\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1656,11 +1672,11 @@ " --start-pos=СМЕЩЕÐИЕ начинать загрузку Ñо СМЕЩЕÐИЯ (ÑчитаетÑÑ Ñ " "0)\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=ТИП выбрать тип индикатора выполнениÑ\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1668,7 +1684,7 @@ " --show-progress показывать индикатор Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² любом\n" " режиме подробноÑти\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1678,7 +1694,7 @@ "они\n" " не новее, чем локальные\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1689,7 +1705,7 @@ "учёта\n" " меток времени\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1697,21 +1713,21 @@ " --no-use-server-timestamps не уÑтанавливать метку времени локальному\n" " файлу, полученную Ñ Ñервера\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response вывод ответа Ñервера\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider ничего не загружать\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=СЕКУÐДЫ уÑтановка значений вÑех тайм-аутов равными\n" " чиÑлу СЕКУÐД\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1719,7 +1735,7 @@ " --dns-servers=ÐДРЕСРÑпиÑок запрашиваемых Ñерверов DNS\n" " (через запÑтую)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1728,25 +1744,25 @@ " (Ð¸Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð° или IP) локального " "компьютера\n" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=СЕК уÑтановка тайм-аута поиÑка в DNS в СЕК\n" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=СЕК уÑтановка тайм-аута Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð² СЕК\n" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=СЕК уÑтановка тайм-аута Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð² СЕК\n" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=СЕКУÐДЫ пауза в СЕКУÐДÐÐ¥ между загрузками\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1754,7 +1770,7 @@ " --waitretry=СЕКУÐДЫ пауза в 1..СЕКУÐДЫ между повторными\n" " попытками загрузки\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1762,16 +1778,16 @@ " --random-wait пауза в 0.5*WAIT...1.5*WAIT Ñекунд\n" " между загрузками\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy Ñвно выключить прокÑи\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ЧИСЛО уÑтановить величину квоты загрузки в ЧИСЛО\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1779,15 +1795,15 @@ " --bind-address=ÐДРЕС привÑзать ÐДРЕС (Ð¸Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð° или IP)\n" " локального компьютера\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=СКОРОСТЬ ограничить СКОРОСТЬ загрузки\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache отключить кÑширование DNS-запроÑов\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1795,7 +1811,7 @@ " --restrict-file-names=ОС иÑпользовать в именах файлов Ñимволы,\n" " допуÑтимые в ОС\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1803,15 +1819,15 @@ " --ignore-case игнорировать региÑÑ‚Ñ€ при ÑопоÑтавлении\n" " файлов и/или каталогов\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only подключатьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ к адреÑам IPv4\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only подключатьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ к адреÑам IPv6\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1821,23 +1837,23 @@ " ÑемейÑтва (может быть IPv6, IPv4 или " "ничего)\n" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=ПОЛЬЗОВÐТЕЛЬ уÑтановить и ftp- и http-Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð²\n" " ПОЛЬЗОВÐТЕЛЬ\n" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=ПÐРОЛЬ уÑтановить ftp- и http-пароль в ПÐРОЛЬ\n" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password запрашивать пароли\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1853,29 +1869,29 @@ " Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ WGET_ASKPASS \n" " или SSH_ASKPASS.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri выключить поддержку IRI\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=КДР иÑпользовать КДР как локальную кодировку\n" " Ð´Ð»Ñ IRI\n" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=КДР иÑпользовать КДР как удалённую кодировку\n" " по умолчанию\n" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink удалить файл перед затиранием\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1883,7 +1899,7 @@ " --keep-badhash оÑтавлÑÑ‚ÑŒ файлы Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¼Ð¸\n" " контрольными Ñуммами (добавлÑÑ .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1891,7 +1907,7 @@ " --metalink-index=ÐОМЕР порÑдковый ÐОМЕР metaurl\n" " Metalink application/metalink4+xml\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1899,7 +1915,7 @@ " --metalink-over-http иÑпользовать метаданные Metalink из\n" " заголовка ответов HTTP\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1907,40 +1923,41 @@ " --preferred-location предпочитаемое раÑположение реÑурÑов " "Metalink\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr выключить хранилище метаданных в\n" " раÑширенных файловых атрибутах\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Каталоги:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories не Ñоздавать каталоги\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories принудительно Ñоздавать каталоги\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories не Ñоздавать каталоги как на узле\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories иÑпользовать Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° в каталогах\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=ПРЕФИКС ÑохранÑÑ‚ÑŒ файлы в ПРЕФИКС/..\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1948,25 +1965,25 @@ " --cut-dirs=ЧИСЛО игнорировать ЧИСЛО компонентов удалённого\n" " каталога\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Параметры HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=ПОЛЬЗОВ. уÑтановить http-Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ПОЛЬЗОВÐТЕЛЬ\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=ПÐРОЛЬ уÑтановить http-пароль в ПÐРОЛЬ\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache отвергать кÑшированные Ñервером данные\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1974,7 +1991,7 @@ " --default-page=ИМЯ изменить Ð¸Ð¼Ñ Ñтраницы по умолчанию (обычно\n" " Ñто «index.html»)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1982,43 +1999,44 @@ " -E, --adjust-extension ÑохранÑÑ‚ÑŒ документы HTML/CSS Ñ Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñ‰Ð¸Ð¼Ð¸\n" " раÑширениÑми\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length игнорировать поле заголовка «Content-Length»\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=СТРОКРвÑтавить СТРОКУ между заголовками\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=ТИП выбрать тип индикатора выполнениÑ\n" +msgstr "" +" --compression=ТИП тип ÑжатиÑ: auto, gzip или none\n" +" (по умолчанию: none)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect макÑимально допуÑтимое чиÑло перенаправлений\n" " на Ñтраницу\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=ПОЛЬЗОВ. уÑтановить ПОЛЬЗОВÐТЕЛЯ в качеÑтве имени\n" " Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐºÑи\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=ПÐРОЛЬ уÑтановить ПÐРОЛЬ в качеÑтве Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð´Ð»Ñ\n" " прокÑи\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2026,11 +2044,11 @@ " --referer=URL включить в HTTP-Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº «Referer: " "URL»\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers ÑохранÑÑ‚ÑŒ HTTP-заголовки в файл\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2038,7 +2056,7 @@ " -U, --user-agent=ÐГЕÐТ идентифицировать ÑÐµÐ±Ñ ÐºÐ°Ðº ÐГЕÐТ вмеÑто\n" " Wget/ВЕРСИЯ\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2046,21 +2064,21 @@ " --no-http-keep-alive отключить поддержание активноÑти HTTP\n" " (поÑтоÑнные подключениÑ)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies не иÑпользовать кукиÑÑ‹\n" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=ФÐЙЛ загрузить кукиÑÑ‹ из ФÐЙЛРперед ÑеанÑом\n" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --save-cookies=ФÐЙЛ Ñохранить кукиÑÑ‹ в ФÐЙЛ поÑле ÑеанÑа\n" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2068,7 +2086,7 @@ " --keep-session-cookies загрузить и Ñохранить кукиÑÑ‹ ÑеанÑа\n" " (непоÑтоÑнные)\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2076,7 +2094,7 @@ " --post-data=СТРОКРиÑпользовать метод POST; отправка СТРОКИ в\n" " качеÑтве данных\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2085,13 +2103,13 @@ "Ñодержимого\n" " ФÐЙЛÐ\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod иÑпользовать метод «HTTPMethod» в заголовке\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2099,7 +2117,7 @@ " --body-data=СТРОКРотправка СТРОКИ в качеÑтве данных;\n" " ДОЛЖЕРбыть указан параметр --method\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2107,7 +2125,7 @@ " --body-file=ФÐЙЛ отправка Ñодержимого ФÐЙЛÐ;\n" " ДОЛЖЕРбыть указан параметр --method\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2118,14 +2136,14 @@ " при выборе имён Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ… файлов\n" " (ЭКСПЕРИМЕÐТÐЛЬÐЫЙ)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" " --content-on-error выводить принÑтые данные при ошибках Ñервера\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2136,65 +2154,64 @@ " Basic HTTP не дожидаÑÑÑŒ первого ответа\n" " Ñервера\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Параметры HTTPS (SSL/TLS):\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -" --secure-protocol=ПР выбор безопаÑного протокола: auto, SSLv2,\n" -" SSLv3, TLSv1 и PFS\n" +" --secure-protocol=ПР выбор протокола безопаÑноÑти: auto, SSLv2,\n" +" SSLv3, TLSv1, TLSv1_1, TLSv1_2 или PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only переходить только по безопаÑным ÑÑылкам " "HTTPS\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate не проверÑÑ‚ÑŒ Ñертификат Ñервера\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FILE файл Ñертификата пользователÑ\n" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=ТИП тип Ñертификата пользователÑ: PEM или DER\n" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=ФÐЙЛ файл Ñекретного ключа\n" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=ТИП тип Ñекретного ключа: PEM или DER\n" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=ФÐЙЛ файл Ñ Ð½Ð°Ð±Ð¾Ñ€Ð¾Ð¼ CA\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" " --ca-directory=КÐТ каталог, в котором хранитÑÑ ÑпиÑок CA\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=ФÐЙЛ файл Ñ Ð½Ð°Ð±Ð¾Ñ€Ð¾Ð¼ CRL\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2209,14 +2226,14 @@ "«;»,\n" " по которым проверÑетÑÑ Ð¾Ñ‚Ð²ÐµÑ‚Ð½Ñ‹Ð¹ узел\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" " --random-file=ФÐЙЛ файл Ñо Ñлучайными данными Ð´Ð»Ñ SSL PRNG\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2224,7 +2241,7 @@ " --egd-file=ФÐЙЛ файл, определÑющий Ñокет EGD Ñо Ñлучайными " "данными\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2233,16 +2250,23 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=СТРОКРназначить Ñтроку приоритета (GnuTLS) или\n" +" ÑпиÑок шифров (OpenSSL) непоÑредÑтвенным\n" +" образом. ИÑпользовать оÑторожно. Данный\n" +" параметр заменÑет значение --secure-" +"protocol.\n" +" Формат и ÑинтакÑÐ¸Ñ Ñтроки завиÑит от\n" +" иÑпользуемой библиотеки SSL/TLS.\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "Параметры HSTS:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts отключить HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2250,11 +2274,11 @@ " --hsts-file путь к базе данных HSTS (заменит значение\n" " по умолчанию)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Параметры FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2262,34 +2286,34 @@ " --ftp-stmlf иÑпользовать формат Stream_LF Ð´Ð»Ñ Ð²Ñех\n" " двоичных файлов FTP\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=ПОЛЬЗОВÐТЕЛЬ уÑтановить ftp-Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ПОЛЬЗОВÐТЕЛЬ\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=ПÐРОЛЬ уÑтановить ftp-пароль в ПÐРОЛЬ\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing не удалÑÑ‚ÑŒ файлы «.listing»\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob выключить маÑки Ð´Ð»Ñ Ð¸Ð¼Ñ‘Ð½ файлов FTP\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp отключить «паÑÑивный» режим передачи\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions ÑохранÑÑ‚ÑŒ права доÑтупа удалённых файлов\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2297,11 +2321,11 @@ " --retr-symlinks при рекурÑии загружать файлы по ÑÑылкам\n" " (не каталоги)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "Параметры FTPS:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2309,7 +2333,7 @@ " --ftps-implicit безуÑловно иÑпользовать FTPS (порт\n" " по умолчанию — 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2319,7 +2343,7 @@ " в канале управлениÑ, при открытии\n" " канала данных\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2327,7 +2351,7 @@ " --ftps-clear-data-connection шифровать только канал управлениÑ;\n" " данные не шифруютÑÑ\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2335,11 +2359,11 @@ " --ftps-fallback-to-ftp вернутьÑÑ Ðº FTP, еÑли FTPS не\n" " поддерживаетÑÑ Ñервером\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Параметры WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2347,23 +2371,23 @@ " --warc-file=ФÐЙЛ запиÑать данные запроÑа/ответа в файл .warc." "gz\n" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=СТРОКРвÑтавить СТРОКУ в запиÑÑŒ warcinfo\n" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=ЧИСЛО макÑимальный размер файлов WARC равен " "ЧИСЛУ\n" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx запиÑать индекÑные файлы CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2371,24 +2395,24 @@ " --warc-dedup=ФÐЙЛ не ÑохранÑÑ‚ÑŒ запиÑи, перечиÑленные в файле " "CDX\n" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression не Ñжимать файлы WARC Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GZIP\n" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests не вычиÑлÑÑ‚ÑŒ дайджеÑÑ‚Ñ‹ SHA1\n" -#: src/main.c:949 +#: src/main.c:950 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:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2397,28 +2421,28 @@ " --warc-tempdir=КÐТÐЛОГ раÑположение Ð´Ð»Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ñ… файлов,\n" " Ñоздаваемых процедурой запиÑи WARC\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "РекурÑÐ¸Ð²Ð½Ð°Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive включение рекурÑивной загрузки\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" " -l, --level=ЧИСЛО глубина рекурÑии (inf и 0 — беÑконечноÑÑ‚ÑŒ)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after удалÑÑ‚ÑŒ локальные файлы поÑле загрузки\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2427,7 +2451,7 @@ " -k, --convert-links делать ÑÑылки локальными в загруженном\n" " HTML или CSS\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2435,7 +2459,7 @@ " --convert-file-only преобразовывать только файловую чаÑÑ‚ÑŒ URL\n" " (базовую чаÑÑ‚ÑŒ имени)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2443,7 +2467,7 @@ " --backups=N перед запиÑью файла X, ротировать до N\n" " резервных файлов\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2451,7 +2475,7 @@ " -K, --backup-converted перед преобразованием файла X делать резервную\n" " копию в виде X_orig\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2459,7 +2483,7 @@ " -K, --backup-converted перед преобразованием файла X делать резервную\n" " копию в виде X.orig\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2467,7 +2491,7 @@ " -m, --mirror короткий параметр, Ñквивалентный\n" " -N -r -l inf --no-remove-listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2475,7 +2499,7 @@ " -p, --page-requisites загрузить вÑе Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¸ проч., необходимые\n" " Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ HTML-Ñтраницы\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2483,11 +2507,11 @@ " --strict-comments включить Ñтрогую (SGML) обработку комментариев\n" " HTML\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "РазрешениÑ/запреты при рекурÑии:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2495,7 +2519,7 @@ " -A, --accept=СПИСОК ÑпиÑок разрешённых раÑширений\n" " через запÑтую\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2503,47 +2527,47 @@ " -R, --reject=СПИСОК ÑпиÑок запрещённых раÑширений,\n" " разделённых запÑтыми.\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=РЕГВЫР регулÑрное выражение Ð´Ð»Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÑ‘Ð½Ð½Ñ‹Ñ… URL\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=РЕГВЫР регулÑрное выражение Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰Ñ‘Ð½Ð½Ñ‹Ñ… URL\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=ТИП тип регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=ТИП тип регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=СПИСОК ÑпиÑок разрешённых доменов,\n" " через запÑтую\n" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=СПИСОК ÑпиÑок запрещённых доменов,\n" " через запÑтую\n" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp Ñледовать по ÑÑылкам FTP в HTML-" "документах\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2551,7 +2575,7 @@ " --follow-tags=СПИСОК ÑпиÑок иÑпользуемых тегов HTML,\n" " через запÑтую\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2559,22 +2583,22 @@ " --ignore-tags=СПИСОК ÑпиÑок игнорируемых тегов HTML,\n" " через запÑтую\n" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts заходить на чужие узлы при рекурÑии\n" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative Ñледовать только по отноÑительным " "ÑÑылкам\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=СПИСОК ÑпиÑок разрешённых каталогов\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2583,93 +2607,95 @@ " --trust-server-names иÑпользовать имÑ, указанное в перенаправлÑющем URL,\n" " в качеÑтве поÑледнего компонента.\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=СПИСОК ÑпиÑок иÑключаемых каталогов\n" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent не подниматьÑÑ Ð² родительÑкий каталог\n" -#: src/main.c:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" -msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± ошибках и Ð¿Ð¾Ð¶ÐµÐ»Ð°Ð½Ð¸Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»Ñйте на \n" +msgstr "" +"Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± ошибках, вопроÑÑ‹ и Ð¿Ð¾Ð¶ÐµÐ»Ð°Ð½Ð¸Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»Ñйте на \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"и/или откройте проблему на https://savannah.gnu.org/bugs/?" +"func=additem&group=wget.\n" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "" "GNU Wget %s, программа Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ файлов из Ñети в автономном режиме.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Пароль Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Пароль: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Ðе удалоÑÑŒ Ñоздать канал\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "Ошибка инициализации объекта файловых дейÑтвий при spawn Ð´Ð»Ñ use-askpass: " "%d\n" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "Ошибка Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ñƒ файловых дейÑтвий при spawn Ð´Ð»Ñ use-askpass: %d\n" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð²ÐµÑ‚Ð° команды «%s %s»: %s\n" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Â«%s%s»: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Пароль Ð´Ð»Ñ Â«%s%s@%s»: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Локаль: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "КомпилÑциÑ: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "СÑылка: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2678,29 +2704,29 @@ "GNU Wget %s Ð´Ð»Ñ %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (Ñреда)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (пользователь)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2715,7 +2741,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2723,36 +2749,36 @@ "\n" "Ðвтор оригинальной верÑии: Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± ошибках и вопроÑÑ‹ отправлÑйте на .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Проблема Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñти\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Завершение работы из-за ошибки в %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Дополнительные параметры выводÑÑ‚ÑÑ Ð¿Ð¾ команде «%s --help».\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: недопуÑтимый параметр — «-n%c»\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "Собрано без поддержки отладки. Флаг --debug игнорируетÑÑ.\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2761,7 +2787,7 @@ "Указаны Ñразу --no-clobber и --convert-links, будет иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ --" "convert-links.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2770,24 +2796,24 @@ "Указаны Ñразу --no-clobber и --convert-file-only, будет иÑпользоватьÑÑ " "только --convert-file-only.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ðевозможно одновременно иÑпользовать режимы verbose и quiet.\n" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Ðевозможно одновременно иÑпользовать временные метки и не затирать Ñтарые " "файлы.\n" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Ðевозможно указать и --inet4-only, и --inet6-only.\n" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2798,7 +2824,7 @@ "неÑколько URL, или в комбинации Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð°Ð¼Ð¸ -p или -r.\n" "ПодробноÑти Ñм. в документации.\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2808,7 +2834,7 @@ "загруженные данные будут помещены в один файл.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2818,7 +2844,7 @@ "параметр -O. ПодробноÑти Ñмотрите в руководÑтве.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2826,19 +2852,19 @@ "Вывод WARC не работает Ñ --no-clobber, параметр --no-clobber будет " "отключён.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" "Вывод WARC не работает Ñ Ð¼ÐµÑ‚ÐºÐ°Ð¼Ð¸ времени, метки времени будут отключены.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Вывод WARC не работает Ñ --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2846,7 +2872,7 @@ msgstr "" "Вывод WARC не работает Ñ --continue или --start-pos; они будут отключены.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2854,20 +2880,20 @@ "ДайджеÑÑ‚ отключён; Ð´ÐµÐ´ÑƒÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ WARC не будет находить повторÑющиеÑÑ " "запиÑи.\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"Вывод WARC не работает Ñ --continue или --start-pos; они будут отключены.\n" +"Сжатие не работает Ñ --continue или --start-pos; они будут отключены.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Ðевозможно указать Ñразу --ask-password и --password.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2876,17 +2902,17 @@ "Ðе рекомендуетÑÑ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ --start-pos и --continue одновременно; --continue " "будет отключён.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: отÑутÑтвует URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ --post-data и --post-file одновременно.\n" -#: src/main.c:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2895,7 +2921,7 @@ "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать --post-data или --post-file вмеÑте Ñ --method. Параметр " "--method предполагает данные в параметрах --body-data и --body-file\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2904,17 +2930,17 @@ "Чтобы иÑпользовать --body-data или --body-file вы должны указать " "иÑпользуемый метод через параметр --method=HTTPMethod.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ --body-data и --body-file одновременно.\n" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Эта верÑÐ¸Ñ Ð½Ðµ поддерживает IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2922,7 +2948,7 @@ "Параметр -k или -r может иÑпользовать только вмеÑте Ñ -O, еÑли вывод " "производитÑÑ Ð² обычный файл.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2931,42 +2957,42 @@ "Параметр --convert-links или --convert-file-only может иÑпользовать вмеÑте " "только, еÑли вывод производитÑÑ Ð² обычный файл.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Сбой при инициализации libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Сбой при инициализации канала c-ares\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Ðе удалоÑÑŒ разобрать IP-Ð°Ð´Ñ€ÐµÑ Â«%s»\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Ðе удалоÑÑŒ назначить DNS-Ñервер(Ñ‹) «%s» (%d)\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Ðе найдены URL-Ñ‹ в файле %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ðе удалоÑÑŒ обработать файл metalink %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Ðевозможно Ñкачать вÑе реÑурÑÑ‹ Ñ %s.\n" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2977,7 +3003,7 @@ "Общее времÑ: %s\n" "Загружено: %d файлов, %s за %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "ПРЕВЫШЕÐО ограничение на загрузку (%s)!\n" @@ -3143,7 +3169,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Работа продолжаетÑÑ Ð² фоновом режиме, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Выходные данные будут запиÑаны в %s.\n" @@ -3189,68 +3215,67 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: невозможно выполнить stat Ð´Ð»Ñ %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "ПРЕДУПРЕЖДЕÐИЕ: иÑпользуетÑÑ Ñлабый иÑточник Ñлучайных данных.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Ðевозможно породить PRNG; подразумеваетÑÑ Ð¸Ñпользование параметра --random-" "file.\n" -#: src/openssl.c:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "ВерÑÐ¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ OpenSSL Ñлишком ÑÑ‚Ð°Ñ€Ð°Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ TLSv1.1\n" +msgstr "" +"ВерÑÐ¸Ñ Ð²Ð°ÑˆÐµÐ¹ библиотеки OpenSSL Ñлишком ÑтараÑ, чтобы поддерживать TLS 1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "ВерÑÐ¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ OpenSSL Ñлишком ÑÑ‚Ð°Ñ€Ð°Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ TLSv1.1\n" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "ВерÑÐ¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ OpenSSL Ñлишком ÑÑ‚Ð°Ñ€Ð°Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ TLSv1.2\n" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: значение %d параметра «secure-protocol» не реализовано\n" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: недопуÑтимый URL %s: %s\n" +msgstr "OpenSSL: некорректный ÑпиÑок шифров: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "" -"Ðевозможно породить PRNG; подразумеваетÑÑ Ð¸Ñпользование параметра --random-" -"file.\n" +"ПРЕДУПРЕЖДЕÐИЕ: невозможно заÑеить PRNG; раÑÑматриваетÑÑ Ð¸Ñпользование " +"параметра --random-file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: невозможно проверить Ñертификат %s, выпущенный %s:\n" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Ðевозможно локально проверить подлинноÑÑ‚ÑŒ запрашивающего.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Обнаружен ÑамоÑтоÑтельно подпиÑанный Ñертификат.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Запрошенный Ñертификат ещё недейÑтвителен.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Ð”Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ð¾Ð³Ð¾ Ñертификата иÑтёк Ñрок дейÑтвиÑ.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3259,7 +3284,7 @@ "%s: альтернативное Ð¸Ð¼Ñ Ñубъекта Ñертификата не Ñовпадает Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼\n" "запрошенного узла %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3267,7 +3292,7 @@ " %s: Общее название Ñертификата %s не Ñовпадает Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ запрошенного " "узла %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3278,7 +3303,7 @@ " Это может указывать на то, что узел не тот, за кого ÑÐµÐ±Ñ Ð²Ñ‹Ð´Ð°Ñ‘Ñ‚\n" " (то еÑÑ‚ÑŒ не наÑтоÑщий %s).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3329,22 +3354,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "ЗагружаетÑÑ robots.txt; не обращайте внимание на ошибки.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Ошибка разбора URL прокÑи %s: %s\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Ошибка в URL прокÑи %s: Должен быть HTTP.\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "Превышено чиÑло перенаправлений %d.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3352,7 +3377,7 @@ "Завершение.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3427,97 +3452,109 @@ msgid "HTTPS support not compiled in" msgstr "Программа Ñкомпилирована без поддержки HTTPS" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "Ð’Ñтречена Ð½ÐµÐ¿Ð¾Ð»Ð½Ð°Ñ Ð¸Ð»Ð¸ недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð¼Ð½Ð¾Ð³Ð¾Ð±Ð°Ð¹Ñ‚Ð¾Ð²Ð°Ñ Ð¿Ð¾ÑледовательноÑÑ‚ÑŒ\n" +msgstr "Обнаружена Ð½ÐµÐ¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·ÑƒÐµÐ¼Ð°Ñ Ð¼Ð½Ð¾Ð³Ð¾Ð±Ð°Ð¹Ñ‚Ð¾Ð²Ð°Ñ Ð¿Ð¾ÑледовательноÑÑ‚ÑŒ\n" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Ðе удалоÑÑŒ выделить доÑтаточно памÑти; нехватка памÑти.\n" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: не удалоÑÑŒ выделить %ld байт; недоÑтаточно памÑти.\n" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: текÑтовый буфер Ñлишком велик (%d байт), оÑтанов.\n" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Работа продолжаетÑÑ Ð² фоновом режиме, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ðе удалоÑÑŒ разорвать Ñимвольную ÑÑылку %s: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Сбой при инициализации libcares\n" +msgstr "Ошибка при выполнении Fopen Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %s\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Ðе удалоÑÑŒ назначить права Ð´Ð»Ñ %s.\n" +msgstr "Ошибка при получении FD Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Ðе удалоÑÑŒ назначить права Ð´Ð»Ñ %s.\n" +msgstr "Ошибка при выполнении stat Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %s (проверьте права доÑтупа)\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"С момента поÑледней проверки файл %s изменилÑÑ. Ошибка при проверке " +"безопаÑноÑти." -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Ðе удалоÑÑŒ разобрать IP-Ð°Ð´Ñ€ÐµÑ Â«%s»\n" +msgstr "Ошибка при открытии файла %s, причина: %s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Ðе удалоÑÑŒ назначить права Ð´Ð»Ñ %s.\n" +msgstr "Ошибка при выполнении stat Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %s, ошибка: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"ВыполнÑетÑÑ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° %s, но он изменилÑÑ Ñ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð° поÑледней " +"проверки. Ошибка при проверке безопаÑноÑти." -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "ÐедопуÑтимое регулÑрное выражение %s, ошибка PCRE2 %d\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "ÐедопуÑтимое регулÑрное выражение %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Ошибка при Ñравнении %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "ПропуÑкаетÑÑ ÐºÐ»ÑŽÑ‡ Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¼ размером (%d/%d): %s\n" + +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð´ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ‚Ð° файлового деÑкриптора файла WARC.\n" -#: src/warc.c:223 +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¿Ð¾Ñ‚Ð¾ÐºÐ° GZIP в файл WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи warcinfo в файл WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3526,25 +3563,25 @@ "ОткрываетÑÑ Ñ„Ð°Ð¹Ð» WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Файл CDX не Ñодержит оригинальных url (отÑутÑтвует Ñтолбец «a»).\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Файл CDX не Ñодержит контрольных Ñумм (отÑутÑтвует Ñтолбец «k»).\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" "Файл CDX не Ñодержит идентификаторов запиÑей (отÑутÑтвует Ñтолбец «u»).\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3562,32 +3599,32 @@ "Загружено %d запиÑей из CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Ðевозможно прочитать файл CDX %s Ð´Ð»Ñ Ð´ÐµÐ´ÑƒÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Ðевозможно открыть временный файл манифеÑта WARC.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Ðевозможно открыть временный файл журнала WARC.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Ðевозможно открыть файл WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Ðевозможно открыть файл CDX Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи результата.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Ðевозможно открыть временный файл WARC.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Ðайдено единÑтвенное Ñовпадение в файле CDX. СохранÑем переÑмотренную запиÑÑŒ " Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/sk.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/sk.gmo differ diff -Nru wget-1.19.5/po/sk.po wget-1.20.1/po/sk.po --- wget-1.19.5/po/sk.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/sk.po 2018-12-26 20:10:50.000000000 +0000 @@ -1,15 +1,15 @@ # Slovak translations for GNU wget -# Copyright (C) 1999, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017 Free Software Foundation, Inc. +# Copyright (C) 1999, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Miroslav Vasko , 1999. -# Marcel Telka , 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017. +# Marcel Telka , 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018. # msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.18.109\n" +"Project-Id-Version: GNU wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-01-18 22:36+0100\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-15 20:56+0100\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -100,29 +100,29 @@ msgstr "Neznáma chyba" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: voľba '%s' je nejednoznaÄná\n" +msgstr "%s: voľba '%s%s' je nejednoznaÄná\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: voľba '%s' je nejednoznaÄná, možnosti:" +msgstr "%s: voľba '%s%s' je nejednoznaÄná, možnosti:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: neznáma voľba '%c%s'\n" +msgstr "%s: neznáma voľba '%s%s'\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: voľba '%c%s' nepodporuje parameter\n" +msgstr "%s: voľba '%s%s' nepodporuje parameter\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: voľba '--%s' vyžaduje parameter\n" +msgstr "%s: voľba '%s%s' vyžaduje parameter\n" #: lib/getopt.c:621 #, c-format @@ -231,17 +231,17 @@ msgid "Unmatched ) or \\)" msgstr "Nepárové ) alebo \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Bez predchádzajúceho regulárneho výraz" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "nepodarilo sa vytvoriÅ¥ dátovod" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -306,7 +306,7 @@ msgid "failed: %s.\n" msgstr "zlyhalo: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: nepodarilo sa previesÅ¥ adresu hostiteľa %s\n" @@ -429,12 +429,12 @@ msgid "Length: %s" msgstr "Dĺžka: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", ostáva %s (%s)" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", ostáva %s" @@ -603,7 +603,7 @@ "Súbor alebo adresár %s neexistuje.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s bol odpružený do existencie.\n" @@ -626,17 +626,17 @@ msgid "Data transfer aborted.\n" msgstr "Prenos dát bol predÄasne ukonÄený.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, 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:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(pokus:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -645,7 +645,7 @@ "%s (%s) - zapísané na Å¡tandardný výstup %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -654,8 +654,8 @@ "%s (%s) - %s uložený [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Odstraňuje sa %s.\n" @@ -752,160 +752,176 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Odmieta sa %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Odmieta sa %s (neplatná položka).\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s je vylúÄený/nezaÄlenený pomocou regulárneho výrazu.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Chyba pri hľadaní zhody %s s %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Vzoru %s niÄ nezodpovedá.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, 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:2760 +#: src/ftp.c:2762 #, 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:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "CHYBA: Nie je možné otvoriÅ¥ adresár %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "CHYBA: Otvorenie certifikátu %s zlyhalo: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "NaÄítaný CA certifikát '%s'\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "NaÄítaný CRL súbor '%s'\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "VaÅ¡a verzia GnuTLS je príliÅ¡ stará, aby podporovala TLS 1.3\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: neimplementovaná hodnota %d voľby 'secure-protocol'\n" +msgstr "GnuTLS: neimplementovaná hodnota %u voľby 'secure-protocol'\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: neimplementovaná hodnota %d voľby 'secure-protocol'\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: Nie je možné priamo nastaviÅ¥ reÅ¥azec prio. Použije sa predvolená " +"priorita.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "CHYBA" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "UPOZORNENIE" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s neprezentoval certifikát.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 +#: src/gnutls.c:932 #, 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" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" +msgstr "%s: Certifikát %s nemá známeho vydavateľa.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certifikát %s bol zruÅ¡ený.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" -msgstr "%s: Ten, kto podpísal %s, nebol CA.\n" +msgstr "%s: Ten, kto podpísal certifikát %s, nebol CA.\n" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Certifikátu %s vyprÅ¡ala platnosÅ¥.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Chyba pri inicializácii certifikátu X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Certifikát nenájdený\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Chyba pri analýze certifikátu: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Certifikát eÅ¡te nebol aktivovaný\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Certifikátu vyprÅ¡ala platnosÅ¥\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Certifikát musí byÅ¥ X.509\n" @@ -945,22 +961,22 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Požiadavku HTTP nebolo možné odoslaÅ¥: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Bez hlaviÄiek, predpokladá sa HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, 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:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime zlyhalo. Toto je pravdepodobne programátorská chyba.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -968,55 +984,55 @@ "Nemožno previesÅ¥ Äasovú znaÄku do formátu http. Použije sa Äas 0 ako Äas " "poslednej zmeny.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Chýba BODY dátový súbor %s: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Použije sa existujúce spojenie s [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Použije sa existujúce spojenie s %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Zlyhalo Äítanie odpovede z proxy: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s CHYBA %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "OdpoveÄ servera má skomolený stavový riadok" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tunelovanie proxy zlyhalo: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Neznámy spôsob autentifikácie.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Vybraná autentifikácia: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Ukladá sa do: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1025,63 +1041,63 @@ "Pri sÅ¥ahovaní podpisu:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Neplatná hodnota pri. Predpoklá sa %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 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:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Deaktivuje sa SSL z dôvodu výskytu chýb.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s požiadavka odoslaná, Äakám na odpoveÄ... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Neboli prijaté žiadne dáta.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Chyba (%s) pri Äítaní hlaviÄiek.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(bez popisu)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Presmerované na: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "neudané" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [nasledované]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1090,7 +1106,7 @@ "Súbor %s nezmenený na serveri. SÅ¥ahovanie vynechané.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1101,7 +1117,7 @@ "Mohli by ste chcieÅ¥ pridaÅ¥ voľbu --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1111,58 +1127,58 @@ " Tento súbor je už kompletne prenesený; netreba niÄ robiÅ¥.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Dĺžka: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignorované" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Upozornenie: HTTP nepodporuje žolíkové znaky.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nie je možné zapísaÅ¥ do %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Prijatá hlaviÄka neobsahuje povinný atribút.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Zlyhalo overenie používateľa/hesla.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Nie je možné zapísaÅ¥ do súboru WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 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:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Nepodarilo sa nadviazaÅ¥ SSL spojenie.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nie je možné odstrániÅ¥ %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "CHYBA: Presmerovanie (%d) bez udanej novej adresy.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1170,23 +1186,23 @@ "Nepodarilo sa v HTTP odpovedi nájsÅ¥ dáta Metalink. Súbor sa sÅ¥ahuje pomocou " "HTTP GET.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Nájdené hlaviÄky Metalink. Prepnutie do režimu Metalink.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Vzdialený súbor neexistuje -- poÅ¡kodený odkaz!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "HlaviÄka Last-modified je neplatná -- Äasové znaÄky ignorované.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1195,16 +1211,16 @@ "Súbor na serveri nie je novší ako miestny súbor %s -- neprenáša sa.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Vzdialený súbor je novší, prenáša sa.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1214,7 +1230,7 @@ "prenáša sa.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1222,7 +1238,7 @@ "Vzdialený súbor, ale neobsahuje žiadne odkazy -- neprenáša sa.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1232,7 +1248,7 @@ "ale rekurzia nie je povolená -- neprenáša sa.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1240,12 +1256,12 @@ "Vzdialený súbor existuje.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1254,7 +1270,7 @@ "%s (%s) - zapísané na Å¡tandardný výstup %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1263,58 +1279,58 @@ "%s (%s) - %s uložené [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Spojenie uzatvorené na bajte %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Chyba pri Äítaní na bajte %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nepodporovaná kvalita ochrany '%s'.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepodporovaný algoritmus '%s'.\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, 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" +msgstr "%s: WGETRC ukazuje na %s, ktorý je nedostupný kvôli chybe: %s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nie je možné preÄítaÅ¥ %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Chyba v %s na riadku %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1325,7 +1341,7 @@ "Prosím, skontrolujte '%s',\n" "alebo zadajte iný súbor pomocou --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1336,48 +1352,48 @@ "'%s',\n" "alebo zadajte iný súbor pomocou --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Neplatný príkaz --execute %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Neplatné Äíslo %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s musí byÅ¥ použité len raz\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Neplatná hodnota bajtu %s.\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Neplatný Äasový interval %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1386,28 +1402,28 @@ "use-askpass vyžaduje reÅ¥azec alebo nastavenú premennú prostredia " "WGET_ASKPASS alebo SSH_ASKPASS.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Neplatná hodnota %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Neplatná hlaviÄka %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Neplatná WARC hlaviÄka %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Neplatný typ postupu %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1421,16 +1437,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Kódovanie %s nie je platné\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Vyskytla sa nekompletná alebo neplatná viacbajtová postupnosÅ¥\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Nespracované errno %d\n" @@ -1463,12 +1479,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; protokolovaniei sa vypína.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Použitie: %s [VOĽBA]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1476,59 +1492,59 @@ "Parametre povinné pri dlhých voľbách sú povinné aj pre skrátené voľby.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Spustenie:\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help vytlaÄiÅ¥ túto pomoc\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background prejsÅ¥ do pozadia po spustení\n" -#: src/main.c:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Zaznamenávanie a vstupný súbor:\n" -#: src/main.c:608 +#: src/main.c:609 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:610 +#: src/main.c:611 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:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug vytlaÄiÅ¥ množstvo ladiacich informácií\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug vytlaÄiÅ¥ ladiaci výstup Watt-32\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet potichu (bez výstupu)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose byÅ¥ rozvláÄny (toto je Å¡tandard)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1536,7 +1552,7 @@ " -nv, --no-verbose vypnúť rozvláÄnosÅ¥ bez toho, aby bolo " "ticho\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1544,7 +1560,7 @@ " --report-speed=TYP vypisovaÅ¥ šírku pásma ako TYP. TYP môže " "byÅ¥ `bits'\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1553,7 +1569,7 @@ "miestnom\n" " alebo externom SÚBORe\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1561,11 +1577,11 @@ " --input-metalink=SÚBOR stiahnuÅ¥ súbory zahrnuté v miestnom " "Metalink SÚBORe\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html spracovaÅ¥ vstupný súbor ako HTML\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1574,28 +1590,28 @@ "-F)\n" " relatívne k URL\n" -#: src/main.c:639 +#: src/main.c:640 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:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" " --no-config nenaÄítaÅ¥ žiaden konfiguraÄný súbor\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "SÅ¥ahovanie:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1603,27 +1619,27 @@ " -t, --tries=ÄŒÃSLO nastaviÅ¥ poÄet opakovaní na ÄŒÃSLO (0 " "neobmedzene)\n" -#: src/main.c:651 +#: src/main.c:652 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:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=ZOZNAM Äiarkou oddelený zoznam ignorovaných HTML " -"znaÄiek\n" +" --retry-on-http-error=CHYBY Äiarkou oddelený zoznam HTTP chýb, " +"pri ktorých\n" +" skúsiÅ¥ znova\n" -#: src/main.c:655 +#: src/main.c:656 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:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1632,15 +1648,15 @@ " do existujúcich súborov (prepísali " "ich)\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -" --no-config nenaÄítaÅ¥ žiaden konfiguraÄný súbor\n" +" --no-netrc nepokúšaÅ¥ sa získaÅ¥ prihlasovacie údaje " +"z .netrc\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1648,7 +1664,7 @@ " -c, --continue obnoviÅ¥ získavanie ÄiastoÄne stiahnutého " "súboru\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1656,11 +1672,11 @@ " --start-pos=POSUV zaÄaÅ¥ sÅ¥ahovanie od pozície POSUV (zaÄína " "nulou)\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYP zvoliÅ¥ typ zobrazenia postupu\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1668,7 +1684,7 @@ " --show-progress zobraziÅ¥ liÅ¡tu postupu v každom režime " "rozvláÄnosti\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1678,7 +1694,7 @@ "novÅ¡ie\n" " ako miestne\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1689,7 +1705,7 @@ " if-modified-since v režime oznaÄovania\n" " Äasovými znaÄkami\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1698,21 +1714,21 @@ "súborov\n" " podľa toho ako sú na serveri\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response vytlaÄiÅ¥ odpoveÄ servera\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider nesÅ¥ahovaÅ¥ niÄ\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1720,7 +1736,7 @@ " --dns-servers=ADRESY zoznam DNS serverov, na ktoré posielaÅ¥ " "požiadavky (oddelené Äiarkou)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1728,28 +1744,28 @@ " --bind-dns-address=ADRESA zviazaÅ¥ DNS resolver s ADRESOU (názov " "hostiteľa alebo IP) na miestnom hostiteľovi\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDY poÄkaÅ¥ SEKUNDY medzi sÅ¥ahovaniami\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1757,7 +1773,7 @@ " --waitretry=SEKÚND poÄkaÅ¥ 1..SEKÚND medzi pokusmi o " "sÅ¥ahovanie\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1766,16 +1782,16 @@ "sekúnd medzi\n" " sÅ¥ahovaniami\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy explicitne vypnúť proxy\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ÄŒÃSLO nastaviÅ¥ limit sÅ¥ahovania na ÄŒÃSLO\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1783,18 +1799,18 @@ " --bind-address=ADRESA zviazaÅ¥ s ADRESOU (názov hostiteľa alebo " "IP) na miestnom hostiteľovi\n" -#: src/main.c:709 +#: src/main.c:710 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:711 +#: src/main.c:712 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:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1802,7 +1818,7 @@ " --restrict-file-names=OS obmedziÅ¥ znaky v názvoch súborov na tie, " "ktoré povoľuje OS\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1810,15 +1826,15 @@ " --ignore-case ignorovaÅ¥ veľkosÅ¥ písmen pri porovnávaní " "súborov/adresárov\n" -#: src/main.c:718 +#: src/main.c:719 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:720 +#: src/main.c:721 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:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1828,23 +1844,23 @@ "rodiny,\n" " jedno z IPv6, IPv4 alebo none\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password pýtaÅ¥ sa na heslá\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1862,28 +1878,28 @@ "prostredia \n" " WGET_ASKPASS alebo SSH_ASKPASS.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri vypnúť podporu IRI\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink odstrániÅ¥ súbor pred Äistením\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1891,7 +1907,7 @@ " --keep-badhash ponechaÅ¥ súbory s nesúhlasiacim " "kontrolným súÄtom (pridaÅ¥ .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1899,7 +1915,7 @@ " --metalink-index=ÄŒÃSLO Poradové ÄŒÃSLO metaurl Metalink " "application/metalink4+xml\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1907,7 +1923,7 @@ " --metalink-over-http použiÅ¥ metadáta Metalink z hlaviÄiek " "odpovede HTTP\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1915,40 +1931,41 @@ " --preferred-location uprednostňované umiestnenie pre zdroje " "Metalink\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr vypnúť ukladanie metaúdajov v rozšírených " "príznakoch súborov\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Adresáre:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories nevytváraÅ¥ adresáre\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories vynútiÅ¥ vytváranie adresárov\n" -#: src/main.c:767 +#: src/main.c:768 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:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories použiÅ¥ názov protokolu v adresároch\n" -#: src/main.c:771 +#: src/main.c:772 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:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1956,26 +1973,26 @@ " --cur-dirs=POÄŒET ignorovaÅ¥ POÄŒET vzdialených Äastí názvu " "adresára\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP voľby:\n" -#: src/main.c:779 +#: src/main.c:780 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:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=HESLO nastaviÅ¥ http heslo na HESLO\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache nepovoliÅ¥ doÄasne uložené dáta na " "serveri\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1984,7 +2001,7 @@ "(Å¡tandardne\n" " je to `index.html'.)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1992,42 +2009,43 @@ " -E, --html-extension uložiÅ¥ HTML/CSS dokumenty so správnou " "príponou\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignorovaÅ¥ pole 'Content-Length' v " "hlaviÄke\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=REŤAZEC vložiÅ¥ REŤAZEC do hlaviÄky\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TYP zvoliÅ¥ typ zobrazenia postupu\n" +msgstr "" +" --compression=TYP vybraÅ¥ kompresiu spomedzi auto, gzip " +"alebo none. (predvolené: none)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximum povolených presmerovaní na " "stránku\n" -#: src/main.c:800 +#: src/main.c:801 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:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=HESLO nastaviÅ¥ HESLO ako heslo proxy\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2035,11 +2053,11 @@ " --referer=URL zahrnúť hlaviÄku 'Referer: URL' do HTTP " "požiadavky\n" -#: src/main.c:806 +#: src/main.c:807 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:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2047,7 +2065,7 @@ " -U, --user-agent=AGENT identifikovaÅ¥ sa ako AGENT namiesto Wget/" "VERZIA\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2055,22 +2073,22 @@ " --no-http-keep-alive zakázaÅ¥ HTTP keep-alive (trvalé " "spojenia)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies nepoužívaÅ¥ koláÄiky\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2078,7 +2096,7 @@ " --keep-session-cookies naÄítaÅ¥ a uložiÅ¥ koláÄiky sedenia (nie " "trvalé)\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2086,21 +2104,21 @@ " --post-data=REŤAZEC použiÅ¥ POST metódu; poslaÅ¥ REŤAZEC ako " "dáta\n" -#: src/main.c:822 +#: src/main.c:823 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:824 +#: src/main.c:825 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:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2108,7 +2126,7 @@ " --body-data=REŤAZEC poslaÅ¥ REŤAZEC ako dáta. --method MUSà " "byÅ¥ nastavené\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2116,7 +2134,7 @@ " --body-file=SÚBOR poslaÅ¥ obsah SÚBORu. --method MUSà byÅ¥ " "nastavené\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2127,7 +2145,7 @@ " voľbe miestnych názvov súborov\n" " (EXPERIMENTÃLNE)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2135,7 +2153,7 @@ " --content-on-error vypisovaÅ¥ prijatý obsah pri chybách " "servera\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2147,12 +2165,11 @@ " HTTP bez poÄiatoÄného Äakania na výzvu " "servera\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Voľby HTTPS (SSL/TLS):\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" @@ -2160,42 +2177,43 @@ msgstr "" " --secure-protocol=PR vybraÅ¥ bezpeÄný protokol, jeden z auto, " "SSLv2,\n" -" SSLv3, TLSv1 alebo PFS\n" +" SSLv3, TLSv1, TLSv1_1, TLSv1_2 alebo " +"PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --htttps-only nasledovaÅ¥ len bezpeÄné HTTPS odkazy\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate neoverovaÅ¥ certifikát servera\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=SÚBOR súbor certifikátu klienta\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=SÚBOR súbor súkromného kľúÄa\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 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:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2203,11 +2221,11 @@ " --ca-directory=ADR adresár, kde je uložený haÅ¡ovaný zoznam " "CA\n" -#: src/main.c:863 +#: src/main.c:864 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:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2224,7 +2242,7 @@ "ktorých sa bude\n" " overovaÅ¥ protistrana\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2232,7 +2250,7 @@ " --random-file=SÚBOR súbor s náhodnými dátami, pre spustenie " "SSL PRNG\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2240,7 +2258,7 @@ " --egd-file=SÚBOR súbor s pomenovaním EGD soketu s " "náhodnými dátami\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2249,16 +2267,22 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=REŤ Priamo nastaviÅ¥ reÅ¥azec priority (GnuTLS) " +"alebo zoznamu Å¡ifier (OpenSSL).\n" +" Používajte opatrne. Táto voľba prekrýva --" +"secure-protocol.\n" +" Formát a syntax tohto reÅ¥azca závisí od " +"prísluÅ¡nej SSL/TLS implementácie.\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "HSTS voľby:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts zakázaÅ¥ HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2266,11 +2290,11 @@ " --hsts-file cesta k databáze HSTS (nahradí " "predvolenú)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP voľby:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2278,37 +2302,37 @@ " --ftp-stmlf použiÅ¥ formát Stream_LF pre vÅ¡etky " "binárne súbory FTP\n" -#: src/main.c:901 +#: src/main.c:902 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:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=HESLO nastaviÅ¥ ftp heslo na HESLO\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing neodstraňovaÅ¥ súbory '.listing'\n" -#: src/main.c:907 +#: src/main.c:908 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:909 +#: src/main.c:910 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:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions zachovaÅ¥ vzdialené prístupové práva " "súborov\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2316,11 +2340,11 @@ " --retr-symlinks pri rekurzii získaÅ¥ odkazované súbory " "(nie adresáre)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTPS voľby:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2328,7 +2352,7 @@ " --ftps-implicit použiÅ¥ implicitné FTPS (Å¡tandardný " "port je 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2338,7 +2362,7 @@ "pokraÄovaÅ¥ v SSL/TLS sedení zaÄatom\n" " riadiacim spojením\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2346,7 +2370,7 @@ " --ftps-clear-data-connection Å¡ifrovaÅ¥ len riadiace spojenie; " "vÅ¡etky dáta budú neÅ¡ifrované\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2354,11 +2378,11 @@ " --ftps-fallback-to-ftp vrátiÅ¥ sa k FTP ak FTPS nie je " "podporované na cieľovom serveri\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC voľby:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2366,24 +2390,24 @@ " --warc-file=NÃZOVSÚBORU uložiÅ¥ údaje o požiadavkách/odpovediach " "do súboru .warc.gz\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx zapísaÅ¥ indexové súbory CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2391,17 +2415,17 @@ " --warc-dedup=NÃZOVSÚBORU neukladaÅ¥ záznamy uvedené v tomto CDX " "súbore\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests nepoÄítaÅ¥ kontrolné súÄty SHA1\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2409,7 +2433,7 @@ " --no-warc-keep-log neukladaÅ¥ súbor so záznamom do WARC " "záznamu\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2419,15 +2443,15 @@ "vytvorených\n" " WARC zapisovaÄom\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekurzívne sÅ¥ahovanie:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive nastaviÅ¥ rekurzívne sÅ¥ahovanie\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2435,7 +2459,7 @@ " -l, --level=ÄŒÃSLO maximálna hĺbka rekurzie (inf alebo 0 pre " "nekoneÄno)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2443,7 +2467,7 @@ " --delete-after odstrániÅ¥ miestne súbory po ich " "stiahnutí\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2453,7 +2477,7 @@ "tak,\n" " aby ukazovaly na miestne súbory\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2461,7 +2485,7 @@ " --convert-file-only previesÅ¥ len súborovú ÄasÅ¥ URL (väÄÅ¡inou " "nazývané aj basename)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2469,7 +2493,7 @@ " --backups=N pred zapísaním súboru X, zachovaÅ¥ až N " "záložných súborov\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2477,7 +2501,7 @@ " -K, --backup-converted pred konverziou súboru X ho zazálohovaÅ¥ " "ako X_orig\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2485,7 +2509,7 @@ " -K, --backup-converted pred konverziou súboru X ho zazálohovaÅ¥ " "ako X.orig\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2493,7 +2517,7 @@ " -m, --mirror skratka pre -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2501,7 +2525,7 @@ " -p, --page-requisites získaÅ¥ vÅ¡etky obrázky, atÄ. potrebné pre " "zobrazenie HTML stránky\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2509,11 +2533,11 @@ " --strict-comments zapnúť striktné (SGML) spracovávanie HTML " "komentárov\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Rekurzívne akceptovanie/odmietnutie:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2521,7 +2545,7 @@ " -A, --accept=ZOZNAM Äiarkou oddelený zoznam akceptovaných " "prípon\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2529,45 +2553,45 @@ " -R, --reject=ZOZNAM Äiarkou oddelený zoznam odmietnutých " "prípon\n" -#: src/main.c:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYP typ regulárneho výrazu (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYP typ regulárneho výrazu (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp nasledovaÅ¥ FTP odkazy z HTML dokumentov\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2575,7 +2599,7 @@ " --follow-tags=ZOZNAM Äiarkou oddelený zoznam nasledovaných " "HTML znaÄiek\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2583,21 +2607,21 @@ " --ignore-tags=ZOZNAM Äiarkou oddelený zoznam ignorovaných HTML " "znaÄiek\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative nasledovaÅ¥ len relatívne odkazy\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=ZOZNAM zoznam povolených adresárov\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2607,94 +2631,95 @@ "komponentom\n" " URL presmerovania\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=ZOZNAM zoznam vynechaných adresárov\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" msgstr "" -"Správy o chybách a návrhy na vylepÅ¡enie zasielajte na adresu\n" +"Správy o chybách, otázky a diskusiu môžete zasielaÅ¥ na adresu\n" " (iba anglicky); komentáre k slovenskému\n" "prekladu zasielajte na adresu \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"a/alebo nahlásiÅ¥ chyby na https://savannah.gnu.org/bugs/?" +"func=additem&group=wget.\n" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Heslo pre používateľa %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Heslo: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Nepodarilo sa vytvoriÅ¥ dátovod\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Meno používateľa pre '%s%s: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Heslo pre '%s%s@%s': " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Národné prostredie: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Kompilácia: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Odkaz: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2703,29 +2728,29 @@ "GNU Wget %s zostavený na %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (prostredie)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (používateľ)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2739,7 +2764,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2747,7 +2772,7 @@ "\n" "Pôvodným autorom tohoto programu je Hrvoje NikÅ¡ić \n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "" "Hlásenia o chybách a otázky zasielajte, prosím, na adresu\n" @@ -2755,34 +2780,34 @@ "Komentáre k slovenskému prekladu zasielajte na adresu .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Problém s alokovaním pamäte\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Koniec z dôvodu chyby v %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Príkaz `%s --help' vypíše viac volieb.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: neprípustná voľba -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2791,7 +2816,7 @@ "Oboje --no-clobber a --convert-links bolo zadané. Použije sa len --convert-" "links.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2800,22 +2825,22 @@ "Oboje --no-clobber a --convert-file-only bolo zadané. Použije sa len --" "convert-links.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2827,7 +2852,7 @@ "s -p alebo -r. Podrobnosti nájdete v návode.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2836,7 +2861,7 @@ "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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2846,14 +2871,14 @@ "O.\n" "Podrobnosti nájdete v návode.\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2862,21 +2887,21 @@ "znaÄkame\n" "bude deaktivované.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC výstup nefunguje so --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -" WARC výstup nefunguje s --continue alebo --start-pos, tieto budú " +"WARC výstup nefunguje s --continue alebo --start-pos, tieto budú " "deaktivované.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2884,21 +2909,21 @@ "Kontrolné súÄty nie sú povolené; WARC deduplikácia nenájde duplikátne " "záznamy.\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -" WARC výstup nefunguje s --continue alebo --start-pos, tieto budú " +"Komprimovanie nefunguje s --continue alebo --start-pos, tieto budú " "deaktivované.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2907,17 +2932,17 @@ "Zadanie --start-pos aj --continue je neodporúÄané; --continue bude " "deaktivované.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: chýba URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2926,7 +2951,7 @@ "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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2935,17 +2960,17 @@ "Metódu, ktorá sa má použiÅ¥ s --body-data alebo --body-file, musíte zadaÅ¥ " "pomocou --method=HTTPmetóda.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Táto verzia nemá podporu pre IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2953,7 +2978,7 @@ "-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:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2962,42 +2987,42 @@ "--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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Zlyhala inicializácia libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Zlyhala inicializácia kanála c-ares\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Zlyhala analýza IP adresy '%s'\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Zlyhalo nastavenie DNS server(ov) '%s' (%d)\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "V %s neboli nájdené URL.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Nepodarilo sa analyzovaÅ¥ metalink súbor %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3008,7 +3033,7 @@ "Celkový Äas: %s\n" "Stiahnutých: %d súborov, %s za %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Limit objemu stiahnutych dát %s PREKROÄŒENÃ!\n" @@ -3174,7 +3199,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "PokraÄovanie v behu na pozadí, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Výstup bude zapísaný do %s.\n" @@ -3220,64 +3245,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: volanie `stat %s' skonÄilo s chybou: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "UPOZORNENIE: používané slabé spúšťacie zrnko pre náhodné Äísla.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "VaÅ¡a verzia OpenSSL je príliÅ¡ stará, aby podporovala TLSv1.1\n" +msgstr "VaÅ¡a verzia OpenSSL je príliÅ¡ stará, aby podporovala TLS 1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: neimplementovaná hodnota %d voľby 'secure-protocol'\n" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: Neplatné URL %s: %s\n" +msgstr "OpenSSL: Neplatný zoznam Å¡ifier: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "Nepodarilo sa inicializovaÅ¥ PRNG; zvážte použitie --random-file.\n" +msgstr "" +"UPOZORNENIE: Nepodarilo sa inicializovaÅ¥ PRNG. Zvážte použitie --random-" +"file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Nie je možné miestne overiÅ¥ autoritu vydavateľa.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Vyskytol sa certifikát podpísaný samým sebou.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Vydaný certifikát je eÅ¡te neplatný.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Vydanému certifikátu vyprÅ¡ala platnosÅ¥.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3286,7 +3311,7 @@ "%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:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3294,7 +3319,7 @@ " %s: bežný názov %s v certifikáte sa nezhoduje s požadovaným názvom " "hostiteľa %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3305,7 +3330,7 @@ " 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:1042 +#: src/openssl.c:1046 #, 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" @@ -3354,22 +3379,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "NaÄítava sa robots.txt. Chybové hlásenia ignorujte, prosím.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Chyba pri analýze proxy URL %s: %s\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "PrekroÄený limit %d presmerovaní.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3377,7 +3402,7 @@ "Nemá to zmysel.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3452,99 +3477,111 @@ msgid "HTTPS support not compiled in" msgstr "Podpora pre HTTPS nie je zakompilovaná" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "Vyskytla sa nekompletná alebo neplatná viacbajtová postupnosÅ¥\n" +msgstr "Vyskytla sa neprevoditeľná viacbajtová postupnosÅ¥\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "PokraÄovanie v behu na pozadí, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nebolo možné odstrániÅ¥ symbolický odkaz %s: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Zlyhala inicializácia libcares\n" +msgstr "Zlyhalo otvorenie súboru %s pomocou Fopen\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Nastavenie prístupových práv pre %s zlyhalo.\n" +msgstr "Zlyhalo získanie FD súboru %s.\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Nastavenie prístupových práv pre %s zlyhalo.\n" +msgstr "" +"Zlyhalo získanie informácií o súbore %s pomocou stat, (kontrola oprávnenia)\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Súbor %s sa zmenil od poslednej kontroly. Kontrola bezpeÄnosti zlyhala." -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Zlyhala analýza IP adresy '%s'\n" +msgstr "Zlyhalo otvorenie súboru %s z dôvodu: %s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Nastavenie prístupových práv pre %s zlyhalo.\n" +msgstr "Zlyhalo získanie informácií o súbore %s pomocou stat s chybou: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"Skúša sa otvoriÅ¥ súbor %s, ale sa zmenil od poslednej kontroly. BezpeÄnostná " +"kontrola zlyhala." -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Neplatný regulárny výraz %s, chyba PCRE2 %d\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Neplatný regulárny výraz %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Chyba pri hľadaní zhody %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "Preskakuje sa kÄ¾ÃºÄ s nesprávnou veľkosÅ¥ou (%d/%d): %s\n" + +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Chyba pri duplikovaní súborového popisovaÄa súboru WARC.\n" -#: src/warc.c:223 +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Chyba pri otváraní prúdu GZIP do súboru WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Chyba pri zápise warcinfo záznamu do súboru WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3553,24 +3590,24 @@ "Otváranie súboru WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Chyba pri otváraní súboru WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Súbor CDX neobsahuje pôvodné url. (Chýba stlpec 'a'.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Súbor CDX neobsahuje kontrolné súÄty. (Chýba stlpec 'k'.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "Súbor CDX neobsahuje identifikátory záznamov. (Chýba stlpec 'u'.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3582,32 +3619,32 @@ msgstr[1] "NaÄítaný %d záznam z CDX.\n" msgstr[2] "NaÄítané %d záznamy z CDX.\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Nepodarilo sa preÄítaÅ¥ súbor CDX %s na vylúÄenie duplicít.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Nepodarilo sa otvoriÅ¥ doÄasný súbor manifestu WARC.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Nepodarilo sa otvoriÅ¥ doÄasný súbor so záznamom WARC.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Nepodarilo sa otvoriÅ¥ súbor WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Nepodarilo sa otvoriÅ¥ súbor CDX ako výstup.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Nepodarilo sa otvoriÅ¥ doÄasný súbor WARC.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "NaÅ¡la sa presná zhoda v súbore CDX. Ukladá sa záznam opätovného navÅ¡tívenia " Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/sl.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/sl.gmo differ diff -Nru wget-1.19.5/po/sl.po wget-1.20.1/po/sl.po --- wget-1.19.5/po/sl.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/sl.po 2018-12-26 20:10:50.000000000 +0000 @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: wget 1.12-pre7\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2010-11-17 20:05+0100\n" "Last-Translator: Andrej ®nidar¹iè \n" "Language-Team: Slovenian \n" @@ -256,17 +256,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -331,7 +331,7 @@ msgid "failed: %s.\n" msgstr "spodletelo: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: ni bilo mogoèe razre¹iti naslova gostitelja %s\n" @@ -455,12 +455,12 @@ msgid "Length: %s" msgstr "Dol¾ina: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) preostalo" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s preostalo" @@ -626,7 +626,7 @@ "Ni take datoteke ali mape %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s je zaèela obstajati.\n" @@ -649,17 +649,17 @@ msgid "Data transfer aborted.\n" msgstr "Prenos podatkov prekinjen.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Datoteka %s je ¾e tam; prejem preskoèen.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(posk:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -668,7 +668,7 @@ "%s (%s) - zapisan v stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -677,8 +677,8 @@ "%s (%s) - %s shranjeno [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Odstranjevanje %s.\n" @@ -776,160 +776,174 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Zavraèanje %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Zavraèanje %s.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "Ni padanja k %s, ker je izvzeto/ni vkljuèeno.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Napaka med ujemanjem %s z %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ni ujemanj za vzorec %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Zapisan indeks kot HTML v %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Zapisan indeks kot HTML v %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "NAPAKA: Ni bilo mogoèe odpreti mape %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, 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:169 +#: src/gnutls.c:174 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Napaka med razèlenjevanjem potrdila: %s\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 #, 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:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "NAPAKA" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "OPOZORILO" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s ni podal potrdila.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Potrdilo od %s ni zaupanja vredno.\n" -#: src/gnutls.c:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Potrdilo %s nima znanega izdajatelja.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Potrdilo od %s je bilo preklicano.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Potrdilo od %s je bilo preklicano.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Napaka med nastavljanjem zaèetnih vrednosti potrdila X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Ni bilo najdenih potrdil\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Napaka med razèlenjevanjem potrdila: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Potrdilo ¹e ni bilo omogoèeno\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Potrdilo je poteklo\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -969,11 +983,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Napaka med pisanjem zahteve HTTP: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Ni glav, privzema se HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -982,133 +996,133 @@ "Datoteka %s je ¾e tam; prejemanje preskoèeno.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "Datoteka s podatki POST, %s, manjka: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Ponovna uporaba povezave z %s:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Ponovna uporaba povezave z %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Napaka med branjem odgovora posredni¹kega stre¾nika: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s NAPAKA %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Izmalièena vrstica stanja" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tuneliranje posredni¹kega stre¾nika je spodletelo: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Neznata metoda overitve.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Neznata metoda overitve.\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Shranjevanje v: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Onemogoèanje SSL zaradi opa¾enih napak.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s zahteva poslana, èakanje na odgovor ... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Brez sprejetih podatkov.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Napaka med branjem glav (%s).\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(brez opisa)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Polo¾aj: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "nedoloèeno" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [spremljanje]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1116,7 +1130,7 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1126,82 +1140,82 @@ " Datoteka je ¾e popolnoma prene¹ena; niè ni za storiti.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Dol¾ina: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "prezrto" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Opozorilo: HTTP ne podpira nadomestnih znakov.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4415 +#: src/http.c:4421 #, fuzzy msgid "Cannot write to temporary WARC file.\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Povezave SSL ni bilo moè vzpostaviti.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "NAPAKA: Preusmeritev (%d) brez nove lokacije.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Oddaljena datoteka ne obstaja -- pokvarjena povezava!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Glava ,Last-Modified` manjka - izklapljanje èasovnega ¾iga.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Neveljavna glava `Last-Modified' -- prezrtje èasovnega ¾iga.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1211,16 +1225,16 @@ "preskoèeno.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Oddaljena datoteka je novej¹a, pridobivanje.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1230,7 +1244,7 @@ "pridobivanje.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1239,7 +1253,7 @@ "preskoèeno.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1249,7 +1263,7 @@ "povezave, vendar je rekurzija onemogoèena -- prejemanje preskoèeno.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1257,12 +1271,12 @@ "Oddaljena datoteka obstaja.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1271,7 +1285,7 @@ "%s (%s) - zapisano v stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1280,58 +1294,58 @@ "%s (%s) - %s shranjeno [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Povezava zaprta na bajtu %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Napaka med branjem na bajtu %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepodprta shema %s" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ni mogoèe prebrati %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Napaka v %s v vrstici %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1339,7 +1353,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1347,77 +1361,77 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Neveljaven --execute command %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Neveljavno ¹tevilo %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Neveljavna vrednost bajta %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Neveljavni èasovni razpon %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Neveljavna vrednost %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Neveljavne glave %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Neveljavne glave %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Neveljavna vrsta stanja napredka %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1431,16 +1445,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Kodiranje %s ni veljavno\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Zaznana je bila nepopolna ali neveljavna veèbajtna sekvenca\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Neobravnavana errno %d\n" @@ -1473,12 +1487,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; onemogoèanje bele¾enja.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uporaba: %s [IZBIRA]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1486,81 +1500,81 @@ "Obvezni argumenti za dolge izbire so obvezni tudi za kratke izbire.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Zagon:\n" -#: src/main.c:596 +#: src/main.c:597 #, 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:598 +#: src/main.c:599 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help izpi¹i pomoè.\n" -#: src/main.c:600 +#: src/main.c:601 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background po zagonu pojdi v ozadje.\n" -#: src/main.c:602 +#: src/main.c:603 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=UKAZ izvedi ukaz v slogu ,.wgetrc`.\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Bele¾enje in vhodna datoteka:\n" -#: src/main.c:608 +#: src/main.c:609 #, 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:610 +#: src/main.c:611 #, 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:613 +#: src/main.c:614 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug izpi¹i veliko razhro¹èevalnih podrobnosti.\n" -#: src/main.c:617 +#: src/main.c:618 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug izpi¹i razhro¹èevalni izhod za Watt-32.\n" -#: src/main.c:620 +#: src/main.c:621 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet ti¹ina (brez izpisa).\n" -#: src/main.c:622 +#: src/main.c:623 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose vkljuèi polni izpis (privzeto).\n" -#: src/main.c:624 +#: src/main.c:625 #, 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:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " @@ -1569,7 +1583,7 @@ " -i, --input-file=DAT. prejmi povezave najdene v krajevni ali zunanji " "DATOTEKI.\n" -#: src/main.c:631 +#: src/main.c:632 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1578,12 +1592,12 @@ " -i, --input-file=DAT. prejmi povezave najdene v krajevni ali zunanji " "DATOTEKI.\n" -#: src/main.c:634 +#: src/main.c:635 #, 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:636 +#: src/main.c:637 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1592,26 +1606,26 @@ " -B, --base=URL Razre¹i povezave HTML input-file (-i -F)\n" " relativno na URL-je.\n" -#: src/main.c:639 +#: src/main.c:640 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --no-cookies ne uporabljaj pi¹kotkov.\n" -#: src/main.c:641 +#: src/main.c:642 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies ne uporabljaj pi¹kotkov.\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Prejemanje:\n" -#: src/main.c:649 +#: src/main.c:650 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1619,7 +1633,7 @@ msgstr "" " -t, --tries=©TEVILO nastavi ©TEVILO poskusov (0 za neskonèno).\n" -#: src/main.c:651 +#: src/main.c:652 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" @@ -1627,7 +1641,7 @@ " --retry-connrefused znova poskusi, tudi èe je povezava " "zavrnjena.\n" -#: src/main.c:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1636,12 +1650,12 @@ " --ignore-tags=SEZNAM z vejico loèen seznam prezrtih znaèk " "HTML.\n" -#: src/main.c:655 +#: src/main.c:656 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=DAT. zapisuj dokumente v DATOTEKO.\n" -#: src/main.c:657 +#: src/main.c:658 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1650,14 +1664,14 @@ " -nc, --no-clobber preskoèi prejemanja, ki bi se prepisala\n" " obstojeèe datoteke.\n" -#: src/main.c:660 +#: src/main.c:661 #, 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:662 +#: src/main.c:663 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " @@ -1666,25 +1680,25 @@ " -c, --continue nadaljuj z prejemanjem delno prejete " "datoteke.\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=VRSTA doloèi slog prikaza prejemanja.\n" -#: src/main.c:668 +#: src/main.c:669 #, 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:670 +#: src/main.c:671 #, fuzzy msgid "" " -N, --timestamping don't re-retrieve files unless newer " @@ -1694,14 +1708,14 @@ " -N, --timestamping ne prejmi znova datotek , ki so\n" " starej¹e od krajevnih.\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1711,29 +1725,29 @@ "datotek\n" " glede na èasovne ¾ige na stre¾niku.\n" -#: src/main.c:679 +#: src/main.c:680 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response izpi¹i odziv stre¾nika.\n" -#: src/main.c:681 +#: src/main.c:682 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider ne prejmi nièesar.\n" -#: src/main.c:683 +#: src/main.c:684 #, 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1742,32 +1756,32 @@ " --bind-address=NASLOV pove¾i se z NASLOVOM (ime ali IP) na \n" " krajevnem gostitelju.\n" -#: src/main.c:691 +#: src/main.c:692 #, 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:693 +#: src/main.c:694 #, 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:695 +#: src/main.c:696 #, 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:697 +#: src/main.c:698 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDE poèakaj SEKUND med prejemi.\n" -#: src/main.c:699 +#: src/main.c:700 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1777,7 +1791,7 @@ "poskusi\n" " prejemanja.\n" -#: src/main.c:701 +#: src/main.c:702 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1786,19 +1800,19 @@ " --random-wait èakaj od 0.5*ÈAKAJ...1.5*ÈAKAJ sekund med " "prejemi.\n" -#: src/main.c:703 +#: src/main.c:704 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy posebej izkljuèi posredni¹ki stre¾nik.\n" -#: src/main.c:705 +#: src/main.c:706 #, 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:707 +#: src/main.c:708 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1807,19 +1821,19 @@ " --bind-address=NASLOV pove¾i se z NASLOVOM (ime ali IP) na \n" " krajevnem gostitelju.\n" -#: src/main.c:709 +#: src/main.c:710 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=HITROST omeji hitrost prejemanja na HITROST.\n" -#: src/main.c:711 +#: src/main.c:712 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache onemogoèi predpomnjenje poizvedb DNS.\n" -#: src/main.c:713 +#: src/main.c:714 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1830,7 +1844,7 @@ " so dovoljeni v OS.\n" "\n" -#: src/main.c:715 +#: src/main.c:716 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1839,17 +1853,17 @@ " --ignore-case ne upo¹tevaj velikosti èrk med\n" " ujemanjem datotek/map\n" -#: src/main.c:718 +#: src/main.c:719 #, 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:720 +#: src/main.c:721 #, 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:722 +#: src/main.c:723 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1860,25 +1874,25 @@ "dru¾ine,\n" " lahko je IPv6, IPv4, ali none.\n" -#: src/main.c:726 +#: src/main.c:727 #, 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:728 +#: src/main.c:729 #, 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:730 +#: src/main.c:731 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --ask-password vpra¹aj za gesla.\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1889,12 +1903,12 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri izklopi podpor IRI.\n" -#: src/main.c:739 +#: src/main.c:740 #, fuzzy msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" @@ -1902,7 +1916,7 @@ " --local-encoding=KOD. uporabi KODIRANJE kot krajevno kodiranje " "za IRIs.\n" -#: src/main.c:741 +#: src/main.c:742 #, fuzzy msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" @@ -1910,73 +1924,72 @@ " --remote-encoding=KOD. uporabi KODIRANJE kot privzeto oddaljeno " "kodiranje.\n" -#: src/main.c:743 +#: src/main.c:744 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr "" " --no-glob izkljuèi `globbing' imen datotek pri FTP.\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 -#, fuzzy +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" -msgstr " --no-iri izklopi podpor IRI.\n" +msgstr "" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Mape:\n" -#: src/main.c:763 +#: src/main.c:764 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories ne ustvari map.\n" -#: src/main.c:765 +#: src/main.c:766 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories vedno ustvari mape.\n" -#: src/main.c:767 +#: src/main.c:768 #, 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:769 +#: src/main.c:770 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories v mapah uporabi ime protokola.\n" -#: src/main.c:771 +#: src/main.c:772 #, fuzzy msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREDPONA shranij datoteke v PREDPONA/...\n" -#: src/main.c:773 +#: src/main.c:774 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -1985,27 +1998,27 @@ " --cut-dirs=©TEVILO prezri ©TEVILO sestavnih delov oddaljenih " "map.\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Mo¾nosti HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=UPORABNIK nastavi uporabnika HTTP na UPORABNIK.\n" -#: src/main.c:781 +#: src/main.c:782 #, 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:783 +#: src/main.c:784 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache onemogoèi predpomnjene podatke s stre¾nika.\n" -#: src/main.c:785 +#: src/main.c:786 #, fuzzy msgid "" " --default-page=NAME change the default page name (normally\n" @@ -2014,7 +2027,7 @@ " --default-page=NAME Spremeni privzeto ime strani (obièajno\n" " je to `index.html'.).\n" -#: src/main.c:788 +#: src/main.c:789 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -2023,46 +2036,45 @@ " -E, --adjust-extension shrani dokumente HTML/CSS s pravilnimi " "priponami.\n" -#: src/main.c:790 +#: src/main.c:791 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length Prezri glavo `Content-Length'.\n" -#: src/main.c:792 +#: src/main.c:793 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=NIZ vstavi NIZ med glave.\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=VRSTA doloèi slog prikaza prejemanja.\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect najveè dovoljenih preusmeritev na stran.\n" -#: src/main.c:800 +#: src/main.c:801 #, 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:802 +#: src/main.c:803 #, 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:804 +#: src/main.c:805 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2070,12 +2082,12 @@ msgstr "" " --referer=URL vkljuèi ,Referer: URL` v zahtevek HTTP.\n" -#: src/main.c:806 +#: src/main.c:807 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers shranjuj glave HTTP v datoteko.\n" -#: src/main.c:808 +#: src/main.c:809 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2084,7 +2096,7 @@ " -U, --user-agent=ODJEMNIK predstavi se kot ODJEMNIK namesto Wget/" "RAZLIÈICA.\n" -#: src/main.c:810 +#: src/main.c:811 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2092,23 +2104,23 @@ msgstr "" " --no-http-keep-alive onemogoèi stalne povezave HTTP (keep-alive).\n" -#: src/main.c:812 +#: src/main.c:813 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ne uporabljaj pi¹kotkov.\n" -#: src/main.c:814 +#: src/main.c:815 #, 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:816 +#: src/main.c:817 #, 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:818 +#: src/main.c:819 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " @@ -2116,7 +2128,7 @@ msgstr "" " --keep-session-cookies nalo¾i in shrani (zaèasne) pi¹kote seje.\n" -#: src/main.c:820 +#: src/main.c:821 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2124,7 +2136,7 @@ msgstr "" " --post-data=NIZ uporabi metodo POST; po¹lji NIZ kot podatke.\n" -#: src/main.c:822 +#: src/main.c:823 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2134,12 +2146,12 @@ "DATOTEKE.\n" "\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " @@ -2147,7 +2159,7 @@ msgstr "" " --post-data=NIZ uporabi metodo POST; po¹lji NIZ kot podatke.\n" -#: src/main.c:828 +#: src/main.c:829 #, fuzzy msgid "" " --body-file=FILE send contents of FILE. --method MUST be " @@ -2157,7 +2169,7 @@ "DATOTEKE.\n" "\n" -#: src/main.c:830 +#: src/main.c:831 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2168,13 +2180,13 @@ " --content-disposition upo¹tevaj glavo Content-Disposition, ko\n" " izbira¹ lokalna imena datotek (POSKUSNO).\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2186,11 +2198,11 @@ " brez èakanja na stre¾nikov\n" " poziv.\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Mo¾nosti HTTPS (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2200,59 +2212,59 @@ " --secure-protocol izberi varni protokol SSL; lahko je auto,\n" " SSLv2, SSLv3 ali TLSv1\n" -#: src/main.c:847 +#: src/main.c:848 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr "" " -L, --relative spremljaj samo relativne povezave.\n" -#: src/main.c:849 +#: src/main.c:850 #, 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:851 +#: src/main.c:852 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=DAT. DATOTEKA s potrdilom.\n" -#: src/main.c:853 +#: src/main.c:854 #, 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:855 +#: src/main.c:856 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=DAT. DATOTEKA z zasebnim kljuèem.\n" -#: src/main.c:857 +#: src/main.c:858 #, 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:859 +#: src/main.c:860 #, 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:861 +#: src/main.c:862 #, 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:863 +#: src/main.c:864 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=DAT. datoteka z zbirko CA-jev.\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2262,7 +2274,7 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2270,7 +2282,7 @@ msgstr "" " --random-file=DAT. DATOTEKA z nakljuènim semenom za SSL PRNG.\n" -#: src/main.c:875 +#: src/main.c:876 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " @@ -2278,7 +2290,7 @@ msgstr "" " --egd-file=DAT. ime datoteke vtièa EGD z nakljuènimi podatki.\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2288,28 +2300,28 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 #, fuzzy msgid "HSTS options:\n" msgstr "Mo¾nosti HTTP:\n" -#: src/main.c:888 +#: src/main.c:889 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr "" " --no-cache onemogoèi predpomnjene podatke s stre¾nika.\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Mo¾nosti FTP:\n" -#: src/main.c:898 +#: src/main.c:899 #, fuzzy msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " @@ -2318,29 +2330,29 @@ " --ftp-stmlf Uporabi obliko Stream_LF za vse binarne " "datoteke FTP.\n" -#: src/main.c:901 +#: src/main.c:902 #, 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:903 +#: src/main.c:904 #, 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:905 +#: src/main.c:906 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ne odstrani datotek ,.listing`.\n" -#: src/main.c:907 +#: src/main.c:908 #, 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:909 +#: src/main.c:910 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" @@ -2348,12 +2360,12 @@ " --no-passive-ftp ne uporabljaj \"pasivnega\" naèina " "prenosa.\n" -#: src/main.c:911 +#: src/main.c:912 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions ohrani oddaljena dovoljenja datotek.\n" -#: src/main.c:913 +#: src/main.c:914 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2362,82 +2374,82 @@ " --retr-symlinks pri rekurziji prejmi ciljne datoteke (ne " "map).\n" -#: src/main.c:918 +#: src/main.c:919 #, fuzzy msgid "FTPS options:\n" msgstr "Mo¾nosti FTP:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 #, fuzzy msgid "WARC options:\n" msgstr "Mo¾nosti FTP:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --header=NIZ vstavi NIZ med glave.\n" -#: src/main.c:937 +#: src/main.c:938 #, 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:939 +#: src/main.c:940 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider ne prejmi nièesar.\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-cookies ne uporabljaj pi¹kotkov.\n" -#: src/main.c:949 +#: src/main.c:950 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2446,23 +2458,23 @@ " --ignore-case ne upo¹tevaj velikosti èrk med\n" " ujemanjem datotek/map\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekurzivno prejemanje:\n" -#: src/main.c:958 +#: src/main.c:959 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive nastavi rekurzivno prejemanje.\n" -#: src/main.c:960 +#: src/main.c:961 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2471,7 +2483,7 @@ " -l, --level=©TEVILO najveèja dovoljena globina rekurzije (inf ali 0\n" " za neskonèno).\n" -#: src/main.c:962 +#: src/main.c:963 #, fuzzy msgid "" " --delete-after delete files locally after downloading " @@ -2479,7 +2491,7 @@ msgstr "" " --delete-after izbri¹i krajevne datoteke, ko so prejete.\n" -#: src/main.c:964 +#: src/main.c:965 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2489,19 +2501,19 @@ " -k, --convert-links povezave v prejetih datotekah HTML ali CSS naj\n" " ka¾ejo na krajevne datoteke.\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2510,7 +2522,7 @@ " -K, --backup-converted pred pretvorbo datoteke X, napravi varnostno " "kopijo kot X_orig.\n" -#: src/main.c:976 +#: src/main.c:977 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2519,7 +2531,7 @@ " -K, --backup-converted pred pretvorbo datoteke X ustvari varnostno \n" " kopijo kot X.orig.\n" -#: src/main.c:979 +#: src/main.c:980 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2527,7 +2539,7 @@ msgstr "" " -m, --mirror bli¾njica za -N -r -l inf --no-remove-listing.\n" -#: src/main.c:981 +#: src/main.c:982 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2537,7 +2549,7 @@ "spletne\n" " strani HTML.\n" -#: src/main.c:983 +#: src/main.c:984 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2547,11 +2559,11 @@ "HTML.\n" "\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Rekurzivno sprejemanje/zavraèanje:\n" -#: src/main.c:989 +#: src/main.c:990 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2560,7 +2572,7 @@ " -A, --accept=SEZNAM z vejico loèen seznam sprejemljivih " "pripon.\n" -#: src/main.c:991 +#: src/main.c:992 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2569,25 +2581,25 @@ " -R, --reject=SEZNAM z vejico loèen seznam zavrnjenih " "pripon.\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --progress=VRSTA doloèi slog prikaza prejemanja.\n" -#: src/main.c:1001 +#: src/main.c:1002 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --progress=VRSTA doloèi slog prikaza prejemanja.\n" -#: src/main.c:1004 +#: src/main.c:1005 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2595,21 +2607,21 @@ " -D, --domains=SEZNAM z vejico loèen seznam sprejemljivih " "domen.\n" -#: src/main.c:1006 +#: src/main.c:1007 #, 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:1008 +#: src/main.c:1009 #, fuzzy msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp sledi povezavam FTP iz dokumentov HTML.\n" -#: src/main.c:1010 +#: src/main.c:1011 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2618,7 +2630,7 @@ " --follow-tags=SEZNAM z vejico loèen seznam sledenim znaèkam " "HTML.\n" -#: src/main.c:1012 +#: src/main.c:1013 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2627,25 +2639,25 @@ " --ignore-tags=SEZNAM z vejico loèen seznam prezrtih znaèk " "HTML.\n" -#: src/main.c:1014 +#: src/main.c:1015 #, 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:1016 +#: src/main.c:1017 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative spremljaj samo relativne povezave.\n" -#: src/main.c:1018 +#: src/main.c:1019 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=SEZNAM seznam dovoljenih map.\n" -#: src/main.c:1020 +#: src/main.c:1021 #, fuzzy msgid "" " --trust-server-names use the name specified by the " @@ -2655,90 +2667,90 @@ " --trust-server-names uporabi ime doloèeno z zadnjo komponento " "preusmerjevalne povezavet.\n" -#: src/main.c:1023 +#: src/main.c:1024 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=SEZNAM seznam nedovoljenih map.\n" -#: src/main.c:1025 +#: src/main.c:1026 #, 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Po¹iljajte poroèila o hro¹èih in predloge na .\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Geslo za uporabnika %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Geslo: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Geslo za uporabnika %s: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Jazikovno doloèilo: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Compile: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Povezava: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2747,29 +2759,29 @@ "GNU Wget %s grajen na %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (uporabnik)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, 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:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2783,7 +2795,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2791,67 +2803,67 @@ "\n" "Izvorni avtor: Hrvoje Nik¹iæ .\n" -#: src/main.c:1337 +#: src/main.c:1338 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:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Poskusite `%s --help' za veè mo¾nosti.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nedovoljena mo¾nost -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2863,7 +2875,7 @@ "v kombinaciji s -p ali -r. Za podrobnosti si oglejte priroènik.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2874,7 +2886,7 @@ "vpisovala v eno samo datoteko, ki ste jo podali.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2885,138 +2897,138 @@ "oglejte priroènik.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: manjka URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Ta razlièica nima podpore za IRIs\n" -#: src/main.c:1999 +#: src/main.c:2006 #, 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:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Ni bilo mogoèe odstraniti simbolne povezave %s: %s\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, 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:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "V %s ni najdenega nobenega URL.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ni bilo mogoèe izbrisati %s: %s\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2257 +#: src/main.c:2264 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -3026,7 +3038,7 @@ "KONÈANO --%s--\n" "Prejeto: %d datotek, %s v %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Omejitev prejemanja %s je PREKORAÈENA!\n" @@ -3193,7 +3205,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Nadaljevanje v ozadju, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Izhod bo zapisan v %s.\n" @@ -3239,65 +3251,65 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: ni mogoèe napraviti stat na %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "OPOZORILO: uporabljate ¹ibko seme za nakljuèna ¹tevila.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: Neveljaven URL %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: 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:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Istovetnosti izdajatelja krajevno ni bilo mogoèe preveriti.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Zaznano je bilo samopodpisano potrdilo.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Izdano potrdilo ¹e ni veljavno.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Izdano potrdilo je ¾e poteklo.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3306,7 +3318,7 @@ "%s: ni ujemanj alternativnega imena potrdila\n" "\tzahtevano ime gostitelja %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3314,7 +3326,7 @@ " %s: obièajno ime potrdila %s se ne ujema z zahtevanim imenom gostitelja " "%s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3325,7 +3337,7 @@ " To je morda znamenje, da se gostitelj izdaja za drugega\n" " (to pomeni, da ni pravi %s).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3377,22 +3389,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Nalaganje robots.txt; prosim, prezrite napake.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, 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:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d preusmeritev je bilo prekoraèenih.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3400,7 +3412,7 @@ "Opu¹èanje.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3478,123 +3490,132 @@ msgid "HTTPS support not compiled in" msgstr "Podpora HTTPS ni vgrajena" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Zaznana je bila nepopolna ali neveljavna veèbajtna sekvenca\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Nadaljevanje v ozadju, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ni bilo mogoèe odstraniti simbolne povezave %s: %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Ni bilo mogoèe odstraniti simbolne povezave %s: %s\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Ni bilo mogoèe izbrisati %s: %s\n" +msgstr "" -#: src/utils.c:872 +#: src/utils.c:878 #, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Napaka med zapisovanjem v %s: %s\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, fuzzy, c-format msgid "Error opening WARC file %s.\n" msgstr "Napaka med razèlenjevanjem potrdila: %s\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3607,32 +3628,32 @@ msgstr[2] "" msgstr[3] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" @@ -3651,9 +3672,6 @@ #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: mo¾nost '-W %s' zahteva argument\n" -#~ msgid "File `%s' already there; not retrieving.\n" -#~ msgstr "Datoteka `%s' ¾e obstaja; prejemanje je preskoèeno.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Pooblastitev je spodletela.\n" @@ -3667,6 +3685,9 @@ #~ "\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" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/sr.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/sr.gmo differ diff -Nru wget-1.19.5/po/sr.po wget-1.20.1/po/sr.po --- wget-1.19.5/po/sr.po 2018-05-06 16:48:23.000000000 +0000 +++ wget-1.20.1/po/sr.po 2018-12-26 20:10:50.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: wget-1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2017-01-27 08:00+0200\n" "Last-Translator: МироÑлав Ðиколић \n" "Language-Team: Serbian <(nothing)>\n" @@ -231,17 +231,17 @@ msgid "Unmatched ) or \\)" msgstr "Ðе одговара ) или \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Ðема претходног регуларног израза" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "не могу да направим Ñпојку" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -305,7 +305,7 @@ msgid "failed: %s.\n" msgstr "неуÑпех: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: не могу да разрешим адреÑу домаћина „%s“\n" @@ -431,12 +431,12 @@ msgid "Length: %s" msgstr "Дужина: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) је проÑтало" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s је проÑтало" @@ -605,7 +605,7 @@ "Ðе поÑтоји таква датотека или директоријум „%s“.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "„%s“ је изникло у поÑтојање.\n" @@ -628,17 +628,17 @@ msgid "Data transfer aborted.\n" msgstr "ÐŸÑ€ÐµÐ½Ð¾Ñ Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ° је прекинут.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Датотека „%s“ већ поÑтоји; нећу је преузети.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(пробајте:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -647,7 +647,7 @@ "%s (%s) — запиÑано у Ñтандардни излаз %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -656,8 +656,8 @@ "%s (%s) — %s је Ñачувано [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Уклањам „%s“.\n" @@ -753,159 +753,174 @@ msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ðе Ñпуштам Ñе у „%s“ пошто је иÑкључен/занемарен.\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Одбијам „%s“.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Одбијам „%s“.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "Ðе Ñпуштам Ñе у „%s“ пошто је иÑкључен/занемарен.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Грешка упоређивања „%s“ Ñа „%s“: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ðема подударања Ñа шаблоном „%s“.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "ЗапиÑах ХТМЛ-изован Ð¸Ð½Ð´ÐµÐºÑ Ñƒ „%s“ [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "ЗапиÑах ХТМЛ-изован Ð¸Ð½Ð´ÐµÐºÑ Ñƒ „%s“.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ГРЕШКÐ: Ðе могу да отворим директоријум „%s“.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ГРЕШКÐ: ÐиÑам уÑпео да отворим уверење „%s“: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Учитао Ñам ЦРуверење „%s“\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ГРЕШКÐ: ÐиÑам уÑпео да учитам ЦРЛ датотеку „%s“: (%d)\n" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Учитао Ñам ЦРЛ датотеку „%s“\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "ГРЕШКÐ: ГнуТЛС захтева кључ и уверење да би био иÑте врÑте.\n" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Ваше издање ОпенССЛ-а је превише Ñтаро да подржи ТЛСи1.1\n" + +#: src/gnutls.c:676 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "ГнуТЛС: непримењена вредноÑÑ‚ %d опције „secure-protocol“\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "ИзвеÑтите о овом проблему на „bug-wget@gnu.org“\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "ГнуТЛС: непримењена вредноÑÑ‚ %d опције „secure-protocol“\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ГРЕШКÐ" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "УПОЗОРЕЊЕ" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s није приказао уверење.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Уверење од „%s“ није поуздано.\n" -#: src/gnutls.c:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: Уверење од „%s“ нема познатог издавача.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Уверење од „%s“ је опозвано.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: ПотпиÑник уверења за „%s“ није издавач уверења.\n" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Уверење „%s“ је потпиÑано неÑигурним алгоритмом.\n" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Уверење „%s“ још није покренуто.\n" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Уверење „%s“ је иÑтекло.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Грешка покретања уверења X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "ÐиÑам пронашао уверење\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Грешка анализирања уверења: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Уверење још увек није активирано\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Уверење је иÑтекло\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "ВлаÑник уверења не одговара називу домаћина „%s“\n" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "Јавни кључ не одговара прикаченом јавном кључу!\n" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Уверење мора бити X.509\n" @@ -945,11 +960,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "ÐиÑам уÑпео да запишем ХТТП захтев: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Ðема заглавља, подразумевам ХТТП/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -958,11 +973,11 @@ "Датотека „%s“ већ поÑтоји; нећу је преузети.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "„gmtime“ није уÑпео. Ово је вероватно грешка.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -970,55 +985,55 @@ "Ðе могу да претворим ознаку времена у хттп запиÑ. Пребацујем Ñе на време 0 " "као време поÑледње измене.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Датотека података „BODY“ „%s“ недоÑтаје: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Поново кориÑтим поÑтојећу везу Ñа [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Поново кориÑтим поÑтојећу везу Ñа %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "ÐиÑам уÑпео да прочитам одговор поÑредника: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ГРЕШКР%d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "ÐеиÑправна трака Ñтања" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "ÐеуÑпело тунелиÑање поÑредника: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Ðачин потврђивања идентитета није познат.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Изабрано је потврђивање идентитета: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Чувам у: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1027,22 +1042,22 @@ "Приликом преузимања потпиÑа:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Ðе могу да прочитам Ñадржај потпиÑа из привремене датотеке. ПреÑкачем.\n" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Ðе могу да направим привремену датотеку. ПреÑкачем преузимање потпиÑа.\n" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "ÐеиÑправна вредноÑÑ‚ при. Подразумевам „%d“.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1050,42 +1065,42 @@ "Ðе могу да нађем прихватљиви одабир за изворишта мета везе.\n" "Занемарујем их.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "ИÑкључујем ССЛ због грешака.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "„%s“ захтев је поÑлат, чекам одговор... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "ÐиÑу примљени никакви подаци.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Грешка читања (%s) у заглављима.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(нема опиÑа)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "МеÑто: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "није наведено" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [пратим]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1094,7 +1109,7 @@ "Датотека „%s“ није измењена на Ñерверу. ИзоÑтављам преузимање.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1105,7 +1120,7 @@ "Можда ћете желети да додате опцију „--no-if-modified-since“.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1115,58 +1130,58 @@ " Датотека је већ преузета у целини; неће бити поново преузета.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Дужина: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "занемарено" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Упозорење: џокер знаци Ñе не кориÑте за ХТТП.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Укључен је режим паука. Проверавам да ли поÑтоји удаљена датотека.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðе могу пиÑати у „%s“ (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Ðеопходан атрибут недоÑтаје у примљеном заглављу.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Ðије уÑпело потврђивање идентитета кориÑничког имена/лозинке.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Ðе могу да пишем у Ð’ÐРЦ датотеку.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Ðе могу да пишем у привремену Ð’ÐРЦ датотеку.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Ðе могу да уÑпоÑтавим ССЛ везу.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðе могу да поништим везу „%s“ (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ГРЕШКÐ: ПреуÑмерење (%d) нема одредиште.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1174,26 +1189,26 @@ "Ðе могу да пронађем податке мета везе у ХТТП одговору. Преузимам датотеку " "кориÑтећи „HTTP GET“.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Ðађох заглавља мета везе. Пребацујем на режим мета везе.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Удаљена датотека не поÑтоји -- оштећена веза!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Заглавље датума поÑледње измене недоÑтаје -- бележење времена је иÑкључено.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Заглавље датума поÑледње измене је неиÑправно -- бележење времена је " "занемарено.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1202,16 +1217,16 @@ "Датотека на Ñерверу није новија од локалне датотеке „%s“ -- не преузимам.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Величине Ñе не поклапају (локална %s) -- преузимам.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Удаљена датотека је новија, преузимам.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1220,7 +1235,7 @@ "Удаљена датотека поÑтоји и можда Ñадржи везе до других извора -- преузимам.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1228,7 +1243,7 @@ "Удаљена датотека поÑтоји али не Ñадржи ниједну везу -- не преузимам.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1238,7 +1253,7 @@ "али дубачење је иÑкључено -- не преузимам.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1246,12 +1261,12 @@ "Удаљена датотека поÑтоји.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s адреÑа: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1260,7 +1275,7 @@ "%s (%s) — запиÑано у Ñтандардни излаз %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1269,58 +1284,58 @@ "%s (%s) — %s је Ñачувано [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) — Веза је затворена при бајту %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) — Грешка читања при бајту %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) — Грешка читања при бајту %s/%s (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ðеподржан квалитет заштите „%s“.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ðеподржан алгоритам „%s“.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðе могу да прочитам %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Грешка у „%s“ у реду %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Садржајна грешка у „%s“ у реду %d.\n" -#: src/init.c:713 +#: src/init.c:706 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Ðепозната наредба „%s“ у „%s“ у реду %d.\n" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1332,7 +1347,7 @@ "„%s“,\n" "или наведите другачију датотеку кориÑтећи „--config“.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1343,47 +1358,47 @@ "„%s“,\n" "или наведите другачију датотеку кориÑтећи „--config“.\n" -#: src/init.c:783 +#: src/init.c:776 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Упозорење: И ÑиÑтемÑки и кориÑников вгетрц указују на „%s“.\n" -#: src/init.c:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: ÐеиÑправна наредба „--execute“ „%s“\n" -#: src/init.c:1043 +#: src/init.c:1037 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: ÐеиÑправна Булова вредноÑÑ‚ „%s“, кориÑтите „on“ или „off“.\n" -#: src/init.c:1076 +#: src/init.c:1070 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: ÐеиÑправно „%s“, кориÑтите „on“, „off“ или „quiet“.\n" -#: src/init.c:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: ÐеиÑправан број „%s“.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: „%s“ мора бити коришћено Ñамо једном\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: ÐеиÑправна вредноÑÑ‚ бајта „%s“\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: ÐеиÑправно временÑко раздобље „%s“\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1392,28 +1407,28 @@ "„use-askpass“ захтева да ниÑка или променљива окружења „WGET_ASKPASS“ или " "„SSH_ASKPASS“ буде подешена.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: ÐеиÑправна вредноÑÑ‚ „%s“.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: ÐеиÑправно заглавље „%s“.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: ÐеиÑправно Ð’ÐРЦ заглавље „%s“.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: ÐеиÑправна врÑта напредовања „%s“.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1427,16 +1442,16 @@ msgid "Encoding %s isn't valid\n" msgstr "„%s“ кодирање није иÑправно\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Ðепотпун или неиÑправан вишебајтни низ\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Ðемогућа грешка бр. %d\n" @@ -1469,12 +1484,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; иÑкључујем дневник.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Употреба: %s [ОПЦИЈÐ]... [ÐДРЕСÐ]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1482,74 +1497,74 @@ "Обавезни аргументи за дуге опције Ñу обавезни и за кратке опције такође.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Покретање:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version приказује издање програма и излази\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help приказује ову помоћ\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background одлази у позадину након покретања\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=ÐÐРЕДБРизвршава наредбу „.wgetrc“-Ñтила\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Пријављивање и улазна датотека:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" " -o, --output-file=ДÐТОТЕКРзапиÑује поруке дневника у ДÐТОТЕКУ\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=ДÐТОТЕКРкачи поруке у ДÐТОТЕКу\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d --debug иÑпиÑује доÑта података за уклањање " "грешака\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug иÑпиÑује „Watt-32“ излаз за уклањање " "грешака\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet нечујно (без излаза)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose опширан Ñа излазом (ово је оÑновно " "понашање)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose иÑкључује опширноÑÑ‚, а да није нечујан\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1557,7 +1572,7 @@ " --report-speed=ВРСТРиÑпиÑује пропуÑни опÑег као ВРСТУ. " "ВРСТРмогу бити битови\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1565,7 +1580,7 @@ " -i, --input-file=ДÐТОТЕКРпреузима адреÑе пронађене у меÑној или " "Ñпољној ДÐТОТЕЦИ\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1573,11 +1588,11 @@ " --input-metalink=ДÐТОТЕКРпреузима датотеке покривене у меÑној " "ДÐТОТЕЦИ мета везе\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html Ñматра улазну датотеку као ХТМЛ\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1586,29 +1601,29 @@ "F)\n" " које Ñе одноÑе на ÐДРЕСУ\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=ДÐТОТЕКРнаводи датотеку подешавања за " "коришћење\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" " --no-config не чита ниједну датотеку подешавања\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=ДÐТОТЕКРбележи разлоге одбијања адреÑе у " "ДÐТОТЕКУ\n" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Преузимање:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1616,14 +1631,14 @@ " -t, --tries=БРОЈ поÑтавља број покушаја на БРОЈ (0 за " "неограничено)\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused покушаће поново чак и када је веза " "одбијена\n" -#: src/main.c:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1632,11 +1647,11 @@ " --ignore-tags=СПИСÐК зарезом одвојени ÑпиÑак занемарених " "ХТМЛ ознака\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=ДÐТОТЕКРзапиÑује документе у ДÐТОТЕКУ\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1644,7 +1659,7 @@ " -nc, --no-clobber преÑкаче преузимања која би преузео у\n" " поÑтојеће датотеке (препиÑујући их)\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1652,7 +1667,7 @@ msgstr "" " --no-config не чита ниједну датотеку подешавања\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1660,7 +1675,7 @@ " -c, --continue наÑтавља Ñа добављањем делимично " "преузете датотеке\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1668,11 +1683,11 @@ " --start-pos=ПОМЕРÐЈ почиње преузимање од положаја ПОМЕРÐЈР" "нулте оÑнове\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=ВРСТРбира врÑту опÑега напредовања\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1680,7 +1695,7 @@ " --show-progress приказује траку напредовања у било ком " "режиму опширноÑти\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1690,7 +1705,7 @@ "ниÑу новије\n" " од меÑних\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1701,7 +1716,7 @@ " добавља захтеве у режиму временÑког " "означавања\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1710,21 +1725,21 @@ "датотеке\n" " оном на Ñерверу\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response иÑпиÑује одговор Ñервера\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider не преузима ништа\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=СЕКУÐДИ подешава Ñве вредноÑти временÑког " "иÑтека на СЕКУÐДЕ\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1732,7 +1747,7 @@ " --dns-servers=ÐДРЕСЕ ÑпиÑак ДÐС Ñервера за пропитивање " "(раздвојених зарезом)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1740,29 +1755,29 @@ " --bind-dns-address=ÐДРЕСРповезује ДÐС решавача Ñа ÐДРЕСОМ (назив " "домаћина или ИП) на локалном рачунару\n" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=СЕКУÐДИ подешава временÑки иÑтек ДÐС понављања " "на СЕКУÐДЕ\n" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=СЕКУÐДИ подешава временÑки иÑтек повезивања на " "СЕКУÐДЕ\n" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=СЕКУÐДИ подешава временÑки иÑтек читања на " "СЕКУÐДЕ\n" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=СЕКУÐДИ чека СЕКУÐДЕ између довлачења\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1770,7 +1785,7 @@ " --waitretry=СЕКУÐДЕ чека 1..СЕКУÐДЕ између покушаја " "довлачења\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1778,16 +1793,16 @@ " --random-wait чека од 0.5*ЧЕКÐЈ...1.5*ЧЕКÐЈ Ñекунде " "између довлачења\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy изричито иÑкључује поÑредника\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=БРОЈ поÑтавља квоту довлачења на БРОЈ\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1795,18 +1810,18 @@ " --bind-address=ÐДРЕСРповезује Ñе на ÐДРЕСУ (назив домаћина " "или ИП) на локалном рачунару\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=БРЗИÐРограничава проток преузимања на БРЗИÐУ\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache иÑкључује привремени Ñмештај ДÐС " "понављања\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1814,7 +1829,7 @@ " --restrict-file-names=ОС ограничава знаке у називима датотека на " "допуштене ОС-ом\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1822,15 +1837,15 @@ " --ignore-case занемарује величину Ñлова приликом " "упоређивања датотека/директоријума\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only повезује Ñе Ñамо на ИПв4 адреÑе\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only повезује Ñе Ñамо на ИПв6 адреÑе\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1840,24 +1855,24 @@ "породице,\n" " на ИПв6, ИПв4, или ништа\n" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=КОРИСÐИК поÑтавља и фтп и хттп кориÑника на " "КОРИСÐИКÐ\n" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=ЛОЗИÐКРпоÑтавља и фтп и хттп лозинку на " "ЛОЗИÐКУ\n" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password пита за лозинке\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1875,29 +1890,29 @@ "окружења \n" " „WGET_ASKPASS“ или „SSH_ASKPASS“.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri иÑкључује ИРИ подршку\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=КОДИРÐЊЕ кориÑти КОДИРÐЊЕ као локално кодирање " "за ИРИ-је\n" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=КОДИРÐЊЕ кориÑти КОДИРÐЊЕ као оÑновно удаљено " "кодирање\n" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink уклања датотеку пре препиÑивања\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1905,7 +1920,7 @@ " --keep-badhash задржава датотеке Ñа неодговарајућом " "Ñумом провере (придодаје „.badhash“)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1913,7 +1928,7 @@ " --metalink-index=БРОЈ Метавеза програм/метавеза4+икÑмл метаурл " "редни број БРОЈ\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1921,50 +1936,51 @@ " --metalink-over-http кориÑти метаподатке мета везе из " "заглавља ХТТП одговора\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location жељено меÑто за изворишта мета везе\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr иÑкључује Ñмештање метаподатака у " "проширеним атрибутима датотеке\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Директоријуми:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories не Ñтвара директоријуме\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr "" " -x, --force-directories приморава Ñтварање директоријума\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" " -nH, --no-host-directories не Ñтвара директоријуме домаћина\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories кориÑти назив протокола у " "директоријумима\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=ПРЕФИКС чува датотеке у ПРЕФИКС/..\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1972,26 +1988,26 @@ " --cut-dirs=БРОЈ занемарује БРОЈ делова удаљеног " "директоријума\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "ХТТП опције:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=КОРИСÐИК поÑтавља хттп кориÑника на КОРИСÐИКÐ\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-password=ЛОЗИÐКРпоÑтавља хттп лозинку на ЛОЗИÐКУ\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache онемогућава податке причуване Ñервером\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1999,7 +2015,7 @@ " --default-page=ÐÐЗИВ мења оÑновни назив Ñтранице (обично\n" " је то „index.html“.)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2007,43 +2023,42 @@ " -E, --adjust-extension чува ХТМЛ/ЦСС документа Ñа ÑопÑтвеним " "проширењима\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length занемарује поље заглавља „Content-" "Length“ (величина-Ñадржаја)\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=ÐИСКРумеће ÐИСКУ у заглавља\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=ВРСТРбира врÑту опÑега напредовања\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect највише преуÑмеравања допуштених по " "Ñтраници\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=КОРИСÐИК поÑтавља КОРИСÐИКРза кориÑничко име " "поÑредника\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=ЛОЗИÐКРпоÑтавља ЛОЗИÐКУ за лозинку поÑредника\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2051,11 +2066,11 @@ " --referer=ÐДРЕСРукључује заглавље „Referer: ÐДРЕСГ у " "ХТТП захтев\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers чува ХТТП заглавља у датотеку\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2063,7 +2078,7 @@ " -U, --user-agent=ÐГЕÐТ претÑтавља Ñе као ÐГЕÐТ умеÑто Вгет/" "ИЗДÐЊЕ\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2071,23 +2086,23 @@ " --no-http-keep-alive иÑкључује ХТТП одржи-живим (трајне " "везе)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies не кориÑти колачиће\n" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=ДÐТОТЕКРучитава колачиће из ДÐТОТЕКЕ пре " "ÑеÑије\n" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=ДÐТОТЕКРчува колачиће у ДÐТОТЕКУ након ÑеÑије\n" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2095,7 +2110,7 @@ " --keep-session-cookies учитава и чува (не-поÑтојане) колачиће " "ÑеÑије\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2103,7 +2118,7 @@ " --post-data=ÐИСКРкориÑти ПОСТ начин; шаље ÐИСКУ као " "податке\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2111,13 +2126,13 @@ " --post-file=ДÐТОТЕКРкориÑти ПОСТ начин; шаље Ñадржај " "ДÐТОТЕКЕ\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=ХТТПÐачин кориÑти начин „ХТТПÐачин“ у захтеву\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2125,7 +2140,7 @@ " --body-data=ÐИСКРшаље ÐИСКУ као податке. „--method“ МОРР" "бити подешен\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2133,7 +2148,7 @@ " --body-file=ДÐТОТЕКРшаље Ñадржаје ДÐТОТЕКЕ. „--method“ МОРР" "бити подешен\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2144,7 +2159,7 @@ "када\n" " бира називе меÑних датотека (ПРОБÐО)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2152,7 +2167,7 @@ " --content-on-error иÑпиÑује примљени Ñадржај на грешкама " "Ñервера\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2164,11 +2179,11 @@ " а да прво не чека за изазовом\n" " Ñервера\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "ХТТПС (ССЛ/ТЛС) опције:\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2179,39 +2194,39 @@ "ССЛв2,\n" " ССЛв3, ТЛСв1 и ПФС\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only прати Ñамо безбедне ХТТПС везе\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate не оверава уверење Ñервера\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=ДÐТОТЕКРдатотека уверења клијента\n" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=ВРСТРврÑта уверења клијента, ПЕМ или ДЕР\n" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=ДÐТОТЕКРдатотека личног кључа\n" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=ВРСТРврÑта личног кључа, ПЕМ или ДЕР\n" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" " --ca-certificate=ДÐТОТЕКРдатотека Ñа Ñвежњом издавача уверења\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2219,12 +2234,12 @@ " --ca-directory=ДИР директоријум у коме Ñе чува ÑпиÑак " "издавача уверења\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" " --crl-file=ДÐТОТЕКРдатотека Ñа Ñвежњом издавача уверења\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2240,7 +2255,7 @@ " „sha256//“ раздвојених „;“, за проверу\n" " парњака\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2248,7 +2263,7 @@ " --random-file=ДÐТОТЕКРдатотека Ñа наÑумичним подацима за " "Ñејање ССЛ ПРÐГ-а\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2256,7 +2271,7 @@ " --egd-file=ДÐТОТЕКРдатотека која именује ЕГД прикључницу " "наÑумичним подацима\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2266,15 +2281,15 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "ХСТС опције:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts иÑкључује ХСТС\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2282,11 +2297,11 @@ " --hsts-file путања ХСТС базе података (препиÑаће " "оÑновно)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "ФТП опције:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2294,37 +2309,37 @@ " --ftp-stmlf КориÑти „Stream_LF“ формат за Ñве " "бинарне ФТП датотеке\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=КОРИСÐИК поÑтавља фтп кориÑника на КОРИСÐИКÐ\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=ЛОЗИÐКРпоÑтавља фтп лозинку на ЛОЗИÐКУ\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing не уклања „.listing“ датотеке\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob иÑкључије угрушавање назива ФТП " "датотека\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp иÑкључује „неактиван“ режим преноÑа\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions задржава овлашћења удаљене датотеке\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2332,11 +2347,11 @@ " --retr-symlinks приликом дубачења, добавља везане-на " "датотеке (не директоријуме)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "ФТПС опције:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2344,7 +2359,7 @@ " --ftps-implicit кориÑти изричито ФТПС (оÑновни " "прикључник је 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2354,7 +2369,7 @@ "управљачкој вези приликом\n" " отварања везе података\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2362,7 +2377,7 @@ " --ftps-clear-data-connection шифрује Ñамо канал управљања; Ñви " "подаци биће обичан текÑÑ‚\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2370,11 +2385,11 @@ " --ftps-fallback-to-ftp враћање на ФТП ако је ФТПС није " "подржано на циљном Ñерверу\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Ð’ÐРЦ опције:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2382,24 +2397,24 @@ " --warc-file=ÐÐЗИВ ДÐТОТЕКЕ чува податке захтева/одговора у „.warc." "gz“ датотеку\n" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=ÐИСКРумеће ÐИСКУ у варцинфо запиÑ\n" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=БРОЈ поÑтавља највећу величину Ð’ÐРЦ датотека " "на БРОЈ\n" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr "" " --warc-cdx запиÑује датотеке Ð¦Ð”Ð˜ÐºÑ Ñ€ÐµÐ³Ð¸Ñтра\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2407,16 +2422,16 @@ " --warc-dedup=ÐÐЗИВ ДÐТОТЕКЕ не Ñкладишти запиÑе наведене у овој " "Ð¦Ð”Ð˜ÐºÑ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÑ†Ð¸\n" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-warc-compression не Ñажима Ð’ÐРЦ датотеке ГЗИП-ом\n" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests не прорачунава СХÐ1 збирке\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2424,7 +2439,7 @@ " --no-warc-keep-log не Ñкладишти датотеку дневника у Ð’ÐРЦ " "запиÑ\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2434,15 +2449,15 @@ "направи\n" " пиÑац Ð’ÐРЦ\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "ДубинÑко преузимање:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive наводи дубинÑко преузимање\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2450,7 +2465,7 @@ " -l, --level=БРОЈ највећа дубина дубачења („inf“ или 0 за " "неограничено)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2458,7 +2473,7 @@ " --delete-after брише датотеке локално након њиховог " "преузимања\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2468,7 +2483,7 @@ "које указују\n" " на меÑне датотеке\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2476,7 +2491,7 @@ " --convert-file-only претвара Ñамо део датотеке адреÑа (обично " "познато као назив оÑнове)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2484,7 +2499,7 @@ " --backups=N пре запиÑивања датотеке „X“, окреће Ñе " "на N датотека резерве\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2492,7 +2507,7 @@ " -K, --backup-converted пре претварања датотеке „X“, прави " "резерву „X_orig“\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2500,7 +2515,7 @@ " -K, --backup-converted пре претварања датотеке „X“, прави " "резерву „X.orig“\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2508,7 +2523,7 @@ " -m, --mirror Ñкраћеница за „-N -r -l inf --no-remove-" "listing“\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2516,7 +2531,7 @@ " -p, --page-requisites добавља Ñве Ñлике, итд. неопходне за " "приказ ХТМЛ Ñтранице\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2524,11 +2539,11 @@ " --strict-comments укључује изрично (СГМЛ) руковање ХТМЛ " "напоменама\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "ДубинÑко прихвати/одбиј:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2536,7 +2551,7 @@ " -A, --accept=СПИСÐК зарезом одвојени ÑпиÑак прихваћених " "проширења\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2544,49 +2559,49 @@ " -R, --reject=СПИСÐК зарезом одвојени ÑпиÑак одбијених " "проширења\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=РЕГИЗРÐЗ регуларан израз који одговара " "прихваћеним адреÑама\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=РЕГИЗРÐЗ регуларан израз који одговара одбијеним " "адреÑама\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=ВРСТРврÑта регуларног израза (поÑикÑ|пцре)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=ВРСТРврÑта регуларног израза (поÑикÑ)\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=СПИСÐК зарезом одвојени ÑпиÑак прихваћених " "домена\n" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=СПИСÐК зарезом одвојени ÑпиÑак одбијених " "домена\n" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp прати ФТП везе из ХТМЛ докумената\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2594,7 +2609,7 @@ " --follow-tags=СПИСÐК зарезом одвојени ÑпиÑак праћених ХТМЛ " "ознака\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2602,21 +2617,21 @@ " --ignore-tags=СПИСÐК зарезом одвојени ÑпиÑак занемарених " "ХТМЛ ознака\n" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts иде на Ñтране домаћине приликом " "дубачења\n" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative прати релативне везе Ñамо\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=СПИСÐК ÑпиÑак допуштених директоријума\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2626,89 +2641,89 @@ "компонентом\n" " адреÑе преуÑмеравања\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=СПИСÐК ÑпиÑак иÑкључених директоријума\n" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent не допире до родитељÑког директоријума\n" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "Предлоге и извештаје о грешкама шаљите на \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "ГÐУ Вгет %s, програм за не-узајамно преузимање датотека.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Лозинка за кориÑника „%s“: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Лозинка: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Ðе могу да направим Ñпојку\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "Грешка покретања радњи израђања датотеке за „use-askpass“: %d\n" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "Грешка подешавања радњи израђања датотеке за „use-askpass“: %d\n" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Грешка читања одговора из наредбе „%s %s“: %s\n" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "КориÑничко име за „%s%s“: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Лозинка за „%s%s@%s“: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Вгетрц: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Локалитет: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "СаÑтављен: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Веза: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2717,29 +2732,29 @@ "ГÐУ Вгет %s изграђен %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (окруж)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (кориÑник)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "ÐуторÑка права © %s Задужбина Ñлободног Ñофтвера, Доо.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2753,7 +2768,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2761,36 +2776,36 @@ "\n" "Првобитни аутор је Хрвоје Ðикшић .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "Питања и извештаје о грешкама шаљите на .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Проблем раÑподеле меморије\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Излазим због грешке у „%s“\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Покушајте „%s --help“ за више могућноÑти.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: неиÑправна опција -- „-n%c“\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "Подршка прочишћавања није преведена. Занемарујем опцију „--debug“.\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2799,7 +2814,7 @@ "И „--no-clobber“ и „--convert-links“ Ñу наведени, Ñамо „--convert-links“ ће " "бити коришћено.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2808,24 +2823,24 @@ "И „--no-clobber“ и „--convert-file-only“ Ñу наведени, Ñамо „--convert-file-" "only“ ће бити коришћено.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ðије могуће бити нечујан и опширан у иÑто време.\n" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Ðије могуће променити временÑке ознаке без промене Ñтарих датотека у иÑто " "време.\n" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Ðије могуће навеÑти и „--inet4-only“ и „--inet6-only“.\n" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2837,7 +2852,7 @@ "Ñа „-p“ или „-r“. Погледајте упутÑтво за детаље.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2848,7 +2863,7 @@ "бити Ñмештен у једну датотеку коју Ñте навели.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2859,7 +2874,7 @@ "упутÑтво за појединоÑти.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2867,19 +2882,19 @@ "Ð’ÐРЦ излаз не ради Ñа опцијом „--no-clobber“, „--no-clobber“ ће бити " "иÑкључено.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" "Ð’ÐРЦ излаз не ради Ñа временÑким означавањем, иÑто ће бити иÑкључено.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Ð’ÐРЦ излаз не ради Ñа опцијом „--spider“.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2888,7 +2903,7 @@ "Ð’ÐРЦ излаз не ради Ñа опцијом „--continue“, „--start-pos“ ће бити " "иÑкључено.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2896,7 +2911,7 @@ "Збирке Ñу иÑкључене; Ð’ÐРЦ-ове поништавање удвоÑтрученÑоти неће наћи " "удвоÑтручене запиÑе.\n" -#: src/main.c:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2905,12 +2920,12 @@ "Ð’ÐРЦ излаз не ради Ñа опцијом „--continue“, „--start-pos“ ће бити " "иÑкључено.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Ðије могуће навеÑти и „--ask-password“ и „--password“.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2919,17 +2934,17 @@ "Ðавођење и „--start-pos“ и „--continue“ Ñе не препоручује; „--continue“ биће " "иÑкључено.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: недоÑтаје адреÑа\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Ðе можете навеÑти и „--post-data“ и „--post-file“.\n" -#: src/main.c:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2938,7 +2953,7 @@ "Ðе можете да кориÑтите „--post-data“ или „--post-file“ уз „--method“. „--" "method“ очекује податке кроз „--body-data“ и „--body-file“\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2947,17 +2962,17 @@ "Морате да наведете начин кроз „--method=ХТТПÐачин“ да кориÑтите Ñа „--body-" "data“ или „--body-file“.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Ðе можете навеÑти и „--body-data“ и „--body-file“.\n" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Ово издање нема подршку за ИРИ-је\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2965,7 +2980,7 @@ "„-k“ или „-r“ може бити коришћено Ñа „-O“ Ñамо ако даје резултат у регуларну " "датотеку.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2974,42 +2989,42 @@ "„--convert-links“ или „--convert-file-only“ Ñе могу кориÑтити заједно Ñамо " "ако резултат иде у регуларну датотеку.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "ÐиÑам уÑпео да покренем „libcares“\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "ÐиÑам уÑпео да покренем „c-ares“ канал\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "ÐиÑам уÑпео да обрадим ИП адреÑу „%s“\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "ÐиÑам уÑпео да поÑтавим ДÐС Ñервер(е) „%s“ (%d)\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "ÐиÑам пронашао адреÑе у „%s“.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ðе могу да обрадим датотеку мета везе „%s“.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Ðе могу да преузмем Ñва изворишта Ñа „%s“.\n" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3020,7 +3035,7 @@ "Укупно време: %s\n" "Преузетих датотека: %d, %s за %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "ПРЕМÐШЕРје лимит преузимања од %s!\n" @@ -3186,7 +3201,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "ÐаÑтављам рад у позадини, пид %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Резултат ће бити запиÑан у „%s“.\n" @@ -3233,64 +3248,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: не могу да добавим податке за %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "УПОЗОРЕЊЕ: кориÑтим Ñлабо наÑумично Ñеме.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Ðе могу да Ñејем ПРÐГ; размотрите употребу „--random-file“.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "Ваше издање ОпенССЛ-а је превише Ñтаро да подржи ТЛСи1.1\n" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Ваше издање ОпенССЛ-а је превише Ñтаро да подржи ТЛСи1.1\n" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Ваше издање ОпенССЛ-а је превише Ñтаро да подржи ТЛСи1.2\n" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "ОпенССЛ: непримењена вредноÑÑ‚ %d опције „secure-protocol“\n" -#: src/openssl.c:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: ÐеиÑправна адреÑа „%s“: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "Ðе могу да Ñејем ПРÐГ; размотрите употребу „--random-file“.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: не могу да проверим %s уверење, које је издао „%s“:\n" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Ðе могу у локалу да проверим надлештво издавача.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Пронађох ÑамопотпиÑано уверење.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Издато уверење још није важеће.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Издато уверење је иÑтекло.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3299,7 +3314,7 @@ "%s: ниједан други назив предмета уверења не одговара\n" " затраженом називу домаћина „%s“.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3307,7 +3322,7 @@ " %s: општи назив уверења „%s“ не одговара затраженом називу домаћина " "„%s“.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3318,7 +3333,7 @@ " Ово може бити указ да домаћин није онај за кога Ñе претÑтавља\n" " (тако је, није Ñтварни „%s“).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3368,22 +3383,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Учитавам „robots.txt“; молим занемарите грешке.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Грешка обраде адреÑе поÑредника „%s“: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Грешка у адреÑи поÑредника „%s“: мора бити ХТТП.\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d премашених преуÑмеравања.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3391,7 +3406,7 @@ "ОдуÑтајем.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3466,99 +3481,109 @@ msgid "HTTPS support not compiled in" msgstr "ХТТПС подршка није уграђена" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Ðепотпун или неиÑправан вишебајтни низ\n" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: ÐиÑам уÑпео да доделим довољно меморије; меморија је потрошена.\n" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: ÐиÑам уÑпео да доделим %ld бајта; меморија је потрошена.\n" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: текÑтуална међумеморија је превелика (%d бајта), прекидам.\n" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "ÐаÑтављам рад у позадини, пид %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "ÐиÑам уÑпео да развежем Ñимболичку везу „%s“: %s\n" -#: src/utils.c:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "ÐиÑам уÑпео да покренем „libcares“\n" -#: src/utils.c:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "ÐиÑам уÑпео да подеÑим овлашћења за „%s“.\n" -#: src/utils.c:872 +#: src/utils.c:878 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "ÐиÑам уÑпео да подеÑим овлашћења за „%s“.\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "ÐиÑам уÑпео да обрадим ИП адреÑу „%s“\n" -#: src/utils.c:923 +#: src/utils.c:929 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "ÐиÑам уÑпео да подеÑим овлашћења за „%s“.\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Ðеправилан регуларан израз: %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Ðеправилан регуларан израз: %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Грешка приликом упаривања %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Грешка отварања Ð’ÐРЦ датотеке „%s“.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Грешка отварања ГЗИП тока у Ð’ÐРЦ датотеци.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Грешка пиÑања варцинфо запиÑа у Ð’ÐРЦ датотеку.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3567,24 +3592,24 @@ "Отварам Ð’ÐРЦ датотеку „%s“.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Грешка отварања Ð’ÐРЦ датотеке „%s“.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Ð¦Ð”Ð˜ÐºÑ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° не наводи изворне адреÑе. (ÐедоÑтаје Ñтубац „a“.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Ð¦Ð”Ð˜ÐºÑ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° не наводи Ñуме провере. (ÐедоÑтаје Ñтубац „k“.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "Ð¦Ð”Ð˜ÐºÑ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° не наводи ибове запиÑа. (ÐедоÑтаје Ñтубац „u“.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3602,32 +3627,32 @@ "Учитах %d запиÑа из ЦДИкÑ-а.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Ðе могу да прочитам Ð¦Ð”Ð˜ÐºÑ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ „%s“ за иклањањем дупликата.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Ðе могу да отворим привремену датотеку Ð’ÐРЦ проглаÑа.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Ðе могу да отворим привремену датотеку Ð’ÐРЦ дневника.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Ðе могу да отворим Ð’ÐРЦ датотеку.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Ðе могу да отворим Ð¦Ð”Ð˜ÐºÑ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ за излаз.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Ðе могу да отворим привремену Ð’ÐРЦ датотеку.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Ðађох тачно поклапање у Ð¦Ð”Ð˜ÐºÑ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÑ†Ð¸. Чувам Ð·Ð°Ð¿Ð¸Ñ Ð¿Ð¾Ð½Ð¾Ð²Ð½Ðµ поÑете у Ð’ÐРЦ.\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/sv.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/sv.gmo differ diff -Nru wget-1.19.5/po/sv.po wget-1.20.1/po/sv.po --- wget-1.19.5/po/sv.po 2018-05-06 16:48:24.000000000 +0000 +++ wget-1.20.1/po/sv.po 2018-12-26 20:10:50.000000000 +0000 @@ -1,17 +1,17 @@ # Swedish messages for wget. -# Copyright (C) 2008, 2009, 2010, 2016, 2017 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009, 2010, 2016, 2017, 2018 Free Software Foundation, Inc. # This file is distributed under the same license as the wget package. # Christian Rose , 1999, 2000, 2001, 2002, 2003. # Daniel Nylander , 2006, 2007, 2008, 2009, 2010. -# Göran Uddeborg , 2016, 2017. +# Göran Uddeborg , 2016, 2017, 2018. # -# $Revision: 1.6 $ +# $Revision: 1.9 $ msgid "" msgstr "" -"Project-Id-Version: wget 1.18.109\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-02-06 11:24+0100\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-17 19:26+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -102,29 +102,29 @@ msgstr "Okänt fel" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: flaggan \"%s\" är tvetydig\n" +msgstr "%s: flaggan â€%s%s†är tvetydig\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: flaggan â€%s†är tvetydig; möjligheter:" +msgstr "%s: flaggan â€%s%s†är tvetydig; möjligheter:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: okänd flagga \"%c%s\"\n" +msgstr "%s: okänd flagga â€%s%sâ€\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: flaggan \"%c%s\" tar inget argument\n" +msgstr "%s: flaggan â€%s%s†tar inget argument\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: flaggan \"--%s\" behöver ett argument\n" +msgstr "%s: flaggan â€%s%s†behöver ett argument\n" #: lib/getopt.c:621 #, c-format @@ -233,17 +233,17 @@ msgid "Unmatched ) or \\)" msgstr "Ensam ) eller \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Inget tidigare reguljärt uttryck" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "kan inte skapa ett rör" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -308,7 +308,7 @@ msgid "failed: %s.\n" msgstr "misslyckades: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: kunde inte slÃ¥ upp värdadressen %s\n" @@ -431,12 +431,12 @@ msgid "Length: %s" msgstr "Längd: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) Ã¥terstÃ¥r" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s Ã¥terstÃ¥r" @@ -605,7 +605,7 @@ "Filen eller katalogen %s finns inte.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s har uppstÃ¥tt.\n" @@ -628,17 +628,17 @@ msgid "Data transfer aborted.\n" msgstr "Dataöverföring avbruten.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, 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:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(försök:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -647,7 +647,7 @@ "%s (%s) - skrevs till standard ut %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -656,8 +656,8 @@ "%s (%s) - %s sparades [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Tar bort %s.\n" @@ -753,159 +753,175 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Nekar %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Nekar %s (felaktig post)..\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s är undantaget/inte-inkluderat via reguljäruttryck.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Fel vid matchning av %s mot %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Inga träffar med mönstret %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Skrev HTML-iserat index till %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Skrev HTML-iserat index till %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "FEL: Kan inte öppna katalogen %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "FEL: Kan inte öppna certifikatet %s: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Läste in CA-certifikatet â€%sâ€\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Läste in CRL-filen â€%sâ€\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Din GnuTLS-version är för gammal för att stödja TLS 1.3\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS: oimplementerat värde %d pÃ¥ alternativet â€secure-protocolâ€\n" +msgstr "GnuTLS: oimplementerat värde %u pÃ¥ alternativet â€secure-protocolâ€\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: kan inte sätta prioritetssträngen direkt. Faller tillbaka pÃ¥ " +"standardprioriteten.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "FEL" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "VARNING" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Inget certifikat presenterades av %s.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, 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:808 +#: src/gnutls.c:932 #, 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" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" +msgstr "%s: Certifikatet för %s har inte en känd utfärdare.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, 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:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, 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:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Fel vid initiering av X509-certifikat: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Inget certifikat hittades\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Fel vid tolkning av certifikat: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Certifikatet har ännu inte aktiverats\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Certifikatet har gÃ¥tt ut\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Certifikatet mÃ¥ste vara X.509\n" @@ -945,11 +961,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Misslyckades med att skriva HTTP-begäran: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Inga rubriker, antar HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -958,11 +974,11 @@ "Filen %s finns redan där; hämtar den inte.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime misslyckades. Detta är förmodligen ett programfel.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -970,55 +986,55 @@ "Kan inte konvertera tidsstämpel till http-format. Faller tillbaka till tid " "0 som senaste modifieringstid.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Datafil för BODY %s saknas: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Ã…teranvänder befintlig anslutning till [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Ã…teranvänder befintlig anslutning till %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Misslyckades med att läsa proxysvar: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEL %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Felaktig statusrad" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Proxytunnel misslyckades: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Okänd autentiseringsmetod.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Vald autentisering: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Sparar till: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1027,20 +1043,20 @@ "När signaturen hämtades:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Felaktigt pri-värde. Antar %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1048,42 +1064,42 @@ "Kunde inte hitta en acceptabel kontrollsumma för Metalink-resurser.\n" "Hoppar över dem.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Inaktiverar SSL pÃ¥ grund av pÃ¥träffade fel.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-begäran skickad, väntar pÃ¥ svar... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Ingen data mottagen.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Läsfel (%s) i rubriker.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(ingen beskrivning)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Adress: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "ospecificerat" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [följer]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1092,7 +1108,7 @@ "Filen %s är inte modifierad pÃ¥ servern. LÃ¥ter bli att hämta.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1103,7 +1119,7 @@ "Du kanske vill lägga till flaggan --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1113,81 +1129,81 @@ " Filen är redan fullständigt hämtad, inget att göra.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Längd: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ignorerad" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Varning: jokertecken stöds inte i HTTP.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Spindelläget aktiverat. Kontrollera om fjärrfilen finns.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kan inte skriva till %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Det begärda attributet saknas i det mottagna huvudet.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Användarnamn-/lösenordsautentisering misslyckades.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Kan inte skriva till WARC-filen.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Kan inte skriva till en temporär WARC-fil.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Kan inte etablera en SSL-anslutning.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Kan inte ta bort %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEL: Omdirigering (%d) utan adress.\n" -#: src/http.c:4458 +#: src/http.c:4464 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:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink-huvuden hittade. Byter till Metalink-läge.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Fjärrfilen finns inte -- trasig länk!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "\"Last-modified\"-rubrik saknas -- tidsstämplar avstängda.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "\"Last-modified\"-rubriken är ogiltig -- tidsstämpel ignorerad.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1196,16 +1212,16 @@ "Filen pÃ¥ servern är inte nyare än lokala filen %s -- hämtar den inte.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Fjärrfilen är nyare, hämtar den.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1215,7 +1231,7 @@ "den.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1223,7 +1239,7 @@ "Fjärrfilen finns men innehÃ¥ller ingen länk -- hämtar den inte.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1233,7 +1249,7 @@ "men rekursion är inaktiverat -- hämtar den inte.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1241,12 +1257,12 @@ "Fjärrfilen finns.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1255,7 +1271,7 @@ "%s (%s) - skrevs till standard ut %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1264,58 +1280,59 @@ "%s (%s) - %s sparades [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Anslutningen stängd vid byte %s. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Läsfel vid byte %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ej stödd skyddskvalitet â€%sâ€.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmen â€%s†stödjs inte.\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, 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" +msgstr "" +"%s: WGETRC pekar pÃ¥ %s som inte gick att komma Ã¥t pÃ¥ grund av ett fel: %s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan inte läsa %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Fel i %s vid rad %d.\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaxfel i %s pÃ¥ rad %d.\n" -#: src/init.c:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1327,7 +1344,7 @@ "â€%sâ€,\n" "eller ange en annan fil med --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1338,47 +1355,47 @@ "â€%sâ€,\n" "eller ange en annan fil med --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Kommando med argumentet --execute är ogiltigt %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ogiltigt tal %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, 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:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ogiltigt bytevärde %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ogiltig tidsperiod %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1387,28 +1404,28 @@ "use-askpass behöver en sträng eller att antingen miljövariabeln WGET_ASKPASS " "eller SSH_ASKPASS är satt.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ogiltigt värde %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ogiltig rubrik %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ogiltigt WARC-huvud %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Förloppstypen %s är ogiltig.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1422,16 +1439,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Kodningen %s är inte giltig\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Ofullständig eller ogiltig multibyte-sekvens pÃ¥träffades\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Ohanterat felnummer %d\n" @@ -1464,12 +1481,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; deaktiverar loggning.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Användning: %s [FLAGGA]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1478,68 +1495,68 @@ "korta.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Uppstart:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version visa Wgets version och avsluta\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help skriv ut denna hjälp.\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background gÃ¥ till bakgrunden efter uppstart\n" -#: src/main.c:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Loggning och inmatningsfil:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FIL logga meddelanden till FIL\n" -#: src/main.c:610 +#: src/main.c:611 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:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug skriv ut massor av " "felsökningsinformation\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug skriv ut Watt-32-felsökningsinformation\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tyst (ingen utdata)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose var informativ (detta är standard)\n" -#: src/main.c:624 +#: src/main.c:625 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:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1547,7 +1564,7 @@ " --report-speed=TYP skriv ut bandvidd som TYP. TYP kan vara " "bits\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1556,7 +1573,7 @@ "extern\n" " FIL\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1564,11 +1581,11 @@ " --input-metalink=FIL hämta URL:ar som täcks av lokal Metalink-" "FIL\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html behandla inmatningsfil som HTML\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1576,27 +1593,27 @@ " -B, --base=URL slÃ¥r upp HTML-länkar frÃ¥n indatafil\n" " (-i -F) relativa till URL\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FIL ange konfigurationsfil att använda\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-config läs ingen konfigurationsfil\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Hämta:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1604,26 +1621,25 @@ " -t, --tries=ANTAL sätt antal försök till ANTAL (0 " "obegränsar)\n" -#: src/main.c:651 +#: src/main.c:652 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:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=LISTA kommaseparerad lista av HTML-taggar att\n" -" ignorera\n" +" --retry-on-http-error=FEL kommaseparerad lista över HTTP-fel " +"att försöka om\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FIL skriv dokument till FIL\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1633,21 +1649,21 @@ " redan befintliga filer (skriva över " "dem)\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-config läs ingen konfigurationsfil\n" +msgstr "" +" --no-netrc försök inte hämta kreditiv frÃ¥n .netrc\n" -#: src/main.c:662 +#: src/main.c:663 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:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1655,11 +1671,11 @@ " --start-pos=AVSTÃ…ND börja hämta frÃ¥n nollbaserad position " "AVSTÃ…ND\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYP välj typ av förloppsindikator\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1667,7 +1683,7 @@ " --show-progress visa förloppsmätare i alla " "informationslägen\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1677,7 +1693,7 @@ "än\n" " lokala\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1687,7 +1703,7 @@ "get-\n" " begäranden i tidsstämpelläge\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1695,19 +1711,19 @@ " --no-use-server-timestamps sätt inte den lokala filens tidsstämpel\n" " efter den pÃ¥ servern\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response skriv ut serversvar\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider hämta ingenting\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1715,7 +1731,7 @@ " --dns-servers=ADRESSER lista över DNS-servrar att frÃ¥ga\n" " (kommaseparerade)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1724,34 +1740,34 @@ "den\n" " lokala värden\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDER vänta SEKUNDER mellan hämtningar\n" -#: src/main.c:699 +#: src/main.c:700 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:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1760,16 +1776,16 @@ "sekunder\n" " mellan hämtningar\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy stäng uttryckligen av proxy\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ANTAL ställ in mottagningskvot till ANTAL\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1777,17 +1793,17 @@ " --bind-address=ADRESS bind till ADRESS (värdnamn eller IP) pÃ¥\n" " lokal värd\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=FART begränsa hämtningshastighet till FART\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache inaktivera mellanlagring av DNS-uppslag\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1795,7 +1811,7 @@ " --restrict-file-names=OS begränsa tecken i filnamn till vad OS\n" " tillÃ¥ter\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1803,15 +1819,15 @@ " --ignore-case ignorera skiftläge när filer/kataloger\n" " matchas\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only anslut endast till IPv4-adresser\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only anslut endast till IPv6-adresser\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1821,14 +1837,14 @@ "familj,\n" " en av IPv6, IPv4 eller none\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" @@ -1836,11 +1852,11 @@ "till\n" " LÖSEN\n" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password frÃ¥ga efter lösenord\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1855,27 +1871,27 @@ " KOMMANDO anges används miljövariabeln\n" " WGET_ASKPASS eller SSH_ASKPASS.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri stäng av IRI-stöd\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink ta bort filer före de skrivs över\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1883,7 +1899,7 @@ " --keep-badhash behÃ¥ll filer med kontrollsummefel (lägg " "till .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1891,7 +1907,7 @@ " --metalink-index=TAL Metalink application/metalink4+xml " "metaurl ordningsTAL\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1899,71 +1915,72 @@ " --metalink-over-http använd Metalink-metadata frÃ¥n HTTP-\n" " svarshuvuden\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location önskad plats för Metalink-resurser\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr slÃ¥ av lagring av metadata i utökade " "filattribut\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Kataloger:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories skapa inte kataloger\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories tvinga skapandet av kataloger\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories skapa inte värdkataloger\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories använd protokollnamn i kataloger\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIX spara filer till PREFIX/…\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" " --cut-dirs=ANTAL ignorera ANTAL fjärrkatalogkomponenter\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP-flaggor:\n" -#: src/main.c:779 +#: src/main.c:780 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:781 +#: src/main.c:782 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:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache tillÃ¥t inte mellanlagrad data pÃ¥ servern\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1972,7 +1989,7 @@ "(vanligtvis\n" " är detta â€index.htmlâ€.)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1980,41 +1997,42 @@ " -E, --adjust-extension spara HTML/CSS-dokument med korrekta " "ändelser\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignorera â€Content-Lengthâ€-rubrikfält\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=STRÄNG infoga STRÄNG i huvudet\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TYP välj typ av förloppsindikator\n" +msgstr "" +" --compression=TYP välj komprimering, en av auto, gzip och " +"none. (standard: none)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximalt tillÃ¥tna omdirigeringar per " "sida\n" -#: src/main.c:800 +#: src/main.c:801 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:802 +#: src/main.c:803 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:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2022,11 +2040,11 @@ " --referer=URL inkludera â€Referer: URLâ€-rubrik i\n" " HTTP-begäran.\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers spara HTTP-rubrikerna till fil\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2034,7 +2052,7 @@ " -U, --user-agent=AGENT identifiera som AGENT istället för\n" " Wget/VERSION\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2042,22 +2060,22 @@ " --no-http-keep-alive inaktivera HTTP keep-alive (varaktiga\n" " anslutningar)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies använd inte kakor\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2065,7 +2083,7 @@ " --keep-session-cookies läs in och spara sessionskakor\n" " (icke-permanenta)\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2073,7 +2091,7 @@ " --post-data=STRÄNG använd POST-metoden; skicka STRÄNG som " "data\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2081,13 +2099,13 @@ " --post-file=FIL använd POST-metoden; skicka innehÃ¥llet i " "FIL\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMetod använd metoden â€HTTPMetod†i begäran\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2095,14 +2113,14 @@ " --body-data=STRÄNG skicka STRÄNG som data. --method MÃ…STE " "anges\n" -#: src/main.c:828 +#: src/main.c:829 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:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2114,7 +2132,7 @@ " när lokala filnamn väljs " "(EXPERIMENTELL)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2122,7 +2140,7 @@ " --content-on-error skriv ut det mottagna innehÃ¥llet vid " "serverfel\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2134,65 +2152,64 @@ " utan att först vänta pÃ¥ serverns\n" " kontrollfrÃ¥ga\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS-flaggor (SSL/TLS):\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -" --secure-protocol=PR välj säkert protokoll, ett av auto, " +" --secure-protocol=PR välj säkert protokoll, ett av auto, " "SSLv2,\n" -" SSLv3, TLSv1 och PFS\n" +" SSLv3, TLSv1, TLSv1_1, TLSv1_2 och PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only följ endast säkra HTTPS-länkar\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate validera inte serverns certifikat\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FIL klientcertifikatfil\n" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYP klientcertifikattyp, PEM eller DER\n" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FIL fil med privat nyckel\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FIL fil med paketerade CA:er\n" -#: src/main.c:861 +#: src/main.c:862 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:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FIL fil med paketerade CRL:er\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2209,14 +2226,14 @@ "motparten\n" " mot.\n" -#: src/main.c:871 +#: src/main.c:872 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:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2224,7 +2241,7 @@ " --egd-file=FIL fil med namnet för EGD-uttag med " "slumpdata\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2233,16 +2250,22 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=STR Sätt prioritetssträngen (GnuTLS) eller " +"chifferliststrängen (OpenSSL) direkt.\n" +" Använd med försiktighet. Denna flagga " +"Ã¥sidosätter --secure-protocol.\n" +" Formatet och syntaxen pÃ¥ denna sträng " +"beror pÃ¥ den specifika SSL/TLS-motorn.\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "HSTS-flaggor:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts avaktivera HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2250,11 +2273,11 @@ " --hsts-file sökväg till HSTS-databas (kommer " "Ã¥sidosätta standard)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP-flaggor:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2263,34 +2286,34 @@ "binära\n" " FTP-filer\n" -#: src/main.c:901 +#: src/main.c:902 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:903 +#: src/main.c:904 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:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ta inte bort â€.listingâ€-filer\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob stäng av FTP-filnamnsmatchning\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp avaktivera â€passivt†överföringsläge\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions behÃ¥ll fjärrfilens rättigheter\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2299,11 +2322,11 @@ "(inte\n" " kat)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTPS-flaggor:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2312,7 +2335,7 @@ "är\n" " 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2323,7 +2346,7 @@ " i styrförbindelsen när en\n" " dataförbindelse öppnas\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2331,7 +2354,7 @@ " --ftps-clear-data-connection chiffrera bara styrkanalen; all data\n" " kommer skickas som klartext\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2339,11 +2362,11 @@ " --ftps-fallback-to-ftp fall tillbaka till FTP om FTPS inte\n" " stödjs av mÃ¥lservern\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC-flaggor:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2351,23 +2374,23 @@ " --warc-file=FILNAMN spara begäran-/svardata i en .warc.gz-" "fil\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx skriv CDX-indexfiler\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2375,24 +2398,24 @@ " --warc-dedup=FILNAMN spara inte poster listade i denna CDX-" "fil\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests beräkna inte SHA1-kontrollsummor\n" -#: src/main.c:949 +#: src/main.c:950 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:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2401,15 +2424,15 @@ " --warc-tempdir=KATALOG plats för temporärfiler som skapas av\n" " WARC-skrivaren\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Rekursiv hämtning:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive ange rekursiv hämtning\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2417,7 +2440,7 @@ " -l, --level=ANTAL maximalt rekursionsdjup (inf eller 0 för\n" " oändligt)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2425,7 +2448,7 @@ " --delete-after ta bort lokala filer efter att de " "hämtats\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2435,7 +2458,7 @@ "CSS\n" " pekar pÃ¥ lokala filer\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2443,7 +2466,7 @@ " --convert-file-only konvertera endast fildelen av URL:en\n" " (vanligen känt som basename)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2451,7 +2474,7 @@ " --backups=N före fil X skrivs, rotera upp till N " "säkerhetskopiefiler\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2460,7 +2483,7 @@ "säkerhetskopiera\n" " den som X_orig\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2469,7 +2492,7 @@ "säkerhetskopiera\n" " den som X.orig\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2477,7 +2500,7 @@ " -m, --mirror genväg för -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2486,7 +2509,7 @@ "att\n" " visa HTML-sidor\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2494,11 +2517,11 @@ " --strict-comments slÃ¥ pÃ¥ strikt (SGML) hantering av\n" " HTML-kommentarer\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Rekursiv acceptans/vägran:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2506,54 +2529,54 @@ " -A, --accept=LISTA kommaseparerad lista av accepterade " "ändelser\n" -#: src/main.c:991 +#: src/main.c:992 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:993 +#: src/main.c:994 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:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGUTTR reguljäruttryck som matchar avvisade URL:" "ar\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYP typ av reguljäruttryck (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYP typ av reguljäruttryck (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 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:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2561,7 +2584,7 @@ " --follow-tags=LISTA kommaseparerad lista av HTML-taggar att " "följa\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2569,20 +2592,20 @@ " --ignore-tags=LISTA kommaseparerad lista av HTML-taggar att\n" " ignorera\n" -#: src/main.c:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative följ endast relativa länkar\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTA lista av tillÃ¥tna kataloger\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2592,91 +2615,92 @@ "ens\n" " sista komponent\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTA lista av exkluderade kataloger\n" -#: src/main.c:1025 +#: src/main.c:1026 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:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" msgstr "" "Skicka felrapporter och förslag till \n" "Skicka synpunkter pÃ¥ översättningen till \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"och/eller öppna ärenden pÃ¥ https://savannah.gnu.org/bugs/?" +"func=additem&group=wget.\n" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Lösenord för användaren %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Lösenord: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Kan inte skapa ett rör\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Användarnamn för â€%s%sâ€: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Lösenord för â€%s%s@%sâ€: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Lokalanpassning: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Kompilering: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Länkning: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2685,29 +2709,29 @@ "GNU Wget %s byggd pÃ¥ %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (miljö)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (användare)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2721,7 +2745,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2729,39 +2753,39 @@ "\n" "Ursprungligen skrivet av Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 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:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Minnesallokeringsproblem\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Avslutar pÃ¥ grund av fel i %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Prova \"%s --help\" för fler flaggor.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ogiltig flagga -- \"-n%c\"\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2770,7 +2794,7 @@ "BÃ¥de --no-clobber och --convert-links angavs, endast --convert-links kommer " "användas.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2779,22 +2803,22 @@ "BÃ¥de --no-clobber och --convert-file-only angavs, endast --convert-file-only " "kommer användas.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2806,7 +2830,7 @@ "anges, eller i kombination med -p eller -r. Se manualen för information.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2816,7 +2840,7 @@ "kommer att placeras i en enstaka fil som du har angivit.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2826,7 +2850,7 @@ "för information.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2834,7 +2858,7 @@ "WARC-utdata fungerar inte med --no-clobber, --no-clobber kommer " "avaktiveras.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2842,12 +2866,12 @@ "WARC-utdata fungerar inte med tidsstämplar, tidsstämplar kommer " "avaktiveras.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC-utdata fungerar inte med --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2856,7 +2880,7 @@ "WARC-utdata fungerar inte med --continue eller --start-pos, de kommer " "avaktiveras.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2864,21 +2888,21 @@ "Kontrollsummor är avaktiverade; WARC-avduplicering kommer inte hitta " "dubblettposter.\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"WARC-utdata fungerar inte med --continue eller --start-pos, de kommer " +"Komprimering fungerar inte med --continue eller --start-pos, den kommer " "avaktiveras.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2887,17 +2911,17 @@ "Att ange bÃ¥de --start-pos och --continue rekommenderas inte; --continue " "kommer att avaktiveras.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL saknas\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2907,7 +2931,7 @@ "method. --method förväntar sig data via flaggorna --body-data och --body-" "file\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2916,17 +2940,17 @@ "Man mÃ¥ste ange en metod med --method=HTTPMetod att använda med --body-data " "eller --body-file.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, 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:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2935,7 +2959,7 @@ "vanlig\n" "fil.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2945,42 +2969,42 @@ "med\n" "-O vid skrivning till en vanlig fil.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Misslyckades med att initiera libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Misslyckades med att initiera c-ares-kanalen\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Misslyckades att tolka IP-adressen â€%sâ€\n" -#: src/main.c:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Inga URL:er hittade i %s.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Kunde inte tolka metalink-filen %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2991,7 +3015,7 @@ "Total väggklocktid: %s\n" "Hämtade: %d filer, %s pÃ¥ %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Hämtningskvot för %s ÖVERSKRIDEN!\n" @@ -3157,7 +3181,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Fortsätter i bakgrunden, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Utdata kommer att skrivas till %s.\n" @@ -3202,64 +3226,62 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: kan inte ta status pÃ¥ %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "VARNING: använder ett svagt slumpfrö.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 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:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "Din OpenSSL-version är för gammal för att stödja TLSv1.1\n" +msgstr "Din OpenSSL-version är för gammal för att stödja TLS 1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: Ogiltig URL %s: %s\n" +msgstr "OpenSSL: Ogiltig chifferlista: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "Kunde inte sÃ¥ PRNG; överväg att använda --random-file.\n" +msgstr "VARNING: kunde inte sÃ¥ PRNG. Överväg att använda --random-file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Kunde inte lokalt verifiera utfärdarens auktoritet.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Självsignerat certifikat pÃ¥träffades.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Utfärdat certifikat är ännu inte giltigt.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Utfärdat certifikat har gÃ¥tt ut.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3268,14 +3290,14 @@ "%s: inget alternativt namn för certifikatnamnet matchar\n" "\tdet begärda värdnamnet %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, 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:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3286,7 +3308,7 @@ " 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:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3336,22 +3358,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Läser in robots.txt; ignorera fel.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fel vid tolkning av proxy-URL %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d omdirigeringar överskreds.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3359,7 +3381,7 @@ "Ger upp.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3431,99 +3453,112 @@ msgid "HTTPS support not compiled in" msgstr "HTTPS-stöd är inte inkompilerat" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "Ofullständig eller ogiltig multibyte-sekvens pÃ¥träffades\n" +msgstr "Ej konvertibel multibytesekvens pÃ¥träffades\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Fortsätter i bakgrunden, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Misslyckades med att initiera libcares\n" +msgstr "Misslyckades med att göra Fopen av en fil %s\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Misslyckades att sätta rättigheter pÃ¥ %s.\n" +msgstr "Misslyckades att hämta en FB för filen %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Misslyckades att sätta rättigheter pÃ¥ %s.\n" +msgstr "" +"Misslyckades att sätta ta status pÃ¥ filen %s, (kontrollera rättigheterna).\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Filen %s har ändrats sedan senaste kontrollen. Säkerhetskontrollen " +"misslyckades." -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Misslyckades att tolka IP-adressen â€%sâ€\n" +msgstr "Misslyckades att öppna filen %s, orsak :%s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Misslyckades att sätta rättigheter pÃ¥ %s.\n" +msgstr "Misslyckades att sätta ta status pÃ¥ filen %s, fel: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"Försöker öppna filen %s men den har ändrats sedan senaste kontrollen. " +"Säkerhetskontrollen misslyckades." -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Felaktigt reguljärt uttryck %s, PCRE2-fel %d\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Felaktigt reguljärt uttryck %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Fel vid matchning av %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "Hoppar över nyckel med fel storlek (%d/%d): %s\n" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Fel vid duplicering av WARC-filbekrivare.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Fel när GZIP-strömmen till WARC-filen öppnades.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Fel när warcinfo-posten till WARC-filen skrevs.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3532,24 +3567,24 @@ "Öppnar WARC-filen %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Fel när WARC-fil öppnades %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "CDX-filen listar inte original-url:er. (Kolumn â€a†saknas.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "CDX-filen listar inte original-url:er. (Kolumn â€k†saknas.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "CDX-filen listar inte original-url:er. (Kolumn â€u†saknas.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3564,52 +3599,34 @@ "Läste %d poster frÃ¥n CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Kunde inte läsa CDX-filen %s för att avduplicera.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Kunde inte öppna temporär WARC-förteckningsfil.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" "Kunde inte läsa temporär WARC-loggfil.\n" "\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Kunde inte öppna WARC-fil.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Kunde inte öppna CDX-filen för utmatning.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Kunde inte öppna temporär WARC-fil.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 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" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/tr.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/tr.gmo differ diff -Nru wget-1.19.5/po/tr.po wget-1.20.1/po/tr.po --- wget-1.19.5/po/tr.po 2018-05-06 16:48:24.000000000 +0000 +++ wget-1.20.1/po/tr.po 2018-12-26 20:10:50.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: 2017-06-27 09:52+0300\n" "Last-Translator: Muhammet Kara \n" "Language-Team: Turkish \n" @@ -237,17 +237,17 @@ msgid "Unmatched ) or \\)" msgstr "EÅŸleÅŸmeyen ) ya da \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Önceki düzenli ifade yok" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "veriyolu oluÅŸturulamıyor" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -311,7 +311,7 @@ msgid "failed: %s.\n" msgstr "olmadı: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: %s makine adresi çözümlenemedi\n" @@ -436,12 +436,12 @@ msgid "Length: %s" msgstr "Uzunluk: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) kalan" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s kalan" @@ -610,7 +610,7 @@ "%s diye bir dosya veya dizin yok.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s birden ortaya çıktı.\n" @@ -633,17 +633,17 @@ msgid "Data transfer aborted.\n" msgstr "Veri aktarımı kesildi.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "%s dosyası zaten orada; indirilmiyor.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(deneme: %2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -652,7 +652,7 @@ "%s (%s) - ÅŸuraya yazıldı stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -661,8 +661,8 @@ "%s (%s) - %s kaydedildi [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "%s kaldırılıyor.\n" @@ -759,160 +759,175 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "%s iptal ediliyor.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "%s iptal ediliyor.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s dışlandığı/dahil edilmediÄŸi için alçalmıyor.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "%s - %s eÅŸleÅŸtirmesinde hata: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Arama kriterine uygun sonuç bulunamadı %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, 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:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "HTML'leÅŸtirilen dizin %s içine yazıldı.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "HATA: %s dizini açılamıyor.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "HATA: %s sertifikası açılamıyor: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "CA sertifikası '%s' yüklendi\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "HATA: CRL dosyası '%s' yüklenemedi: (%d)\n" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "CRL dosyası '%s' yüklendi\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "OpenSSL versiyonunuz TLSv1.1'i destemek için çok eski.\n" + +#: src/gnutls.c:676 #, 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:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "HATA" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "DÄ°KKAT" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, 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:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: %s sertifikası güvenilir deÄŸil.\n" -#: src/gnutls.c:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: %s sertifikası bilinen bir yayımcıya ait deÄŸil.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: %s sertifikası iptal edilmiÅŸ.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, 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:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "X509 sertifikası baÅŸlatmada hata: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Hiçbir sertifika bulunamadı\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Sertifika çözümlenmesinde hata: %s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Sertifika henüz etkinleÅŸtirilmedi\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Sertifikanın kullanım süresi dolmuÅŸ\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Sertifika X.509 olmalıdır\n" @@ -952,11 +967,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "HTTP isteÄŸini yazma baÅŸarısız: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "BaÅŸlıklar eksik, HTTP/0.9 olduÄŸu varsayılıyor" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -965,11 +980,11 @@ "%s dosyası mevcut; tekrar indirilmiyor.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime baÅŸarısız. Bu muhtemelen bir hata(bug).\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -977,55 +992,55 @@ "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:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY veri dosyası %s kayıp: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, 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:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "BaÄŸlantı tekrar kullanılıyor: %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Vekilin yanıtı okunamadı: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s HATA %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Durum satırı bozuk" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Vekil tünellenemedi: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Kimlik tanımlama ÅŸeması bilinmiyor.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Kimlik doÄŸrulama seçildi: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Kayıt yeri: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1034,20 +1049,20 @@ "Ä°mza indirilirken:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Geçersiz pri deÄŸeri. %d varsayılıyor.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1055,42 +1070,42 @@ "Ãœst baÄŸlantı kaynakları için kabul edilebilir özet bulunamadı.\n" "Bunlar gözardı ediliyor.\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Ne olduÄŸu belirsiz hatalardan dolayı SSL iptal ediliyor.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s isteÄŸi gönderildi, yanıt bekleniyor... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Hiçbir veri alınmadı.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "BaÅŸlıklar okunurken hata (%s).\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(açıklama yok)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Yer: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "belirtilmeyen" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [izleyen]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1099,7 +1114,7 @@ "Dosya %s sunucuda deÄŸiÅŸmedi. Ä°ndirme atlanıyor.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1110,7 +1125,7 @@ "--no-if-modified-since seçeneÄŸini eklemek isteyebilirsiniz.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1120,81 +1135,81 @@ " Dosya zaten alınmıştı; birÅŸey yapılmadı.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Uzunluk: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "yoksayıldı" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Uyarı: HTTP ile genel arama karakterleri kullanılamaz.\n" -#: src/http.c:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "%s (%s) konumuna yazılamıyor.\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "Alınan BaÅŸlıktan gerekli nitelik eksik.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "Kullanıcı Adı/Parola Kimlik DoÄŸrulaması BaÅŸarısız.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "WARC dosyasına yazılamıyor.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Geçici WARC dosyasına yazılamıyor.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "SSL baÄŸlantısı kurulamıyor.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s (%s) baÄŸlantısı kesilemiyor.\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "HATA: Yönlendirmede (%d) yer belirtilmemiÅŸ.\n" -#: src/http.c:4458 +#: src/http.c:4464 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:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink baÅŸlıkları bulundu. Metalink moduna geçiliyor.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Uzak dosya bulunamıyor -- kırık adres!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified baÅŸlığı geçersiz -- zaman damgası yoksayıldı.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1203,16 +1218,16 @@ "Sunucudaki dosya yerel dosya %s ile aynı -- tekrar indirilmiyor.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Uzak dosya daha yeni, alınıyor.\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1222,7 +1237,7 @@ "getiriliyor.\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1230,7 +1245,7 @@ "Uzak dosya buluntu fakat herhangi bir baÄŸlantı içermiyor -- alınamıyor.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1240,7 +1255,7 @@ "fakat önyineleme devredışı -- alınamıyor.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1248,12 +1263,12 @@ "Uzak dosya mevcut.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1262,7 +1277,7 @@ "%s (%s) - stdout %s[%s/%s] içine yazıldı\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1271,58 +1286,58 @@ "%s (%s) - %s kaydedildi [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - %s baytta baÄŸlantı kesildi. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - %s. baytta okuma hatası (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - %s/%s baytta okuma hatası (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Desteklenmeyen koruma kalitesi '%s'.\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Desteklenmeyen algoritma '%s'.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s okunamadı (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, 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:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1333,7 +1348,7 @@ "'%s' dosyasını denetleyin,\n" "veya --config ile farklı bir dosya belirtin.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1344,47 +1359,47 @@ "'%s' dosyasını denetleyin,\n" "veya --config ile farklı bir dosya belirtin.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Geçersiz --execute komutu %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Geçersiz sayı %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s sadece bir defa kullanılmalı\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Geçersiz bayt deÄŸeri %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: %s geçersiz bir zaman aralığı\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1393,28 +1408,28 @@ "use-askpass bir karakter dizisi ya da WGET_ASKPASS veya SSH_ASKPASS ortam " "deÄŸiÅŸkenlerinden birinin ayarlanmasını gerektirir.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Geçersiz deÄŸer %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Geçersiz baÅŸlık bilgisi %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Geçersiz WARC baÅŸlığı %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Geçersiz süreç türü %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1428,16 +1443,16 @@ msgid "Encoding %s isn't valid\n" msgstr "%s kodlaması geçerli deÄŸil\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Tamamlanmamış veya geçersiz çoklu bayt dizisi ile karşılaşıldı\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Bilinmeyen hata kodu %d\n" @@ -1470,12 +1485,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; giriÅŸ iptalediliyor.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Kullanımı: %s [SEÇENEK]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1483,68 +1498,68 @@ "Uzun seçeneklerdeki zorunlu argümanlar kısa seçeneklerde de zorunludur.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "BaÅŸlangıç:\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help bu yardım metnini göster\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background arkaplanda baÅŸlatılır\n" -#: src/main.c:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Günlük kaydı ve girdi dosyası:\n" -#: src/main.c:608 +#: src/main.c:609 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:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=DOSYA iletileri DOSYAya ekle\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug çokça hata ayıklama bilgisi göster\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug Watt-32 hata ayıklama çıktısını yazdır\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet sessiz (çıktı yok)\n" -#: src/main.c:622 +#: src/main.c:623 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:624 +#: src/main.c:625 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:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1552,7 +1567,7 @@ " --report-speed=TÃœR bant geniÅŸliÄŸini TÃœR olarak çık. TÃœR bit " "olabilir\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1560,7 +1575,7 @@ " -i, --input-file=DOSYA yerelde ya da dışarıda bulunan DOSYA " "içerisindeki adresleri indir\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1568,11 +1583,11 @@ " --metalink-file=DOSYA yerel Metalink DOSYAsında belirtilen " "dosyaları indir\n" -#: src/main.c:634 +#: src/main.c:635 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:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1581,29 +1596,29 @@ "F)\n" " URL'ye baÄŸlı olarak\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=DOSYA kullanılacak yapılandırma dosyasını " "belirt\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" " --no-config herhangi bir yapılandırma dosyası okuma\n" -#: src/main.c:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Ä°ndirme:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1611,13 +1626,13 @@ " -t, --tries=SAYI yeniden deneme sayısını SAYI olarak ayarla " "(0 sınırsız)\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused baÄŸlantı reddedilse bile yeniden dene\n" -#: src/main.c:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " @@ -1626,11 +1641,11 @@ " --ignore-tags=LISTE gözardı edilen HTML etiketlerinin " "virgülle-ayrılmış listesi\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=DOSYA belgeleri DOSYAya yaz\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1638,7 +1653,7 @@ " -nc, --no-clobber varolan dostaların üzerine yazacak\n" " indirmeleri atla (dosyaları ezecek)\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1646,14 +1661,14 @@ msgstr "" " --no-config herhangi bir yapılandırma dosyası okuma\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" " -c, --continue parçalı-indirilen dosyayı indirmeye devam et\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1661,11 +1676,11 @@ " --start-pos=UZAKLIK indirmeyi sıfır-tabanlı pozisyon " "UZAKLIK'ından baÅŸlat\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TÃœR süreç ölçekleme TÃœRünü seç\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1673,7 +1688,7 @@ " --show-progress iÅŸlem çubuÄŸunu herhangi ayrıntı seviyesi " "modunda göster\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1683,7 +1698,7 @@ "yeniden\n" " indirme\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1694,7 +1709,7 @@ " if-modified-since parametresini " "kullanma\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1702,21 +1717,21 @@ " --no-use-server-timestamps yerel dosyanın zaman damgasını sunucu\n" " üzerindekine ayarlama\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response sunucunun yanıtını göster\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider hiçbir ÅŸey indirme\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1724,7 +1739,7 @@ " --dns-servers=ADRESLER sorgulanacak DNS sucunuları listesi " "(virgülle ayrılmış)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1732,31 +1747,31 @@ " --bind-dns-address=ADRES yerel makinede DNS çözücüyü ADRES (makine " "adı ya da IP) e baÄŸla\n" -#: src/main.c:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 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:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1764,7 +1779,7 @@ " --waitretry=SANÄ°YE bilgi çekme yeniden denemeleri arasında " "1 ..SANÄ°YE bekle\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1772,15 +1787,15 @@ " --random-wait bilgi çekmeler arasında " "0.5*WAIT...1.5*WAIT sn bekle\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy vekil sunucuyu kapat\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=SAYI alım kotasını SAYIya ayarla\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1788,15 +1803,15 @@ " --bind-address=ADRES yerel makinede ADRES (makine ismi ya da IP) e " "baÄŸlan\n" -#: src/main.c:709 +#: src/main.c:710 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:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache DNS ön belleklemesini kapat\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1804,7 +1819,7 @@ " --restrict-file-names=Ä°S dosya isimlerini Ä°ÅŸletim Sistemi'nin izin " "verdiÄŸi karakterlerle sınırla\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1812,15 +1827,15 @@ " --ignore-case dosya/dizin eÅŸleÅŸtirmesinde büyük/küçük " "harf ayrımını gözardı et\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only sadece IPv4 adreslere baÄŸlan\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only sadece IPv6 adreslere baÄŸlan\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1829,24 +1844,24 @@ " --prefer-family=AÄ°LE önce belirtilen ailedeki adreslere baÄŸlan,\n" " Pv6, IPv4, ya da none arasından biri\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password parola sor\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1864,29 +1879,29 @@ "SSH_ASKPASS \n" " ortam deÄŸiÅŸkenleri kullanılacaktır.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri IRI desteÄŸini kapat\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink dosyayı bozmadan önce kaldır\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1894,7 +1909,7 @@ " --keep-badhash checksum deÄŸerleri eÅŸleÅŸmeyen dosyaları " "koru (.badhash ekle)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1902,7 +1917,7 @@ " --metalink-index=SAYI Ãœst baÄŸlantı uygulaması/metalink4+xml üst " "url sıra SAYISI\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1910,7 +1925,7 @@ " --metalink-over-http HTTP yanıtı baÅŸlıklarından gelen Ãœst " "baÄŸlantı (Metalink) üst verilerini kullan\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1918,67 +1933,68 @@ " --preferred-location Ãœst baÄŸlantı (Metalink) kaynakları için " "tercih edilen konum\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr geniÅŸletilmiÅŸ dosya özelliklerinde " "üstveri depolamasını kapat\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Dizinler:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories dizin oluÅŸturma\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories dizin oluÅŸturulmasını zorla\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories istemci dizinleri oluÅŸturma\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories dizinlerde protokol ismi kullan\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=ÖNEK dosyaları ÖNEKe kaydet/..\n" -#: src/main.c:773 +#: src/main.c:774 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:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP seçenekleri:\n" -#: src/main.c:779 +#: src/main.c:780 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:781 +#: src/main.c:782 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:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache sunucu veri önbelleklemesine izin verme\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1986,7 +2002,7 @@ " --default-page=Ä°SÄ°M varsayılan ana sayfayı deÄŸiÅŸtir(normalde\n" " bu sayfa 'index.html'dir.)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1994,45 +2010,44 @@ " -E, --adjust-extension HTML/CSS belgelerini uygun uzantılarla " "kaydet\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length 'Content-Length' baÅŸlık alanını yoksay\n" -#: src/main.c:792 +#: src/main.c:793 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:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=TÃœR süreç ölçekleme TÃœRünü seç\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 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:800 +#: src/main.c:801 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:802 +#: src/main.c:803 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:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2040,17 +2055,17 @@ " --referer=URL HTTP isteÄŸine 'Referer: URL' baÅŸlığını da " "ekle\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers HTTP baÅŸlıklarını dosyaya kaydet\n" -#: src/main.c:808 +#: src/main.c:809 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:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2058,22 +2073,22 @@ " --no-http-keep-alive HTTP keep-alive (sürekli baÄŸlantı) özelliÄŸini " "kapat\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies çerezler kullanma.\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=DOSYA oturum sonrası çerezleri DOSYAya kaydet\n" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2081,7 +2096,7 @@ " --keep-session-cookies oturum (kalıcı-olmayan) çerezlerini yükle " "ve kaydet\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2089,7 +2104,7 @@ " --post-data=KARAKTERDÄ°ZÄ°SÄ° POST metodunu kullan; veri olarak " "KARAKTERDÄ°ZÄ°SÄ°ni gönder\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2097,13 +2112,13 @@ " --post-file=DOSYA POST metodunu kullan; veri olarak DOSYA " "içeriÄŸini gönder\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMetod istekteki \"HTTPMetod\" metodunu kullan\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2111,7 +2126,7 @@ " --body-data=KARAKTERDIZISI veri olarak KARAKTERDÄ°ZÄ°SÄ°ni " "gönder. --method ayalanmış OLMALIDIR\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2119,7 +2134,7 @@ " --body-file=DOSYA DOSYAnın içeriklerini gönder. --method " "AYARLANMALIDIR\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2129,14 +2144,14 @@ " --content-disposition Content-Disposition baÅŸlığını yerel\n" " dosya adları seçerken kabul et (DENEYSEL)\n" -#: src/main.c:833 +#: src/main.c:834 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:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2147,11 +2162,11 @@ " sunucu meydan okumasını beklemeden\n" " gönder\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) seçenekleri:\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2161,39 +2176,39 @@ " --secure-protocol=PR güvenlik protokolünü seç, auto, SSLv2,\n" " SSLv3, TLSv1 ve PFS'ten biri\n" -#: src/main.c:847 +#: src/main.c:848 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:849 +#: src/main.c:850 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:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=DOSYA istemci sertifika dosyası\n" -#: src/main.c:853 +#: src/main.c:854 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:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=DOSYA gizli anahtar dosyası\n" -#: src/main.c:857 +#: src/main.c:858 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:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=DOSYA CA paketini içeren dosya\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2201,11 +2216,11 @@ " --ca-directory=DÄ°ZÄ°N CA'ların hash listelerinin depolandığı " "dizin\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=DOSYA CRL paketlerini içeren dosya\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2222,7 +2237,7 @@ "sayıda,\n" " base64 ile ÅŸifrelenmiÅŸ sha256 karması\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2230,7 +2245,7 @@ " --random-file=DOSYA SSL PRNG'i beslemek için rastgele veri " "içeren dosya\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2238,7 +2253,7 @@ " --egd-file=FILE EGD soketini isimlendirmek için rastgele " "veri içeren dosya\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2248,26 +2263,26 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "HSTS seçenekleri:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts HSTS'i kapat\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" " --hsts-file HSTS veritabanı yolu (varsayılanı ezer)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP seçenekleri:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2275,36 +2290,36 @@ " --ftp-stmlf bütün ikili FTP dosyaları için Stream_LF " "biçimini kullan\n" -#: src/main.c:901 +#: src/main.c:902 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:903 +#: src/main.c:904 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:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing '.listing' dosyalarını silme\n" -#: src/main.c:907 +#: src/main.c:908 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:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp \"passive\" aktarma modunu kapat\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions uzak dosya izinlerini koru\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2312,11 +2327,11 @@ " --retr-symlinks yineleme sırasında, baÄŸlantılanan " "dosyaları getir (dizinler deÄŸil)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTP seçenekleri:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2324,7 +2339,7 @@ " --ftps-implicit dahili FTPS'i kullan (varsayılan port " "990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2334,7 +2349,7 @@ "kontrol baÄŸlantısında baÅŸlatılan\n" " SSL/TLS oturumunu devam ettir\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2342,7 +2357,7 @@ " --ftps-clear-data-connection sadece kontrol kanalını ÅŸifrele; " "bütün veri düz metin olacak\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2350,11 +2365,11 @@ " --ftps-fallback-to-ftp hedef sunucuda FTPS desteklenmiyorsa " "FTP kullan\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC seçenekleri:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2362,23 +2377,23 @@ " --warc-file=DOSYAADI istek/yanıt verisini bir .warc.gz " "dosyasına kaydet\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx CDX dizin dosyalarını yaz\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2386,17 +2401,17 @@ " --warc-dedup=DOSYAISMI bu CDX dosyasında listeli kayıtları " "kaydetme\n" -#: src/main.c:944 +#: src/main.c:945 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:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests SHA1 özetlerini hesaplama\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2404,7 +2419,7 @@ " --no-warc-keep-log günlük dosyasını bir WARC kaydında " "depolama\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2414,15 +2429,15 @@ "dosyalar\n" " için konum\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Yinelemeli indirme:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive yinelemeli indirmeyi etkinleÅŸtir\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2430,7 +2445,7 @@ " -l, --level=SAYI en fazla yineleme derinliÄŸi (sonsuz için " "inf ya da 0)\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2438,7 +2453,7 @@ " --delete-after indirdikten sonra dosyaları yerel olarak " "sil\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2448,7 +2463,7 @@ "baÄŸlantıları yerel\n" " dosyaları gösterecek ÅŸekilde deÄŸiÅŸtir\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2456,7 +2471,7 @@ " --convert-file-only URLlerde sadece dosya kısımlarını " "dönüştür (genellikle basename olarak bilinir)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2464,7 +2479,7 @@ " --backups=N X dosyasını yazmadan önce, N kadar yedek " "dosyası çevir\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2472,7 +2487,7 @@ " -K, --backup-converted X dosyasını dönüştürmeden önce, X_orig " "olarak yedekle\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2480,7 +2495,7 @@ " -K, --backup-converted X dosyasını dönüştürmeden önce, X.orig " "olarak yedekle\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2488,7 +2503,7 @@ " -m, --mirror -N -r -l inf--no-remove-listing için " "kısayol\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2496,7 +2511,7 @@ " -p, --page-requisites HTML sayfada gösterilmesi gerekenleri, " "bütün resimler vs. indir\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2504,11 +2519,11 @@ " --strict-comments HTTP yorumlarının sıkı ÅŸekilde ele " "alınmasını (SGML) aç\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Yinelemeli kabul/red seçenekleri:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2516,7 +2531,7 @@ " -A, --accept=LISTE kabul edilen uzantıların virgülle-" "ayrılmış listesi\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2524,48 +2539,48 @@ " -R, --reject=LISTE reddedilen uzantıların virgülle-ayrılmış " "listesi\n" -#: src/main.c:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 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:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TÃœR düzenli ifade türü (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 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:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2573,7 +2588,7 @@ " --follow-tags=LISTE takip edilen HTML etiketlerini virgülle-" "ayrılmış listesi\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2581,21 +2596,21 @@ " --ignore-tags=LISTE gözardı edilen HTML etiketlerinin " "virgülle-ayrılmış listesi\n" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts yinelemeli modda yabancı istemcilere git\n" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative sadece göreli baÄŸlantıları takip et\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTE izin verilen dizinlerin listesi\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2605,89 +2620,89 @@ "belirtilen\n" " ismi kullan\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LIST dışlanan dizinlerin listesi\n" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent bir üst dizine çıkma\n" -#: src/main.c:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions to \n" msgstr "" "Yazılım hatalarını ve önerilerinizi adresine bildirin\n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "%s kullanıcısının parolası: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Parola: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "veriyolu oluÅŸturulamıyor\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "'%s%s' için kullanıcı adı: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "'%s%s@%s' için kullanıcı parolası: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Yerel: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Derle: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "BaÄŸlantı: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2696,29 +2711,29 @@ "GNU Wget %s, %s üzerinde inÅŸa edildi.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (kullanıcı)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, 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:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2732,7 +2747,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2740,40 +2755,40 @@ "\n" "Özgün olarak Hrvoje Niksic tarafından yazıldı.\n" -#: src/main.c:1337 +#: src/main.c:1338 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:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Bellek tahsis sorunu\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "%s içindeki hata nedeniyle çıkılıyor\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, 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:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: seçenek uygun deÄŸil -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2782,7 +2797,7 @@ "--no-clobber ve --convert-links aynı anda belirtildi, sadece --convert-links " "kullanılacak.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2791,22 +2806,22 @@ "--no-clobber ve --convert-file-only aynı anda belirtildi, sadece -convert-" "file-only kullanılacak.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2817,7 +2832,7 @@ "-p veya -r ile birlikte belirtilemez. Ayrıntılar için kılavuza bakın.\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2828,7 +2843,7 @@ "belirteceÄŸiniz tek dosyaya kaydedilmesini saÄŸlar.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2839,7 +2854,7 @@ "kılavuza bakın.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2847,7 +2862,7 @@ "WARC çıktısı --no-clobber ile çalışamayacağından, --no-clobber devre dışı " "bırakılacak.\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2855,12 +2870,12 @@ "WARC çıktısı zaman damgası ile çalışamayacağından, zaman damgası devre dışı " "bırakılacak.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC çıktısı --spider ile çalışmaz.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2869,14 +2884,14 @@ "WARC çıktısı --continue ya da --start-pos ile çalışamayacağından, bunlar " "devre dışı bırakılacak.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, 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:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2885,12 +2900,12 @@ "WARC çıktısı --continue ya da --start-pos ile çalışamayacağından, bunlar " "devre dışı bırakılacak.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2899,17 +2914,17 @@ "Hem --start-pos hem de --continue belirtmek önerilmez; --continue devre dışı " "bırakılacak.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL kayıp\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2919,7 +2934,7 @@ "kullanamazsınız. --method, --body-data ve --body-file seçenekleri ile veri " "bekler\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2928,17 +2943,17 @@ "--body-data veya --body-file ile kullanılabilmesi için --method=HTTPMethod " "ile bir yöntem belirtmelisiniz.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, 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:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2947,7 +2962,7 @@ "birlikte\n" "kullanılabilir.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2957,42 +2972,42 @@ "dosyaya çıktı alınıyorsa birlikte\n" "kullanılabilir.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "libcares ilklendirilemedi\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "c-ares kanalı ilklendirilemedi\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "'%s' IP adresi çözümlenemedi\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "DNS sunucu(ları) '%s' (%d) ayarlanamadı\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "%s de URL yok.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ãœst baÄŸlantı dosyası %s çözümlenemedi.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3003,7 +3018,7 @@ "Toplam duvar saati zamanı: %s\n" "Ä°ndirilen: %d dosya, %s, %s (%s) içerisinde\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Dosya indirme kotası %s AÅžILDI!\n" @@ -3169,7 +3184,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Ä°ÅŸlem PID %lu ile artalanda sürüyor.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Çıktı ÅŸuraya yazılacak: %s.\n" @@ -3215,64 +3230,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: %s durumlanamadı: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "DÄ°KKAT: rasgele sayı üreteci yeterli deÄŸil.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Rasgele sayı üreteci tohumlanamadı; --random-file kullanılabilir.\n" -#: src/openssl.c:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "OpenSSL versiyonunuz TLSv1.1'i destemek için çok eski.\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: URL `%s' geçersiz: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "Rasgele sayı üreteci tohumlanamadı; --random-file kullanılabilir.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 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:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Kendinden imzalı sertifika tespit edildi.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Verilen sertifika henüz geçerli deÄŸil.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Verilen sertifikanın süresi dolmuÅŸ.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3281,14 +3296,14 @@ "%s: sertifika konu alternatif ismi istenen\n" "\tmakine adı %s ile eÅŸleÅŸmiyor.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, 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:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3299,7 +3314,7 @@ " Bu, olduÄŸunu iddia ettiÄŸi sunucu olmama göstergesi olabilir\n" " (gerçek %s deÄŸil demektir).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3350,22 +3365,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txt yükleniyor; lütfen hataları yoksayın.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Vekil URLsi %s çözümlenirken hata: %s\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Vekil URLsi %s: HTTP olmalı.\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d yönlendirme geçildi.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3373,7 +3388,7 @@ "Vazgeçiliyor.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3442,97 +3457,107 @@ msgid "HTTPS support not compiled in" msgstr "HTTPS desteÄŸi derlenirken eklenmemiÅŸ" -#: src/url.c:1604 +#: src/url.c:1603 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Tamamlanmamış veya geçersiz çoklu bayt dizisi ile karşılaşıldı\n" -#: src/utils.c:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Ardalanda sürüyor, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 +#: src/utils.c:865 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "libcares ilklendirilemedi\n" -#: src/utils.c:865 +#: src/utils.c:871 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "%s için izinler ayarlanamadı.\n" -#: src/utils.c:872 +#: src/utils.c:878 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "%s için izinler ayarlanamadı.\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "'%s' IP adresi çözümlenemedi\n" -#: src/utils.c:923 +#: src/utils.c:929 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "%s için izinler ayarlanamadı.\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Geçersiz düzenli ifade %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Geçersiz düzenli ifade %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "%s eÅŸleÅŸtirilirken hata: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "%s WARC dosyası açılırken hata.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "WARC dosyasına GZIP akışı açılırken hata.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "WARC dosyasına warcinfo kaydı yazılırken hata.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3541,24 +3566,24 @@ "%s WARC dosyası açılıyor.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "%s WARC dosyası açılırken hata.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "CDX dosyası özgün adresleri listelemiyor. ('a' sütunu eksik.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "CDX dosyası saÄŸlama toplamını listelemiyor. ('k' sütunu eksik.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "CDX dosyası kayıt kimliklerini listelemiyor ('u' sütunu eksik)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3570,32 +3595,32 @@ "CDX dosyasından %d kayıt yüklendi.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Yineleme kaldırması için %s CDX dosyası okunamadı.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Geçici WARC bildirim dosyası açılamadı.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Geçici WARC günlük dosyası açılamadı.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "WARC dosyası açılamadı.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "CDX dosyası çıktı için açılamadı.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Geçici WARC dosyası açılamadı.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "CDX dosyasında tam eÅŸleÅŸme bulundu. Tekrar ziyaret kaydı WARC'a " Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/uk.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/uk.gmo differ diff -Nru wget-1.19.5/po/uk.po wget-1.20.1/po/uk.po --- wget-1.19.5/po/uk.po 2018-05-06 16:48:24.000000000 +0000 +++ wget-1.20.1/po/uk.po 2018-12-26 20:10:50.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the wget package. # # Olexander Kunytsa , 2004. -# Yuri Chornoivan , 2012, 2013, 2015, 2016, 2017. +# Yuri Chornoivan , 2012, 2013, 2015, 2016, 2017, 2018. msgid "" msgstr "" -"Project-Id-Version: wget 1.18.109\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-01-17 19:30+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-13 21:07+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -19,7 +19,7 @@ "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: lib/error.c:195 msgid "Unknown system error" @@ -102,30 +102,30 @@ msgstr "Ðевідома помилка" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: параметр «%s» не Ñ” однозначним\n" +msgstr "%s: параметр «%s%s» не Ñ” однозначним\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: неоднозначний параметр '%s'; можливі варіанти:" +msgstr "%s: неоднозначний параметр «%s%s»; можливі варіанти:" # +option or -option #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: нерозпізнаний параметр '%c%s'\n" +msgstr "%s: нерозпізнаний параметр «%s%s»\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра '%c%s' не передбачено\n" +msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра «%s%s» не передбачено\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: до параметра '--%s' Ñлід додати аргумент\n" +msgstr "%s: до параметра «%s%s» Ñлід додати аргумент\n" #: lib/getopt.c:621 #, c-format @@ -235,17 +235,17 @@ msgid "Unmatched ) or \\)" msgstr "Ðеврівноважена дужка ) або \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Ðе виÑвлено попереднього формального виразу" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "не вдалоÑÑ Ñтворити канал" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -309,7 +309,7 @@ msgid "failed: %s.\n" msgstr "невдача: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: неможливо розв'Ñзати адреÑу вузла %s\n" @@ -434,12 +434,12 @@ msgid "Length: %s" msgstr "Довжина: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) залишилоÑÑŒ" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", %s залишилоÑÑŒ" @@ -612,7 +612,7 @@ "Файл чи каталог %s відÑутній.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s почав Ñвоє Ñ–ÑнуваннÑ.\n" @@ -635,17 +635,17 @@ msgid "Data transfer aborted.\n" msgstr "Передачу даних перервано.\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Файл %s вже Ñ” тут, не завантажуємо.\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(Ñпроба:%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -654,7 +654,7 @@ "%s (%s) - запиÑаний до stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -663,8 +663,8 @@ "%s (%s) - %s збережено [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Ð’Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ %s.\n" @@ -765,12 +765,22 @@ msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ðе виконуємо вхід до %s, оÑкільки його виключено або не включено.\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "ПропуÑкаємо %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Відкидаємо %s (некоректний запиÑ).\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s виключено або не включено на оÑнові формального виразу.\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Помилка вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ– %s %s: %s\n" @@ -778,153 +788,161 @@ # No luck. # #### This message SUCKS. We should see what was the # reason that nothing was retrieved. -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ðемає збігів з шаблоном %s.\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Покажчик у форматі HTML запиÑано до файла %s [%s].\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Покажчик у форматі HTML запиÑано до файла %s.\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ПОМИЛКÐ: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ каталог %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ПОМИЛКÐ: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñертифікат %s: (%d).\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Завантажено Ñертифікат CA «%s»\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ПОМИЛКÐ: не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ файл CRL «%s»: (%d).\n" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Завантажено файл CRL «%s»\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "ПОМИЛКÐ: GnuTLS вимагає, щоб ключ Ñ– Ñертифікат належали до одного типу.\n" -#: src/gnutls.c:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" +"Ваша верÑÑ–Ñ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÐ¸ GnuTLS Ñ” надто Ñтарою, підтримку TLS 1.3 у ній не " +"реалізовано\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -"GnuTLS: нереалізоване у програмі Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «secure-protocol», %d\n" +"GnuTLS: нереалізоване у програмі Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «secure-protocol», %u\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Будь лаÑка, повідомте про цю ваду за адреÑою bug-wget@gnu.org\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" "GnuTLS: нереалізоване у програмі Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «secure-protocol», %d\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" +"GnuTLS: не вдалоÑÑ Ð²Ñтановити Ñ€Ñдок prio безпоÑередньо. ПовертаємоÑÑ Ð´Ð¾ " +"типового Ñ€Ñ–Ð²Ð½Ñ Ð¿Ñ€Ñ–Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð½Ð¾ÑÑ‚Ñ–.\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "ПОМИЛКÐ" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "УВÐГÐ" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s не надано жодних Ñертифікатів.\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Сертифікат %s не довірений.\n" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" -msgstr "%s: Ñертифікат %s видано невідомим видавцем.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" +msgstr "%s: Ñертифікат %s не міÑтить даних щодо відомого програмі видавцÑ.\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Ñертифікат %s було відкликано.\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: підпиÑувачем Ñертифіката %s не Ñ” Ñлужба Ñертифікації.\n" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" "%s: Ñертифікат %s було підпиÑано за допомогою незахищеного алгоритму.\n" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Ñертифікат %s ще не активовано.\n" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Ñтрок дії Ñертифіката %s вичерпано.\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Помилка ініціалізації Ñертифікату X509: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Сертифікат не знайдено\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Помилка розбору Ñертифікату: %s.\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "Сертифікат ще не було активовано\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Сертифікат проÑтрочений\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð²Ð»Ð°Ñника Ñертифіката не відповідає назві вузла %s\n" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "Відкритий ключ не збігаєтьÑÑ Ñ–Ð· приєднаним відкритим ключем!\n" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Сертифікат має належати до типу X.509\n" @@ -964,11 +982,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Помилка запиÑу HTTP-запиту: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "ВідÑутні заголовки, припуÑкаєтьÑÑ, що це HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -977,11 +995,11 @@ "Файл '%s' вже Ñ” тут, не завантажуємо.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "Помилка gmtime. Ймовірно, маємо Ñправу із вадою у програмі.\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -989,55 +1007,55 @@ "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ чаÑову позначку у формат http. ВикориÑтовуємо Ñ‡Ð°Ñ 0, " "Ñк Ñ‡Ð°Ñ Ð²Ð½ÐµÑÐµÐ½Ð½Ñ Ð¾Ñтанніх змін.\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Ðе виÑтачає файла даних BODY %s: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Повторне викориÑÑ‚Ð°Ð½Ð½Ñ Ð·Ð²'Ñзку з [%s]:%d.\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Повторне викориÑÑ‚Ð°Ð½Ð½Ñ Ð·Ð²'Ñзку з %s:%d.\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Ðе вдалоÑÑŒ прочитати відповідь від прокÑÑ–: %s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ПОМИЛКР%d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "ÐеÑформований Ñ€Ñдок Ñтану" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Помилка Ñ‚ÑƒÐ½ÐµÐ»ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÐºÑÑ–-Ñервера: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Ðевідома Ñхема аутентифікації.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Вибраний ÑпоÑіб розпізнаваннÑ: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Зберігаємо до %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1046,21 +1064,21 @@ "Під Ñ‡Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Ðе вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ вміÑÑ‚ підпиÑу до тимчаÑового файла. ПропуÑкаємо.\n" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Ðе вдалоÑÑ Ñтворити тимчаÑовий файл. ПропуÑкаємо Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу.\n" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Ðекоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ pri. ПрипуÑкаємо Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %d.\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1068,42 +1086,42 @@ "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ прийнÑтну контрольну Ñуму Ð´Ð»Ñ Ñ€ÐµÑурÑів Metalink.\n" "Ігноруємо Ñ—Ñ….\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Вимикаємо SSL через помилки.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-запит надіÑлано, очікуємо на відповідь… " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Ðе отримано даних.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð² заголовках (%s).\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(без опиÑу)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "РозміщеннÑ: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "не вказано" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [перехід]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1112,7 +1130,7 @@ "Файл %s не змінено на Ñервері. ПропуÑкаємо процедуру отриманнÑ.\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1123,7 +1141,7 @@ "Ймовірно, Ñлід додати до команди параметр --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1136,62 +1154,62 @@ # 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:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Довжина: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "ігноруєтьÑÑ" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Увага: в HTTP не підтримуютьÑÑ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¸.\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "Увімкнено режим «павука». Перевірка, чи Ñ–Ñнує файл на віддаленому " "комп'ютері.\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Помилка запиÑу в %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "У отриманому заголовку не виÑтачає потрібного Ð´Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ атрибута.\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" "Спроба пройти Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð²Ð°Ð½Ð½Ñ Ð·Ð° іменем кориÑтувача Ñ– паролем зазнала " "невдачі.\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати дані до файла WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ тимчаÑового файла WARC.\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Ðе вдалоÑÑ Ð²Ñтановити SSL-з'єднаннÑ.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "неможливо видалити %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ПОМИЛКÐ: ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ (%d) без Ð²ÐºÐ°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð´Ñ€ÐµÑи.\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1199,23 +1217,23 @@ "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ дані Metalink у HTTP-відповіді. Отримуємо файл за " "допомогою GET HTTP.\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "ВиÑвлено заголовки Metalink. ПеремикаємоÑÑ Ñƒ режим Metalink.\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Віддалений файл не Ñ–Ñнує -- пошкоджене поÑиланнÑ!!!\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "ВідÑутній заголовок last-modified -- мітки чаÑу вимкнено.\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Ðекоректний заголовок last-modified -- ігноруємо мітки чаÑу.\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1224,17 +1242,17 @@ "Локальний файл %s новіший -- не завантажуємо його.\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Довжини файлів не збігаютьÑÑ (локальний %s) -- завантажуємо.\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "Файл новіший, ніж локальний, завантажуємо.\n" # Remote file is newer or sizes cannot be matched -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1246,7 +1264,7 @@ # Remote file is older, file sizes can be compared and # are both equal. -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1254,7 +1272,7 @@ "Віддалений файл Ñ–Ñнує, але не міÑтить поÑилань -- не завантажуємо.\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1264,7 +1282,7 @@ "але рекурÑÑ–ÑŽ вимкнено -- не завантажуємо.\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1272,12 +1290,12 @@ "Віддалений файл Ñ–Ñнує.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1286,7 +1304,7 @@ "%s (%s) - Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1295,58 +1313,59 @@ "%s (%s) - %s збережено [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¾ в позиції %s байт. " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð² позиції %s (%s)." -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð² позиції %s/%s (%s). " -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ðепідтримувана ÑкіÑÑ‚ÑŒ захиÑту «%s».\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ðепідтримуваний алгоритм «%s».\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" -msgstr "%s: WGETRC вказує на %s, що наÑправді не Ñ–Ñнує.\n" +msgstr "" +"%s: WGETRC вказує на %s, доÑтуп до Ñкого неможливий через таку помилку: %s.\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðеможливо прочитати %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Помилка в %s (Ñ€Ñдок %d).\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: помилка ÑинтакÑиÑу у %s (Ñ€Ñдок %d).\n" -#: src/init.c:713 +#: src/init.c:706 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Ðевідома команда %s в %s (Ñ€Ñдок %d).\n" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1358,7 +1377,7 @@ "«%s»,\n" "або вкажіть інший файл за допомогою --config.\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1369,48 +1388,48 @@ "«%s»,\n" "або вкажіть інший файл за допомогою --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Увага: Як ÑиÑтемний wgetrc так Ñ– wgetrc кориÑтувача вказують на %s.\n" -#: src/init.c:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: некоректна команда в --execute %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Ðекоректне булеве %s, вкажіть `on' чи `off'.\n" -#: src/init.c:1076 +#: src/init.c:1070 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: некоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s; мало бути «on», «off» або «quiet».\n" -#: src/init.c:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ðекоректне чиÑло %s.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s має бути викориÑтано лише один раз\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ðекоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±Ð°Ð¹Ñ‚Ð° %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ðекоректний період чаÑу %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1419,28 +1438,28 @@ "use-askpass потребує Ñ€Ñдка або вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— Ñередовища WGET_ASKPASS " "або SSH_ASKPASS.\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ðекоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ðекоректний заголовок %s.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: некоректний заголовок WARC, %s.\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ðекоректний тип ÑÑ‚Ð¸Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ñƒ поÑтупу %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1454,16 +1473,16 @@ msgid "Encoding %s isn't valid\n" msgstr "ÐšÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ %s Ñ” некоректним\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "ВиÑвлено неповну або некоректну багатобайтову поÑлідовніÑÑ‚ÑŒ\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Ðеопрацьована помилка (errno %d)\n" @@ -1496,12 +1515,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; вимикаємо протоколюваннÑ.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "ВикориÑтаннÑ: %s [ПÐРÐМЕТР]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1510,64 +1529,64 @@ "коротких.\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "ЗапуÑк:\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version показати дані щодо верÑÑ–Ñ— Wget Ñ– вийти\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help вивеÑти цю підказку\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background перейти в фоновий режим піÑÐ»Ñ Ð·Ð°Ð¿ÑƒÑку\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=КОМÐÐДРвиконати команду типу .wgetrc\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ñ‚Ð° вхідний файл:\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=ФÐЙЛ запиÑувати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñƒ ФÐЙЛ\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=ФÐЙЛ додавати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ ФÐЙЛа.\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug виводити багато діагноÑтичної " "інформації.\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug вивеÑти діагноÑтичні дані у форматі " "Watt-32\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr "" " -q, --quiet працювати без Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose докладне Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ (типове)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1575,7 +1594,7 @@ " -nv, --no-verbose вимкнути докладні повідомленнÑ, але не " "вимикати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ð·Ð°Ð³Ð°Ð»Ñ–.\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1583,7 +1602,7 @@ " --report-speed=ТИП вивеÑти ширину каналу у форматі ТИП. " "ТИПом може бути «bits».\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1591,7 +1610,7 @@ " -i, --input-file=ФÐЙЛ читати URL з локального або зовнішнього " "файла\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1599,12 +1618,12 @@ " --input-metalink=ФÐЙЛ файли Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñƒ локальному файлі " "Metalink\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr "" " -F, --force-html вважати файл вхідних даних файлом HTML\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1613,27 +1632,27 @@ "(-i -F)\n" " відноÑно адреÑи ÐДРЕСÐ.\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=FILE вказати файл налаштувань.\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" " --no-config не читати дані з файла налаштувань\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=ФÐЙЛ запиÑувати до журналу причини відмови в " "адреÑÑ– у ФÐЙЛі\n" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "ЗавантаженнÑ:\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1641,27 +1660,26 @@ " -t, --tries=ЧИСЛО обмежити кількіÑÑ‚ÑŒ повторних Ñпроб (0 — " "не обмежувати)\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused повторювати, навіть Ñкщо у з'єднанні " "відмовлено\n" -#: src/main.c:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -" --ignore-tags=СПИСОК розділений комами ÑпиÑок теґів HTML, Ñкі " -"Ñлід ігнорувати\n" +" --retry-on-http-error=ПОМИЛКИ ÑпиÑок відокремлених комами помилок " +"HTTP, Ñкі призводитимуть до повторних Ñпроб\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=ФÐЙЛ запиÑувати документи до ФÐЙЛа\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1669,15 +1687,15 @@ " -nc, --no-clobber пропуÑкати файли, Ñкі вже Ñ–Ñнують\n" " (не перезапиÑувати).\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -" --no-config не читати дані з файла налаштувань\n" +" --no-netrc не намагатиÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ реєÑтраційні дані " +"з .netrc\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1686,7 +1704,7 @@ "завантаженого\n" " файлу\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1694,13 +1712,13 @@ " --start-pos=ЗСУВ почати Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð· позиції ЗСУВ (відлік " "від нулÑ)\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=ТИП задати ТИП індикатора візуалізації\n" " процеÑу роботи\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1708,7 +1726,7 @@ " --progress=ТИП задати ТИП індикатора візуалізації\n" " процеÑу роботи\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1717,7 +1735,7 @@ " -N, --timestamping не завантажувати файли, Ñкі Ñтарші, ніж\n" " локальні\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1727,7 +1745,7 @@ "змінено-з\n" " у режимі чаÑових позначок\n" -#: src/main.c:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1736,20 +1754,20 @@ "локального\n" " файла за даними з Ñервера\n" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response виводити відповідь Ñервера\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider нічого не завантажувати\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=СЕКУÐДИ вÑтановити Ñ‡Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ñ–\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1757,7 +1775,7 @@ " --dns-servers=ÐДРЕСИ ÑпиÑок Ñерверів DNS Ð´Ð»Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ " "запитів (відокремлених комами)\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1766,28 +1784,28 @@ "адреÑою (назва вузла або IP)\n" " локального вузла\n" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=СЕКУÐДИ вÑтановити Ñ‡Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " "DNS\n" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=СЕКУÐДИ вÑтановити Ñ‡Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° з’єднаннÑ\n" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=СЕКУÐДИ вÑтановити Ñ‡Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° читаннÑ\n" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=СЕКУÐДИ вÑтановити затримку між завантаженнÑми\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1795,7 +1813,7 @@ " --waitretry=СЕКУÐД зачекати 1...СЕКУÐД між Ñпробами " "отриманнÑ\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1803,17 +1821,17 @@ " --random-wait зачекати 0.5*WAIT...1.5*WAIT cек. між " "Ñпробами\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy вимкнути прокÑÑ– Ñвним чином\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ЧИСЛО вÑтановити квоту Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñƒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " "ЧИСЛО\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1821,15 +1839,15 @@ " --bind-address=ÐДРЕСРприв'Ñзка до адреÑи (назва вузла або IP)\n" " локального вузла\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=ШВИДКІСТЬ обмежити швидкіÑÑ‚ÑŒ завантаженнÑ\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache вимкнути ÐºÐµÑˆÑƒÐ²Ð°Ð½Ð½Ñ DNS запитів\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1838,7 +1856,7 @@ "дозволеними\n" " у відповідній ОС\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1846,15 +1864,15 @@ " --ignore-case ігнорувати регіÑÑ‚Ñ€ при переглÑді\n" " файлів/каталогів\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only з'єднуватиÑÑŒ лише з IPv4 адреÑами\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only з'єднуватиÑÑŒ лише з IPv6 адреÑами\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1864,24 +1882,24 @@ "ÑімейÑтва\n" " адреÑ: IPv6, IPv4, або none\n" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=ІМ'Я вÑтановити ІМ'Я кориÑтувача Ð´Ð»Ñ ftp та " "http\n" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=ПÐРОЛЬ вÑтановити ПÐРОЛЬ кориÑтувача Ð´Ð»Ñ ftp та " "http\n" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password запитувати пароль\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1899,29 +1917,29 @@ "Ñередовища \n" " WGET_ASKPASS або SSH_ASKPASS.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri вимкнути підтримку IRI\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=КДРвикориÑтовувати локальне ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ ÐšÐ”Ð " "Ð´Ð»Ñ IRI\n" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=КДРвикориÑтовувати КДРÑк типове віддалене " "кодуваннÑ\n" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink вилучати файл до перезапиÑу\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1929,7 +1947,7 @@ " --keep-badhash не вилучати файли із невідповідними " "контрольними Ñумами (Ð´Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1937,7 +1955,7 @@ " --metalink-index=ЧИСЛО вказати порÑдковий номер метаадреÑи " "програми metalink або metalink4+xml\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1945,49 +1963,50 @@ " --metalink-over-http викориÑтовувати метадані Metalink із " "заголовків HTTP-відповіді\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location бажане міÑце Ð´Ð»Ñ Ñ€ÐµÑурÑів Metalink\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" " --no-xattr вимкнути Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ð¼ÐµÑ‚Ð°Ð´Ð°Ð½Ð¸Ñ… у " "розширених атрибутах файла\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "Каталоги:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories не Ñтворювати каталоги\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories примуÑове ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñ–Ð²\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" " -nH, --no-host-directories не Ñтворювати каталоги з назвами вузлів\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories викориÑтовувати назву протоколу у назвах " "каталогів\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIX зберігати файли в PREFIX/..\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1995,26 +2014,26 @@ " --cut-dirs=ЧИСЛО ігнорувати певне ЧИСЛО компонентів " "каталогу\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Параметри HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=ІМ'Я вÑтановити ІМ'Я http-кориÑтувача\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-password=ПÐРОЛЬ вÑтановити ПÐРОЛЬ Ð´Ð»Ñ http-запитів\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache заборонити ÐºÐµÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… на боці " "Ñервера\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2022,7 +2041,7 @@ " --default-page=ÐÐЗВРзмінити типову назву Ñторінки (зазвичай,\n" " назвою Ñ” «index.html».)\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2031,45 +2050,44 @@ "відповідним\n" " розширеннÑм\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ігнорувати поле заголовку `Content-" "Length'\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=РЯДОК вÑтавлÑти РЯДОК в HTTP-заголовки\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -" --progress=ТИП задати ТИП індикатора візуалізації\n" -" процеÑу роботи\n" +" --compression=ТИП вибрати ÑтиÑканнÑ; можливі Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ â€” " +"auto, gzip або none (типове: none)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect макÑимальна кількіÑÑ‚ÑŒ переÑпрÑмувань на " "Ñторінку\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=ІМ'Я вÑтановити ІМ'Я кориÑтувача Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐºÑÑ–-" "Ñервера\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=ПÐРОЛЬ вÑтановити ПÐРОЛЬ Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐºÑÑ–-Ñервера\n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2077,19 +2095,19 @@ " --referer=URL включити заголовок «Referer: URL» " "заголовок до HTTP-запиту\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers запиÑувати HTTP-заголовки до файла\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" " -U, --user-agent=ÐГЕÐТ задати ім'Ñ ÐГЕÐТа заміÑÑ‚ÑŒ Wget/ВЕРСІЯ\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2097,21 +2115,21 @@ " --no-http-keep-alive заборонити HTTP keep-alive (поÑтійні " "з'єднаннÑ)\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies не викориÑтовувати куки\n" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr " --load-cookies=ФÐЙЛ перед ÑеÑією брати куки з ФÐЙЛа\n" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=ФÐЙЛ в кінці ÑеÑÑ–Ñ— запиÑати куки у ФÐЙЛ\n" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2119,7 +2137,7 @@ " --keep-session-cookies завантажувати Ñ– зберігати (тимчаÑово) " "куки ÑеанÑів\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2127,7 +2145,7 @@ " --post-data=РЯДОК викориÑтовувати метод POST; надіÑлати " "РЯДОК Ñк дані\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2135,13 +2153,13 @@ " --post-file=ФÐЙЛ викориÑтовувати метод POST; надіÑлати " "вміÑÑ‚ ФÐЙЛа\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=МетодHTTP викориÑтовувати у запиті ÑпоÑіб «МетодHTTP»\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2149,7 +2167,7 @@ " --body-data=РЯДОК надіÑлати РЯДОК Ñк дані. ÐœÐЄ бути " "вÑтановлено --method\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2157,7 +2175,7 @@ " --body-file=ФÐЙЛ надіÑлати вміÑÑ‚ файла ФÐЙЛ. СЛІД " "вÑтановити параметр --method\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2169,7 +2187,7 @@ " Ñ‡Ð°Ñ Ð²Ð¸Ð±Ð¾Ñ€Ñƒ назв локальних файлів " "(ТЕСТОВРМОЖЛИВІСТЬ)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2177,7 +2195,7 @@ " --content-on-error виводити отримані дані у разі помилок з " "Ñервером\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2188,12 +2206,11 @@ "HTTP,\n" " не чекаючи на запит з Ñервера\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Параметри HTTPS (SSL/TLS):\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" @@ -2201,43 +2218,43 @@ msgstr "" " --secure-protocol=PR вибрати один із протоколів безпеки auto, " "SSLv2,\n" -" SSLv3, TLSv1 та PFS\n" +" SSLv3, TLSv1, TLSv1_1, TLSv1_2 та PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only переходити лише за безпечними поÑиланнÑми " "HTTPS\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate не перевірÑти Ñерверний Ñертифікат\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=ФÐЙЛ файл Ñертифіката клієнта\n" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE тип Ñертифіката клієнта, PEM або DER\n" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=ФÐЙЛ файл закритого ключа\n" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=ТИП тип закритого ключа, PEM або DER\n" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=ФÐЙЛ файл з комплектом CA\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2245,11 +2262,11 @@ " --ca-directory=КÐТÐЛОГ каталог, у Ñкому зберігаєтьÑÑ ÑпиÑок " "хешів Ñлужб Ñертифікації (CA)\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=ФÐЙЛ файл з комлектом CRL.\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2268,7 +2285,7 @@ "перевірки\n" " вузла\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2276,7 +2293,7 @@ " --random-file=ФÐЙЛ файл з пÑевдовипадковими даними Ð´Ð»Ñ " "Ñ–Ð½Ñ–Ñ†Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ PRNG SSL\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2284,7 +2301,7 @@ " --egd-file=ФÐЙЛ назва файла Ñокета EGD з " "пÑевдовипадковими даними\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2293,16 +2310,22 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=РЯДОК Ð’Ñтановити Ñ€Ñдок пріоритетноÑÑ‚Ñ– (GnuTLS) або " +"Ñ€Ñдок ÑпиÑку шифрів (OpenSSL) безпоÑередньо.\n" +" Будьте обережні: цей параметр має " +"пріоритет над --secure-protocol.\n" +" Формат та ÑинтакÑÐ¸Ñ Ñ€Ñдка залежать від " +"викориÑтаного Ñ€ÑƒÑˆÑ–Ñ SSL/TLS.\n" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "Параметри HSTS:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts вимкнути HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2310,11 +2333,11 @@ " --hsts-file шлÑÑ… до бази даних HSTS (перевизначає " "типовий)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Параметри FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2322,36 +2345,36 @@ " --ftp-stmlf викориÑтовувати формат Stream_LF Ð´Ð»Ñ Ð²ÑÑ–Ñ… " "бінарних файлів FTP\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=ІМ'Я вÑтановити ІМ'Я кориÑтувача Ð´Ð»Ñ ftp.\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" " --ftp-password=ПÐРОЛЬ вÑтановити ПÐРОЛЬ кориÑтувача Ð´Ð»Ñ ftp\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing не вилучати файли .listing\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob вимкнути універÑалізацію назв файлів FTP\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp вимкнути \"паÑивний\" тип передаваннÑ\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions зберігати права доÑтупу до файла\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2360,11 +2383,11 @@ "Ñимволічними\n" " поÑиланнÑми файли (не каталоги)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "Параметри FTPS:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2372,7 +2395,7 @@ " --ftps-implicit викориÑтовувати неÑвний FTPS (типовий " "порт -- 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2383,7 +2406,7 @@ " Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¾Ð±Ð¼Ñ–Ð½Ñƒ " "даними\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2391,7 +2414,7 @@ " --ftps-clear-data-connection шифрувати лише канал керуваннÑ; уÑÑ– " "дані передаватимутьÑÑ Ñƒ режимі проÑтого текÑту\n" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2399,11 +2422,11 @@ " --ftps-fallback-to-ftp викориÑтовувати FTP, Ñкщо на Ñервері " "не передбачено підтримки FTPS\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Параметри, пов'Ñзані з WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2411,23 +2434,23 @@ " --warc-file=ÐÐЗВÐ_ФÐЙЛРзберегти дані запиту Ñ– відповіді до " "файла .warc.gz\n" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=РЯДОК вÑтавити РЯДОК до запиÑу warcinfo\n" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=ЧИСЛО вÑтановити макÑимальний розмір файлів " "WARC у Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð§Ð˜Ð¡Ð›Ðž\n" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx запиÑувати файли покажчика CDX\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2435,18 +2458,18 @@ " --warc-dedup=ÐÐЗВÐ_ФÐЙЛРне зберігати запиÑи зі ÑпиÑку, " "визначеному у цьому файлі CDX\n" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression не ÑтиÑкати файли WARC за допомогою GZIP\n" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" " --no-warc-digests не обчиÑлювати контрольні Ñуми SHA1\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2454,7 +2477,7 @@ " --no-warc-keep-log не зберігати назви файла журналу у запиÑÑ– " "WARC\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2464,17 +2487,17 @@ "Ñтворених\n" " заÑобом запиÑу WARC\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "РекурÑивне завантаженнÑ:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr "" " -r, --recursive вÑтановити рекурÑивний режим " "завантаженнÑ\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2482,13 +2505,13 @@ " -l, --level=ЧИСЛО макÑимальна глибина рекурÑÑ–Ñ— (0 - без " "обмеженнÑ).\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after локально вилучити отримані файли.\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2499,7 +2522,7 @@ " так, щоб вони вказували на локальні " "файли\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2507,7 +2530,7 @@ " --convert-file-only перетворювати лише чаÑтину адреÑи, Ñка " "ÑтоÑуєтьÑÑ Ñ„Ð°Ð¹Ð»Ð° (зазвичай, Ñ—Ñ— називають «базовою назвою»)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2515,7 +2538,7 @@ " --backups=N до запиÑÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° X, поÑлідовно " "Ñтворити N файлів резервних копій\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2523,7 +2546,7 @@ " -K, --backup-converted до Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° X Ñтворити резервну " "копію X_orig\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2531,7 +2554,7 @@ " -K, --backup-converted до Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° X Ñтворити резервну " "копію X.orig\n" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2539,7 +2562,7 @@ " -m, --mirror Ñкорочена форма Ð´Ð»Ñ Ð½Ð°Ð±Ð¾Ñ€Ñƒ -N -r -l inf --" "no-remove-listing\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2547,7 +2570,7 @@ " -p, --page-requisites отримати вÑÑ– зображеннÑ, Ñ– Ñ‚.п. Ð´Ð»Ñ " "показу HTML\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2555,59 +2578,59 @@ " --strict-comments увімкнути жорÑтку (SGML) обробку " "коментарів HTML\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "РекурÑивне включеннÑ/Ð²Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=СПИСОК ÑпиÑок розширень на включеннÑ\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=СПИСОК ÑпиÑок розширень на виключеннÑ\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr " --accept-regex=ВИРÐЗ формальний вираз прийнÑтних адреÑ\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=ВИРÐЗ формальний вираз відкинутих адреÑ\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=ТИП тип формального виразу (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=ТИП тип формального виразу (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr " -D, --domains=СПИСОК ÑпиÑок дозволених доменів\n" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=СПИСОК ÑпиÑок виключених доменів відокремлених " "комами\n" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp переходити за поÑиланнÑми на реÑурÑи FTP " "з документів HTML\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2615,7 +2638,7 @@ " --follow-tags=СПИСОК розділений комами ÑпиÑок теґів HTML, за " "Ñким Ñлід здійÑнювати перехід\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2623,24 +2646,24 @@ " --ignore-tags=СПИСОК розділений комами ÑпиÑок теґів HTML, Ñкі " "Ñлід ігнорувати\n" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts переходити до інших вузлів під Ñ‡Ð°Ñ " "рекурÑивної обробки\n" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative переходити лише за відноÑними " "поÑиланнÑми\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" " -I, --include-directories=LIST вказати ÑпиÑок дозволених каталогів\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2649,95 +2672,97 @@ " --trust-server-names викориÑтовувати назву, вказану адреÑою\n" " переÑпрÑÐ¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ñтаннього компонента\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=LIST вказати ÑпиÑок виключених каталогів\n" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent не підніматиÑÑ Ð´Ð¾ батьківÑького каталогу\n" -#: src/main.c:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" msgstr "" -"ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилки та пропозиції надÑилайте до \n" +"ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилки, Ð¿Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ‚Ð° пропозиції надÑилайте до \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"Ñ–/або повідомте про вади тут: https://savannah.gnu.org/bugs/?" +"func=additem&group=wget.\n" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, Ðвтоматичний завантажувач файлів з мережі.\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Пароль Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувача %s:" -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Пароль:" -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Ðе вдалоÑÑ Ñтворити канал\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "Помилка під Ñ‡Ð°Ñ Ñпроби ініціалізувати дії з Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð´Ð»Ñ use-" "askpass: %d\n" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "Помилка під Ñ‡Ð°Ñ Ñпроби вÑтановити дії з Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð´Ð»Ñ use-askpass: " "%d\n" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ñ– від команди «%s %s»: %s\n" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача «%s%s»: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Пароль до «%s%s@%s»: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Локаль: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Збірка: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "ПоÑиланнÑ: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2746,29 +2771,29 @@ "GNU Wget %s, зібрано %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (Ñередовище)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (кориÑтувач)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "© Free Software Foundation, Inc., %s\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2784,7 +2809,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2792,39 +2817,39 @@ "\n" "Ðвтор: Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "" "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилки та пропозиції надÑилайте до .\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Проблема з розподілом пам’ÑÑ‚Ñ–\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "Завершуємо роботу через помилку у %s\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Спробуйте `%s --help' Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´ÐµÑ‚Ð°Ð»ÑŒÐ½Ð¾Ñ— інформації.\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: невірний параметр -- `-n%c'\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "Підтримку діагноÑтики не реалізовано під Ñ‡Ð°Ñ Ð·Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ. Ігноруємо прапорець --" "debug.\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2833,7 +2858,7 @@ "ОдночаÑно вказано --no-clobber Ñ– --convert-links, буде викориÑтано лише --" "convert-links.\n" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2842,22 +2867,22 @@ "ОдночаÑно вказано --no-clobber Ñ– -convert-file-only, буде викориÑтано лише -" "convert-file-only.\n" -#: src/main.c:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Режими verbose та quiet не можна викориÑтовувати одночаÑно.\n" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Режими підтримки міток чаÑу та Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ñтарих файлів неÑуміÑні.\n" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Ðе можливо вказати одночаÑно --inet4-only та --inet6-only.\n" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2870,7 +2895,7 @@ "(man).\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2880,7 +2905,7 @@ "буде розташовано у вказаному вами єдиному файлі.\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2890,14 +2915,14 @@ "відомоÑÑ‚Ñ– можна знайти на Ñторінці підручника (man).\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2905,12 +2930,12 @@ "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾ WARC не працює з викориÑтаннÑм чаÑових позначок, чаÑові " "позначки буде вимкнено.\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾ WARC не працює з параметром --spider.\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2919,7 +2944,7 @@ "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾ WARC не працює з параметром --continue або --start-pos. Їх буде " "вимкнено.\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2927,22 +2952,22 @@ "Контрольні Ñуми вимкнено; заÑоби ÑƒÐ½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ð´ÑƒÐ±Ð»ÑŽÐ²Ð°Ð½Ð½Ñ WARC не зможуть знайти " "запиÑи-дублікати.\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -"Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾ WARC не працює з параметром --continue або --start-pos. Їх буде " +"СтиÑÐºÐ°Ð½Ð½Ñ Ð½Ðµ працює з параметрами --continue Ñ– --start-pos. Їх буде " "вимкнено.\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" "Ðе можна одночаÑно викориÑтовувати параметри --ask-password Ñ– --password.\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2951,18 +2976,18 @@ "Ðе рекомендуємо викориÑтовувати одночаÑно --start-pos Ñ– --continue; --" "continue буде вимкнено.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: не вказано URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" "Ðе можна одночаÑно викориÑтовувати параметри --post-data Ñ– --post-file.\n" -#: src/main.c:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2972,7 +2997,7 @@ "--method потрібні дані, передані за допомогою параметрів --body-data Ñ– --" "body-file.\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2981,17 +3006,17 @@ "Вам Ñлід вказати метод за допомогою параметра --method=МетодHTTP, щоб " "ÑкориÑтатиÑÑ --body-data або --body-file.\n" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Ðе можна одночаÑно визначати --body-data Ñ– --body-file.\n" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Поточна верÑÑ–Ñ Ð½Ðµ має підтримки IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2999,7 +3024,7 @@ "-k або -r можна викориÑтовувати разом з -O, лише Ñкщо дані запиÑуютьÑÑ Ð´Ð¾ " "звичайного файла.\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3008,42 +3033,42 @@ "--convert-links Ñ– --convert-file-only можна викориÑтовувати разом, лише Ñкщо " "дані запиÑуютьÑÑ Ð´Ð¾ звичайного файла.\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Ðе вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Ðе вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ канал c-ares\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Ðе вдалоÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ IP-адреÑу «%s»\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Ðе вдалоÑÑ Ð²Ñтановити Ñервери DNS «%s» (%d)\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "Ð’ %s не знайдено поÑилань.\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ðе вдалоÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ файл метапоÑилань %s.\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ уÑÑ– реÑурÑи з %s.\n" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -3054,7 +3079,7 @@ "Загальний чаÑ: %s\n" "Завантажено: %d файлів, %s за %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "ВИЧЕРПÐÐО Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð½Ð° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ (%s)!\n" @@ -3223,7 +3248,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Продовжуємо у фоновому режимі, номер процеÑу %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ запиÑано до %s.\n" @@ -3268,76 +3293,74 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" "ПОПЕРЕДЖЕÐÐЯ: викориÑтовуєтьÑÑ Ñлабкий заÑіб ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñевдовипадкових " "чиÑел.\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Ðе вдалоÑÑ Ñтворити початкове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ PRNG. Вам варто ÑкориÑтатиÑÑ --random-" "file.\n" -#: src/openssl.c:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -"Ваша верÑÑ–Ñ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÐ¸ OpenSSL Ñ” надто Ñтарою, підтримку TLSv1.1 у ній не " +"Ваша верÑÑ–Ñ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÐ¸ OpenSSL Ñ” надто Ñтарою, підтримку TLSv1.3 у ній не " "реалізовано\n" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" "Ваша верÑÑ–Ñ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÐ¸ OpenSSL Ñ” надто Ñтарою, підтримку TLSv1.1 у ній не " "реалізовано\n" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" "Ваша верÑÑ–Ñ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÐ¸ OpenSSL Ñ” надто Ñтарою, підтримку TLSv1.2 у ній не " "реалізовано\n" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: не реалізоване Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «secure-protocol», %d\n" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: Ðекоректний URL %s: %s\n" +msgstr "OpenSSL: некоректний ÑпиÑок шифрів: %s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "" -"Ðе вдалоÑÑ Ñтворити початкове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ PRNG. Вам варто ÑкориÑтатиÑÑ --random-" -"file.\n" +"УВÐГÐ: не вдалоÑÑ Ñтворити початкове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ PRNG. Вам варто ÑкориÑтатиÑÑ --" +"random-file.\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸ Ñертифікат %s, випущений %s:\n" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Ðеможливо локально перевірити чинніÑÑ‚ÑŒ запиÑу видавцÑ.\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " ВиÑвлено ÑамопідпиÑаний Ñертифікат.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " Виданий Ñертифікат ще не дійÑний.\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " Виданий Ñертифікат проÑтрочений.\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3346,7 +3369,7 @@ "%s: жоден з варіантів Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñертифіката не\n" "\tвідповідає потрібній назві вузла, %s.\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3354,7 +3377,7 @@ " %s: загальна назва об’єкта Ñертифікації, %s, не відповідає потрібній " "назві вузла %s.\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3365,7 +3388,7 @@ " Це може означати, що автентичніÑÑ‚ÑŒ вузла викликає Ñумніви\n" " (тобто це наÑправді не %s).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -3416,22 +3439,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Завантажуємо файл robots.txt; не зважайте на помилки.\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Помилка розбору адреÑи прокÑÑ– %s: %s.\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Помилка в адреÑÑ– прокÑÑ–-Ñервера %s: має бути HTTP.\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d зациклень - більше, ніж допуÑтимо.\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3439,7 +3462,7 @@ "Ðварійне завершеннÑ.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3517,98 +3540,111 @@ msgid "HTTPS support not compiled in" msgstr "Підтримку HTTPS не Ñкомпільовано" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "ВиÑвлено неповну або некоректну багатобайтову поÑлідовніÑÑ‚ÑŒ\n" +msgstr "ВиÑвлено непридатну до Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð±Ð°Ð³Ð°Ñ‚Ð¾Ð±Ð°Ð¹Ñ‚Ð¾Ð²Ñƒ поÑлідовніÑÑ‚ÑŒ\n" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Ðе вдалоÑÑ Ð²Ð¸Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ доÑтатньо пам'ÑÑ‚Ñ–; недоÑтатньо пам'ÑÑ‚Ñ–.\n" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Ðе вдалоÑÑ Ð²Ð¸Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ %ld байт; недоÑтатньо пам'ÑÑ‚Ñ–.\n" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: текÑтовий буфер завеликий (%d байт), перериваємо обробку.\n" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Продовжуємо у фоновому режимі, номер процеÑу %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Ðе вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ libcares\n" +msgstr "Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Fopen Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %s\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Ðе вдалоÑÑ Ð²Ñтановити права доÑтупу Ð´Ð»Ñ %s.\n" +msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ FD файла %s\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Ðе вдалоÑÑ Ð²Ñтановити права доÑтупу Ð´Ð»Ñ %s.\n" +msgstr "" +"Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ ÑтатиÑтичні дані файла %s, (перевірте права доÑтупу)\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" +"Файл %s було змінено з чаÑу оÑтанньої перевірки. Перевірку безпеки не " +"пройдено." -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Ðе вдалоÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ IP-адреÑу «%s»\n" +msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл %s, причина: %s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Ðе вдалоÑÑ Ð²Ñтановити права доÑтупу Ð´Ð»Ñ %s.\n" +msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ ÑтатиÑтичні дані щодо файла %s, помилка: %s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" +"Було виконано Ñпробу відкрити файл %s, але його було змінено з моменту " +"оÑтанньої перевірки. Перевірку безпеки не пройдено." + +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Ðекоректний формальний вираз %s, помилка PCRE2 %d\n" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Ðекоректний формальний вираз %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ– %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "ПропуÑкаємо ключ із помилковим розміром (%d з %d): %s\n" + +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби Ð´ÑƒÐ±Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ð´ÐµÑкриптора файла WARC.\n" -#: src/warc.c:223 +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби відкрити потік даних GZIP до файла WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби запиÑу warcinfo до файла WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3617,27 +3653,27 @@ "Відкриваємо файл WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби відкрити файл WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" "У файлі CDX немає ÑпиÑку початкових адреÑ. (Ðе вказано Ñтовпчик «a».)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "У файлі CDX немає ÑпиÑку контрольних Ñум. (Ðе вказано Ñтовпчик «k».)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" "У файлі CDX немає ÑпиÑку ідентифікаторів запиÑів. (Ðе вказано Ñтовпчик " "«u».)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3658,94 +3694,33 @@ "З CDX завантажено %d запиÑ.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл CDX %s Ð´Ð»Ñ ÑƒÑÑƒÐ²Ð°Ð½Ð½Ñ Ð´ÑƒÐ±Ð»ÑŽÐ²Ð°Ð½Ð½Ñ.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ тимчаÑовий файл маніфеÑту WARC.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ тимчаÑовий файл журналу WARC.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл CDX Ð´Ð»Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ….\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ тимчаÑовий файл WARC.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 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" - -# --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 "Invalid UTF-8 sequence: %s\n" -#~ msgstr "Ðекоректна поÑлідовніÑÑ‚ÑŒ UTF-8: %s\n" - -#~ msgid "idn_decode failed (%d): %s\n" -#~ msgstr "Помилка у idn_decode (%d): %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "отримано %s.\n" - -#~ msgid "Authorization failed.\n" -#~ msgstr "ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ Ð½Ðµ вдалаÑÑŒ.\n" - -#~ msgid "" -#~ " --retries specify the number of retries for a " -#~ "file.\n" -#~ " (needs to be used with --metalink-file)\n" -#~ msgstr "" -#~ " --retries вказати кількіÑÑ‚ÑŒ повторних Ñпроб Ð´Ð»Ñ " -#~ "файла.\n" -#~ " (Ñлід викориÑтовувати разом з --metalink-" -#~ "file)\n" - -#~ msgid " --jobs specify how many threads use.\n" -#~ msgstr "" -#~ " --jobs визначити кількіÑÑ‚ÑŒ потоків обробки " -#~ "даних.\n" - -#~ msgid "" -#~ "Username and password information not needed to be " -#~ "specified when downloading from a metalink.\n" -#~ msgstr "" -#~ "Під Ñ‡Ð°Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð° метапоÑиланнÑм не потрібно вказувати Ñ–Ð¼â€™Ñ " -#~ "кориÑтувача Ñ– пароль.\n" - -#~ msgid "%s can not be used with --metalink.\n" -#~ msgstr "%s не можна викориÑтовувати разом з --metalink.\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/vi.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/vi.gmo differ diff -Nru wget-1.19.5/po/vi.po wget-1.20.1/po/vi.po --- wget-1.19.5/po/vi.po 2018-05-06 16:48:24.000000000 +0000 +++ wget-1.20.1/po/vi.po 2018-12-26 20:10:50.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+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" @@ -237,17 +237,17 @@ msgid "Unmatched ) or \\)" msgstr "ChÆ°a khá»›p “)†hoặc “\\)â€" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "Không có biểu thức chính quy nằm trÆ°á»›c" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "không thể tạo ống dẫn" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -311,7 +311,7 @@ msgid "failed: %s.\n" msgstr "gặp lá»—i: %s.\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, 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" @@ -434,12 +434,12 @@ msgid "Length: %s" msgstr "Kích thÆ°á»›c: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr ", còn lại %s (%s)" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr ", còn %s" @@ -608,7 +608,7 @@ "Không có tập tin hay thÆ° mục tên %s.\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s xuất hiện bất thình lình.\n" @@ -631,17 +631,17 @@ msgid "Data transfer aborted.\n" msgstr "Truyá»n tải dữ liệu bị bãi bá».\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, 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:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(lần thá»­: %2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -650,7 +650,7 @@ "%s (%s) — ghi vào đầu ra tiêu chuẩn %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -659,8 +659,8 @@ "%s (%s) — đã lÆ°u %s [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "Äang xóa %s.\n" @@ -757,159 +757,174 @@ 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:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "Từ chối %s.\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, fuzzy, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "Từ chối %s.\n" + +#: src/ftp.c:2631 +#, fuzzy, c-format +msgid "%s is excluded/not-included through regex.\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:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Lá»—i khá»›p %s vá»›i %s: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, 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:2755 +#: src/ftp.c:2757 #, 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:2760 +#: src/ftp.c:2762 #, 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:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "Lá»–I: Không thể mở thÆ° mục %s.\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, 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:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Chứng nhận CA đã tải “%sâ€\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, 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:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Tập tin CRL đã tải “%sâ€\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 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:576 +#: src/gnutls.c:664 src/gnutls.c:728 +#, fuzzy +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "Phiên bản OpenSSL của bạn quá cÅ© để há»— trợ TLSv1.1\n" + +#: src/gnutls.c:676 #, 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:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 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:614 +#: src/gnutls.c:733 #, 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:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "Lá»–I" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "CẢNH BÃO" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, 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:807 +#: src/gnutls.c:931 #, 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:808 -#, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +#: src/gnutls.c:932 +#, fuzzy, c-format +msgid "%s: The certificate of %s doesn't have 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:809 +#: src/gnutls.c:933 #, 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:810 +#: src/gnutls.c:934 #, 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:811 +#: src/gnutls.c:935 #, 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:812 +#: src/gnutls.c:936 #, 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:813 +#: src/gnutls.c:937 #, 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:825 +#: src/gnutls.c:949 #, 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:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "Không tìm thấy chứng nhận nào\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, 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:848 +#: src/gnutls.c:972 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:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "Chứng nhận đã hết hạn dùng\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, 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:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 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:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "Giấy chứng nhận phải có định dạng X.509\n" @@ -949,11 +964,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "Lá»—i ghi yêu cầu HTTP: %s.\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "Không có phần đầu, coi là HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -962,11 +977,11 @@ "Tập tin %s đã sẵn có nên không nhận nữa.\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 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:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -974,55 +989,55 @@ "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:1995 +#: src/http.c:1998 #, 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:2087 +#: src/http.c:2090 #, 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:2092 +#: src/http.c:2095 #, 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:2158 +#: src/http.c:2161 #, 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:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s Lá»–I %d: %s.\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "Dòng trạng thái sai dạng" -#: src/http.c:2190 +#: src/http.c:2193 #, 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:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "Không hiểu lược đồ xác thá»±c.\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "Xác thá»±c đã chá»n: %s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "Äang ghi vào: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1031,20 +1046,20 @@ "Khi Ä‘ang tải chữ ký:\n" "%s: %s.\n" -#: src/http.c:2830 +#: src/http.c:2833 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:2853 +#: src/http.c:2856 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:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, 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:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1052,49 +1067,49 @@ "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:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "Tắt SSL vì gặp lá»—i.\n" -#: src/http.c:3352 +#: src/http.c:3355 #, 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:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "Không nhận được dữ liệu.\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Lá»—i Ä‘á»c (%s) trong phần đầu.\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(không mô tả)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "Äịa Ä‘iểm: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "không xác định" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [theo]" -#: src/http.c:3880 +#: src/http.c:3883 #, 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:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1105,7 +1120,7 @@ "Bạn có lẽ nên thêm tùy chá»n --no-if-modified-since.\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1115,58 +1130,58 @@ " Äã nhận tập tin đầy đủ; không cần làm gì nữa.\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "Kích thÆ°á»›c: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "bá» qua" -#: src/http.c:4215 +#: src/http.c:4208 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:4297 +#: src/http.c:4290 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:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Không thể ghi vào %s (%s).\n" -#: src/http.c:4398 +#: src/http.c:4404 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:4403 +#: src/http.c:4409 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:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "Không thể ghi vào tập tin WARC.\n" -#: src/http.c:4415 +#: src/http.c:4421 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:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "Không thiết lập được kết nối SSL.\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Không thể hủy liên kết %s (%s).\n" -#: src/http.c:4436 +#: src/http.c:4442 #, 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:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1174,23 +1189,23 @@ "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:4467 +#: src/http.c:4473 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:4507 +#: src/http.c:4514 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:4534 +#: src/http.c:4542 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:4542 +#: src/http.c:4550 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:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1199,16 +1214,16 @@ "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:4580 +#: src/http.c:4588 #, 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:4589 +#: src/http.c:4597 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:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1218,7 +1233,7 @@ "Ä‘ang lấy vá».\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1226,7 +1241,7 @@ "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:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1236,7 +1251,7 @@ "nhÆ°ng đệ quy bị tắt -- không lấy vá».\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1244,12 +1259,12 @@ "Tập tin trên máy chủ đã sẵn có.\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1258,7 +1273,7 @@ "%s (%s) — ghi vào đầu ra chuẩn %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1267,58 +1282,58 @@ "%s (%s) — đã lÆ°u %s [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, 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:4772 +#: src/http.c:4780 #, 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:4781 +#: src/http.c:4789 #, 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:5019 +#: src/http.c:5027 #, 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:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Không há»— trợ thuật toán “%sâ€.\n" -#: src/init.c:585 +#: src/init.c:579 #, 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:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Không Ä‘á»c được %s (%s).\n" -#: src/init.c:702 +#: src/init.c:695 #, 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:708 +#: src/init.c:701 #, 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:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1329,7 +1344,7 @@ "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:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1340,49 +1355,49 @@ "“%sâ€,\n" "hay chỉ định má»™t tập tin khác sá»­ dụng tùy chá»n --config.\n" -#: src/init.c:783 +#: src/init.c:776 #, 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:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Câu lệnh “--execute†không đúng %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, 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:1076 +#: src/init.c:1070 #, 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:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Số %s sai.\n" -#: src/init.c:1178 +#: src/init.c:1172 #, 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:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Giá trị byte %s sai.\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Khoảng thá»i gian %s sai.\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1391,28 +1406,28 @@ "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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Giá trị %s sai.\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Phần đầu %s sai.\n" -#: src/init.c:1536 +#: src/init.c:1530 #, 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:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Sai kiểu tiến Ä‘á»™ %s.\n" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1426,16 +1441,16 @@ msgid "Encoding %s isn't valid\n" msgstr "Bảng mã %s không hợp lệ\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 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:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "Mã lá»—i %d không được xá»­ lý\n" @@ -1468,12 +1483,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; không ghi nhật ký.\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Cách dùng: %s [TÙY CHỌN]… [URL]…\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1481,74 +1496,74 @@ "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:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "Khởi Ä‘á»™ng:\n" -#: src/main.c:596 +#: src/main.c:597 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:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help hiển thị trợ giúp này.\n" -#: src/main.c:600 +#: src/main.c:601 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:602 +#: src/main.c:603 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:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "Tập tin nhật ký và đầu vào:\n" -#: src/main.c:608 +#: src/main.c:609 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:610 +#: src/main.c:611 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:613 +#: src/main.c:614 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:617 +#: src/main.c:618 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:620 +#: src/main.c:621 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:622 +#: src/main.c:623 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:624 +#: src/main.c:625 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:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1557,7 +1572,7 @@ "KIỂU.\n" " KIỂU có thể là các bít.\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1565,7 +1580,7 @@ " -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:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1573,11 +1588,11 @@ " --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:634 +#: src/main.c:635 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:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1586,51 +1601,51 @@ "-F)\n" " tÆ°Æ¡ng đối so vá»›i URL này\n" -#: src/main.c:639 +#: src/main.c:640 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:641 +#: src/main.c:642 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:643 +#: src/main.c:644 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:647 +#: src/main.c:648 msgid "Download:\n" msgstr "Tải vá»:\n" -#: src/main.c:649 +#: src/main.c:650 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:651 +#: src/main.c:652 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:653 +#: src/main.c:654 #, fuzzy msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr " --ignore-tags=DANH-SÃCH những thẻ HTML bị bá» qua\n" -#: src/main.c:655 +#: src/main.c:656 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:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1639,7 +1654,7 @@ "tin\n" " đã có (ghi đè lên chúng).\n" -#: src/main.c:660 +#: src/main.c:661 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1647,7 +1662,7 @@ msgstr "" " --no-config đừng Ä‘á»c bất kỳ tập tin cấu hình nào\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1655,7 +1670,7 @@ " -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:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1663,17 +1678,17 @@ " --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:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=KIỂU chá»n dạng mô tả tiến Ä‘á»™.\n" -#: src/main.c:668 +#: src/main.c:669 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:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1682,7 +1697,7 @@ " -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:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1691,7 +1706,7 @@ " --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:676 +#: src/main.c:677 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1701,20 +1716,20 @@ " tùy theo nhãn thá»i gian trên máy phục " "vụ.\n" -#: src/main.c:679 +#: src/main.c:680 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:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider không tải xuống gì hết.\n" -#: src/main.c:683 +#: src/main.c:684 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:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1722,7 +1737,7 @@ " --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:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1730,32 +1745,32 @@ " --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:691 +#: src/main.c:692 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:693 +#: src/main.c:694 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:695 +#: src/main.c:696 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:697 +#: src/main.c:698 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:699 +#: src/main.c:700 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:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1763,16 +1778,16 @@ " --random-wait chá» 0.5*WAIT…1.5*WAIT giây giữa hai lần " "lấy.\n" -#: src/main.c:703 +#: src/main.c:704 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:705 +#: src/main.c:706 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:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1780,18 +1795,18 @@ " --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:709 +#: src/main.c:710 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:711 +#: src/main.c:712 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:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1799,7 +1814,7 @@ " --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:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1808,15 +1823,15 @@ "mẫu\n" " tin/thÆ° mục.\n" -#: src/main.c:718 +#: src/main.c:719 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:720 +#: src/main.c:721 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:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1827,23 +1842,23 @@ " má»™t trong IPv6, IPv4, hoặc none " "(không).\n" -#: src/main.c:726 +#: src/main.c:727 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:728 +#: src/main.c:729 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:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password nhắc nhập mật khẩu.\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1861,29 +1876,29 @@ "SSH_ASKPASS \n" " sẽ được dùng.\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri tắt há»— trợ IRI.\n" -#: src/main.c:739 +#: src/main.c:740 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:741 +#: src/main.c:742 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:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink gỡ bá» tập tin trÆ°á»›c khi ghi đè.\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1891,7 +1906,7 @@ " --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:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1899,7 +1914,7 @@ " --metalink-index=Sá» Sá» thứ tá»± Metalink application/" "metalink4+xml metaurl\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1907,71 +1922,72 @@ " --metalink-over-http dùng siêu dữ liệu Metalink từ phần đầu " "HTTP trả vá»\n" -#: src/main.c:752 +#: src/main.c:753 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:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" 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:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "ThÆ° mục:\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories không tạo thÆ° mục.\n" -#: src/main.c:765 +#: src/main.c:766 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:767 +#: src/main.c:768 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:769 +#: src/main.c:770 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:771 +#: src/main.c:772 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:773 +#: src/main.c:774 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:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "Tùy chá»n HTTP:\n" -#: src/main.c:779 +#: src/main.c:780 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:781 +#: src/main.c:782 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:783 +#: src/main.c:784 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:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1979,7 +1995,7 @@ " --default-page=TÊN thay đổi TÊN trang mặc định\n" " (bình thÆ°á»ng là “index.htmlâ€.).\n" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1987,44 +2003,43 @@ " -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:790 +#: src/main.c:791 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:792 +#: src/main.c:793 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:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=KIỂU chá»n dạng mô tả tiến Ä‘á»™.\n" +msgstr "" -#: src/main.c:798 +#: src/main.c:799 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:800 +#: src/main.c:801 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:802 +#: src/main.c:803 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:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2032,11 +2047,11 @@ " --referer=URL thêm phần đầu “Referer: URL†vào yêu cầu " "HTTP.\n" -#: src/main.c:806 +#: src/main.c:807 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:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2044,30 +2059,30 @@ " -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:810 +#: src/main.c:811 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:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies không dùng cookies.\n" -#: src/main.c:814 +#: src/main.c:815 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:816 +#: src/main.c:817 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:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2075,7 +2090,7 @@ " --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:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2083,7 +2098,7 @@ " --post-data=CHUá»–I dùng phÆ°Æ¡ng pháp POST; gá»­i CHUá»–I làm dữ " "liệu.\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2091,14 +2106,14 @@ " --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:824 +#: src/main.c:825 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:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2106,7 +2121,7 @@ " --body-data=CHUá»–I gá»­i CHUá»–I làm dữ liệu. --method phải được " "đặt.\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2114,7 +2129,7 @@ " --body-file=TẬP-TIN gá»­i ná»™i dung của TẬP-TIN. --method phải " "được đặt.\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2126,7 +2141,7 @@ "cục bá»™\n" " (THỬ NGHIỆM)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2134,7 +2149,7 @@ " --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:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2144,11 +2159,11 @@ " --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:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Tùy chá»n HTTPS (SSL/TLS):\n" -#: src/main.c:844 +#: src/main.c:845 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2158,55 +2173,55 @@ " --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:847 +#: src/main.c:848 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:849 +#: src/main.c:850 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:851 +#: src/main.c:852 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:853 +#: src/main.c:854 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:855 +#: src/main.c:856 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:857 +#: src/main.c:858 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:859 +#: src/main.c:860 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:861 +#: src/main.c:862 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:863 +#: src/main.c:864 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:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2224,7 +2239,7 @@ " để kiểm tra lại căn cứ vào mạng ngang " "hàng\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2232,14 +2247,14 @@ " --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:875 +#: src/main.c:876 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:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2249,15 +2264,15 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "Tùy chá»n HSTS:\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts tắt HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2265,11 +2280,11 @@ " --hsts-file Ä‘Æ°á»ng dẫn của cÆ¡ sở dữ liệu HSTS (sẽ ghi " "đè theo mặc định)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "Tùy chá»n FTP:\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2277,38 +2292,38 @@ " --ftp-stmlf dùng định dạng Stream_LF cho má»i tập tin " "FTP nhị phân.\n" -#: src/main.c:901 +#: src/main.c:902 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:903 +#: src/main.c:904 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:905 +#: src/main.c:906 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:907 +#: src/main.c:908 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:909 +#: src/main.c:910 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:911 +#: src/main.c:912 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:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2317,11 +2332,11 @@ "đến\n" " (không phải thÆ° mục).\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "Tùy chá»n FTPS:\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2329,7 +2344,7 @@ " --ftps-implicit dùng FTPS ngầm định (cổng mặc định là " "990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2339,7 +2354,7 @@ "trong kết nối Ä‘iá»u khiển\n" " khi mở kết nối dữ liệu\n" -#: src/main.c:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2347,7 +2362,7 @@ " --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:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2355,11 +2370,11 @@ " --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:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "Tùy chá»n vá» WARC:\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2368,23 +2383,23 @@ "lá»i)\n" " vào tập tin .warc.gz.\n" -#: src/main.c:935 +#: src/main.c:936 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:937 +#: src/main.c:938 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:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx ghi tập tin chỉ mục CDX.\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2392,17 +2407,17 @@ " --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:944 +#: src/main.c:945 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:947 +#: src/main.c:948 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:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2410,7 +2425,7 @@ " --no-warc-keep-log không lÆ°u tập tin nhật ký trong bản ghi " "WARC.\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2420,15 +2435,15 @@ "bởi\n" " bá»™ ghi WARC.\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "Tải đệ quy:\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive dùng tải đệ quy.\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2436,14 +2451,14 @@ " -l, --level=Sá» Ä‘á»™ sâu lá»›n nhất của đệ quy (inf hoặc 0 = " "vô hạn).\n" -#: src/main.c:962 +#: src/main.c:963 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:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2453,7 +2468,7 @@ "tải xuống\n" " chỉ tá»›i tập tin cục bá»™.\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2461,7 +2476,7 @@ " --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:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2469,7 +2484,7 @@ " --backups=N trÆ°á»›c khi ghi tập tin X, sao lÆ°u thành N " "bản.\n" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2477,7 +2492,7 @@ " -K, --backup-converted trÆ°á»›c khi chuyển đổi tập tin X, sao lÆ°u " "thành X_orig.\n" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2485,7 +2500,7 @@ " -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:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2493,7 +2508,7 @@ " -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:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2501,7 +2516,7 @@ " -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:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2509,11 +2524,11 @@ " --strict-comments bật xá»­ lý chặt (SGML) cho chú thích " "HTML.\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "Chấp nhận/từ chối đệ quy:\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2522,76 +2537,76 @@ "nhận\n" " được ngăn cách bằng dấu phẩy\n" -#: src/main.c:991 +#: src/main.c:992 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:993 +#: src/main.c:994 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:995 +#: src/main.c:996 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:998 +#: src/main.c:999 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:1001 +#: src/main.c:1002 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:1004 +#: src/main.c:1005 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:1006 +#: src/main.c:1007 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:1008 +#: src/main.c:1009 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:1010 +#: src/main.c:1011 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:1012 +#: src/main.c:1013 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:1014 +#: src/main.c:1015 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:1016 +#: src/main.c:1017 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:1018 +#: src/main.c:1019 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:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2600,91 +2615,91 @@ " --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:1023 +#: src/main.c:1024 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:1025 +#: src/main.c:1026 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:1028 +#: src/main.c:1029 #, fuzzy msgid "Email bug reports, questions, discussions 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:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, 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:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "Mật khẩu cho tài khoản %s: " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "Mật khẩu: " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "Không thể tạo ống dẫn\n" -#: src/main.c:1111 +#: src/main.c:1112 #, 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:1120 +#: src/main.c:1121 #, 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:1144 +#: src/main.c:1145 #, 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:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "Tài khoản cho “%s%sâ€: " -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "Mật khẩu cho “%s%s@%sâ€: " -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "Miá»n địa phÆ°Æ¡ng: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "Biên dịch: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "Liên kết: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2693,29 +2708,29 @@ "GNU Wget %s được biên dịch dành cho %s.\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (môi trÆ°á»ng)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (ngÆ°á»i dùng)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, 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:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2729,7 +2744,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2737,38 +2752,38 @@ "\n" "Nguyên bản được viết bởi Hrvoje Niksic .\n" -#: src/main.c:1337 +#: src/main.c:1338 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:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "Vấn Ä‘á» vá» cấp phát bá»™ nhá»›\n" -#: src/main.c:1441 +#: src/main.c:1442 #, 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:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, 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:1538 +#: src/main.c:1539 #, 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:1584 +#: src/main.c:1585 #, 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:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2777,7 +2792,7 @@ "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:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2786,24 +2801,24 @@ "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:1632 +#: src/main.c:1633 #, 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:1638 +#: src/main.c:1639 #, 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:1647 +#: src/main.c:1648 #, 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:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2814,7 +2829,7 @@ "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:1666 +#: src/main.c:1667 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 +2838,7 @@ "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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2833,7 +2848,7 @@ "Xem sổ tay để tìm chi tiết.\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2841,7 +2856,7 @@ "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:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2849,12 +2864,12 @@ "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:1706 +#: src/main.c:1707 #, 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:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2863,14 +2878,14 @@ "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:1720 +#: src/main.c:1721 #, 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:1741 +#: src/main.c:1742 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2879,14 +2894,14 @@ "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:1752 +#: src/main.c:1753 #, 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:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2894,18 +2909,18 @@ msgstr "" "Chỉ ra cả --start-pos và --continue là không nên; --continue sẽ bị tắt.\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: thiếu URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, 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:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2914,7 +2929,7 @@ "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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2923,18 +2938,18 @@ "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:1835 +#: src/main.c:1842 #, 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:1887 +#: src/main.c:1894 #, 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:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2942,7 +2957,7 @@ "“-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:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2951,42 +2966,42 @@ "--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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "Gặp lá»—i khi khởi tạo libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, 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:2045 +#: src/main.c:2052 #, 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:2056 +#: src/main.c:2063 #, 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:2184 +#: src/main.c:2191 #, 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:2200 +#: src/main.c:2207 #, 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:2230 src/metalink.c:337 +#: src/main.c:2237 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:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2997,7 +3012,7 @@ "Tổng thá»i gian: %s\n" "Äã tải vá»: %d tập tin, %s trong %s (%s)\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "VƯỢT GIỚI HẠN tải vá» %s!\n" @@ -3163,7 +3178,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "Tiếp tục ở ná»n, pid %lu.\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "Kết quả sẽ được ghi vào %s.\n" @@ -3208,64 +3223,64 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: không thể lấy thống kê (stat) %s: %s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 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:190 +#: src/openssl.c:192 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:263 +#: src/openssl.c:267 #, fuzzy msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "Phiên bản OpenSSL của bạn quá cÅ© để há»— trợ TLSv1.1\n" -#: src/openssl.c:269 +#: src/openssl.c:273 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:273 +#: src/openssl.c:277 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:279 +#: src/openssl.c:283 #, 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:319 +#: src/openssl.c:323 #, fuzzy, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "%s: URL không hợp lệ %s: %s\n" -#: src/openssl.c:636 +#: src/openssl.c:640 #, fuzzy msgid "WARNING: 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:856 +#: src/openssl.c:860 #, 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:867 +#: src/openssl.c:871 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:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " Gặp chứng nhận tá»± ký.\n" -#: src/openssl.c:875 +#: src/openssl.c:879 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:878 +#: src/openssl.c:882 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:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3274,7 +3289,7 @@ "%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:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3282,7 +3297,7 @@ " %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:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3294,7 +3309,7 @@ "vệ\n" " (do vậy, máy không phải là %s thật).\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, 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" @@ -3343,22 +3358,22 @@ 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:912 +#: src/retr.c:928 #, 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:924 +#: src/retr.c:940 #, 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:1053 +#: src/retr.c:1069 #, 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:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3366,7 +3381,7 @@ "Chịu thua.\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3435,97 +3450,107 @@ msgid "HTTPS support not compiled in" msgstr "ChÆ°a biên dịch để há»— trợ HTTPS" -#: src/url.c:1604 +#: src/url.c:1603 #, 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:125 +#: src/utils.c:128 #, 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:131 +#: src/utils.c:134 #, 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:351 +#: src/utils.c:354 #, 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:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Tiếp tục chạy ná»n, pid %d.\n" -#: src/utils.c:554 +#: src/utils.c:557 #, 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:859 +#: src/utils.c:865 #, 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:865 +#: src/utils.c:871 #, 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:872 +#: src/utils.c:878 #, 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:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, 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:923 +#: src/utils.c:929 #, 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:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, fuzzy, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "Biểu thức chính qui không hợp lệ %s, %s\n" + +#: src/utils.c:2462 src/utils.c:2485 #, 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:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "Gặp lá»—i khi so khá»›p %s: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +#, fuzzy +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "Gặp lá»—i trong khi mở tập tin WARC %s.\n" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "Lá»—i mở dòng dữ liệu GZIP tá»›i tập tin WARC.\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "Lá»—i ghi bản ghi warcinfo vào tập tin WARC.\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3534,24 +3559,24 @@ "Äang mở tập tin WARC %s.\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "Gặp lá»—i trong khi mở tập tin WARC %s.\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "Tập tin CDX không liệt kê url gốc. (Thiếu cá»™t “aâ€.)\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "Tập tin CDX không liệt kê mã băm tổng kiểm tra. (Thiếu cá»™t “kâ€.)\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "Tập tin CDX không liệt kê id bản ghi. (Thiếu cá»™t “uâ€.)\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3563,32 +3588,32 @@ "Äã tải %d bản ghi từ CDX.\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "Không thể Ä‘á»c tập tin CDX %s cho tái nhân bản.\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "Không thể mở tập tin kê khai tạm thá»i WARC.\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "Không thể ghi vào tập tin nhật ký tạm thá»i WARC.\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "Không thể mở tập tin WARC.\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "Không thể mở tệp tin CDX cho đầu ra.\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "Không thể mở tập tin tạm thá»i WARC.\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" 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 " diff -Nru wget-1.19.5/po/wget.pot wget-1.20.1/po/wget.pot --- wget-1.19.5/po/wget.pot 2018-05-06 16:48:22.000000000 +0000 +++ wget-1.20.1/po/wget.pot 2018-12-26 20:10:49.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.19.5\n" +"Project-Id-Version: GNU wget 1.20.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -230,17 +230,17 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -304,7 +304,7 @@ msgid "failed: %s.\n" msgstr "" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" @@ -427,12 +427,12 @@ msgid "Length: %s" msgstr "" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr "" @@ -590,7 +590,7 @@ "\n" msgstr "" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "" @@ -613,32 +613,32 @@ msgid "Data transfer aborted.\n" msgstr "" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" "\n" msgstr "" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "" @@ -728,159 +728,173 @@ msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:576 +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "" + +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "" @@ -920,144 +934,144 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "" -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr "" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1065,199 +1079,199 @@ "\n" msgstr "" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" "\n" msgstr "" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "" -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" "\n" msgstr "" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" msgstr "" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" "\n" msgstr "" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "" -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "" -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "" -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" -#: src/init.c:585 +#: src/init.c:579 #, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "" -#: src/init.c:713 +#: src/init.c:706 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1265,7 +1279,7 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1273,75 +1287,75 @@ "or specify a different file using --config.\n" msgstr "" -#: src/init.c:783 +#: src/init.c:776 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" -#: src/init.c:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "" -#: src/init.c:1043 +#: src/init.c:1037 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" -#: src/init.c:1076 +#: src/init.c:1070 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" -#: src/init.c:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "" -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1353,16 +1367,16 @@ msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "" @@ -1393,308 +1407,308 @@ msgid "%s: %s; disabling logging.\n" msgstr "" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" msgstr "" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:653 +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" msgstr "" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:660 +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:676 +#: src/main.c:677 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:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1705,211 +1719,211 @@ " environment variable is used.\n" msgstr "" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:756 +#: src/main.c:757 msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:795 +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" msgstr "" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1917,13 +1931,13 @@ "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1931,58 +1945,58 @@ " challenge\n" msgstr "" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:844 +#: src/main.c:845 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:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -1992,19 +2006,19 @@ " peer against\n" msgstr "" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2014,399 +2028,399 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:922 +#: src/main.c:923 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:925 +#: src/main.c:926 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:973 +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:976 +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:1028 +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" msgstr "" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "" -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "" -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "" -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2416,71 +2430,71 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" msgstr "" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1599 +#: src/main.c:1600 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2488,152 +2502,152 @@ "\n" msgstr "" -#: src/main.c:1666 +#: src/main.c:1667 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:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1820 +#: src/main.c:1827 #, 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:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:2005 +#: src/main.c:2012 #, 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:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2641,7 +2655,7 @@ "Downloaded: %d files, %s in %s (%s)\n" msgstr "" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "" @@ -2807,7 +2821,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "" @@ -2852,75 +2866,75 @@ msgid "%s: cannot stat %s: %s\n" msgstr "" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" msgstr "" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:319 +#: src/openssl.c:323 #, c-format msgid "OpenSSL: Invalid cipher list: %s\n" msgstr "" -#: src/openssl.c:636 +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" msgstr "" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2928,7 +2942,7 @@ " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" @@ -2975,28 +2989,28 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" msgstr "" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3060,120 +3074,129 @@ msgid "HTTPS support not compiled in" msgstr "" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "" -#: src/utils.c:859 +#: src/utils.c:865 #, c-format msgid "Failed to Fopen file %s\n" msgstr "" -#: src/utils.c:865 +#: src/utils.c:871 #, c-format msgid "Failed to get FD for file %s\n" msgstr "" -#: src/utils.c:872 +#: src/utils.c:878 #, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:917 +#: src/utils.c:923 #, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "" -#: src/utils.c:923 +#: src/utils.c:929 #, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" -#: src/warc.c:223 +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "" + +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3184,31 +3207,31 @@ msgstr[0] "" msgstr[1] "" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/zh_CN.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/zh_CN.gmo differ diff -Nru wget-1.19.5/po/zh_CN.po wget-1.20.1/po/zh_CN.po --- wget-1.19.5/po/zh_CN.po 2018-05-06 16:48:24.000000000 +0000 +++ wget-1.20.1/po/zh_CN.po 2018-12-26 20:10:51.000000000 +0000 @@ -8,14 +8,14 @@ # Anthony Fok , 2010, 2011. # Mingcong Bai , 2015. # Mingye Wang , 2015, 2017. -# Boyuan Yang <073plan@gmail.com>, 2017. +# Boyuan Yang <073plan@gmail.com>, 2017, 2018. # msgid "" msgstr "" -"Project-Id-Version: wget 1.18.109\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2017-11-15 22:30+0800\n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-14 10:27-0500\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -24,7 +24,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.0.6\n" #: lib/error.c:195 msgid "Unknown system error" @@ -107,29 +107,29 @@ msgstr "未知错误" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s：选项“%sâ€ä¸æ˜Žç¡®\n" +msgstr "%s：选项“%s%sâ€æœ‰æ­§ä¹‰\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s：选项 \"%s\" 有歧义；å¯èƒ½æ€§æœ‰ï¼š" +msgstr "%s：选项“%s%sâ€æœ‰æ­§ä¹‰ï¼›å¯èƒ½æ€§æœ‰ï¼š" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s：无法识别的选项“%c%sâ€\n" +msgstr "%s：无法识别的选项“%s%sâ€\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s：选项“%c%sâ€ä¸å…许有å‚æ•°\n" +msgstr "%s：选项“%s%sâ€ä¸å…许有å‚æ•°\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s：选项“%sâ€éœ€è¦å‚æ•°\n" +msgstr "%s：选项“%s%sâ€éœ€è¦å‚æ•°\n" #: lib/getopt.c:621 #, c-format @@ -238,17 +238,17 @@ msgid "Unmatched ) or \\)" msgstr "未匹é…çš„ ) 或 \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" msgstr "缺少之å‰çš„正则表达å¼" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "无法创建管é“" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" @@ -312,7 +312,7 @@ msgid "failed: %s.\n" msgstr "失败：%s。\n" -#: src/connect.c:399 src/http.c:2105 +#: src/connect.c:399 src/http.c:2108 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: 无法解æžä¸»æœºåœ°å€ %s\n" @@ -435,12 +435,12 @@ msgid "Length: %s" msgstr "长度：%s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr "，剩余 %s (%s)" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr "，剩余 %s" @@ -609,7 +609,7 @@ "文件或目录 %s ä¸å­˜åœ¨ã€‚\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s çªç„¶å‡ºçŽ°ã€‚\n" @@ -632,17 +632,17 @@ msgid "Data transfer aborted.\n" msgstr "æ•°æ®ä¼ è¾“已被中止。\n" -#: src/ftp.c:1863 src/main.c:1681 +#: src/ftp.c:1863 src/main.c:1682 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "文件 %s 已存在；ä¸èŽ·å–。\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(å°è¯•æ¬¡æ•°ï¼š%2d)" -#: src/ftp.c:2039 src/http.c:4723 +#: src/ftp.c:2039 src/http.c:4731 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -651,7 +651,7 @@ "%s (%s) - 已写入标准输出 %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 +#: src/ftp.c:2040 src/http.c:4732 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -660,8 +660,8 @@ "%s (%s) - %s å·²ä¿å­˜ [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "正在删除 %s。\n" @@ -755,159 +755,173 @@ msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "ä¸è¿›å…¥ %s 目录因为其已被排除或未被包å«è¿›æ¥ã€‚\n" -#: src/ftp.c:2590 src/ftp.c:2604 +#: src/ftp.c:2613 #, c-format msgid "Rejecting %s.\n" msgstr "æ‹’ç» %s。\n" -#: src/ftp.c:2627 +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "æ‹’ç» %s（无效æ¡ç›®ï¼‰ã€‚\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s 因正则表达å¼è€Œè¢«æŽ’除/未被包å«ã€‚\n" + +#: src/ftp.c:2645 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "%s å’Œ %s 匹é…错误: %s\n" -#: src/ftp.c:2683 +#: src/ftp.c:2685 #, c-format msgid "No matches on pattern %s.\n" msgstr "æ²¡æœ‰ä¸Žæ¨¡å¼ %s 相符åˆçš„。\n" -#: src/ftp.c:2755 +#: src/ftp.c:2757 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "å·²ç»å°† HTML æ ¼å¼çš„索引写入到 %s [%s]。\n" -#: src/ftp.c:2760 +#: src/ftp.c:2762 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "å·²ç»å°† HTML æ ¼å¼çš„索引写入到 %s。\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "错误：无法打开目录 %s。\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "错误：无法打开è¯ä¹¦ %s：(%d)。\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "已载入 CA è¯ä¹¦â€œ%sâ€\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "错误：无法加载 CRL 文件‘%s’: (%d)\n" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "已加载 CRL 文件‘%s’\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "错误：GnuTLS è¦æ±‚密钥和è¯ä¹¦å…·æœ‰ç›¸åŒçš„类型。\n" -#: src/gnutls.c:576 -#, fuzzy, c-format +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "您的 OpenSSL 版本太旧，ä¸æ”¯æŒ TLS 1.3\n" + +#: src/gnutls.c:676 +#, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "GnuTLS：未实现‘secure-protocol’选项值 %d\n" +msgstr "GnuTLS：未实现‘secure-protocol’选项值 %u\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "请将此问题报告到 bug-wget@gnu.org\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS：未实现‘secure-protocol’选项值 %d\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" -msgstr "" +msgstr "GnuTLS：无法直接设置优先级字符串。回退到使用默认优先级。\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "错误" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "警告" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s 未æ出è¯ä¹¦ã€‚\n" -#: src/gnutls.c:807 +#: src/gnutls.c:931 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: %s çš„è¯ä¹¦ä¸å¯ä¿¡ã€‚\n" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" msgstr "%s: %s çš„è¯ä¹¦é¢å‘者未知。\n" -#: src/gnutls.c:809 +#: src/gnutls.c:933 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: %s çš„è¯ä¹¦å·²ç»è¿‡æœŸã€‚\n" -#: src/gnutls.c:810 +#: src/gnutls.c:934 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: è¯ä¹¦ %s çš„ç­¾å‘者ä¸æ˜¯ä¸€ä¸ª CA。\n" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: %s çš„è¯ä¹¦ä½¿ç”¨ä¸å®‰å…¨çš„算法签å。\n" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: %s çš„è¯ä¹¦è¿˜æœªç”Ÿæ•ˆã€‚\n" -#: src/gnutls.c:813 +#: src/gnutls.c:937 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: %s çš„è¯ä¹¦å·²ç»è¿‡æœŸã€‚\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "åˆå§‹åŒ– X509 è¯ä¹¦é”™è¯¯: %s\n" -#: src/gnutls.c:834 +#: src/gnutls.c:958 msgid "No certificate found\n" msgstr "未找到è¯ä¹¦\n" -#: src/gnutls.c:841 +#: src/gnutls.c:965 #, c-format msgid "Error parsing certificate: %s\n" msgstr "解æžè¯ä¹¦æ—¶å‘生错误: %s。\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" msgstr "è¯ä¹¦è¿˜æœªæ¿€æ´»\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" msgstr "è¯ä¹¦å·²ç»è¿‡æœŸ\n" -#: src/gnutls.c:860 +#: src/gnutls.c:984 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "è¯ä¹¦æ‰€æœ‰è€…与主机å %s ä¸ç¬¦\n" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" msgstr "公钥与固定的公钥ä¸åŒ¹é…ï¼\n" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" msgstr "è¯ä¹¦å¿…须是 X.509 æ ¼å¼\n" @@ -947,11 +961,11 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "无法写入 HTTP 请求：%s。\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "没有 HTTP 头，å‡å®šä¸º HTTP/0.9" -#: src/http.c:1620 +#: src/http.c:1623 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -960,65 +974,65 @@ "文件 %s å·²ç»å­˜åœ¨ï¼›ä¸èŽ·å–。\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime 失败。这å¯èƒ½æ˜¯ä¸€ä¸ª bug。\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "ä¸èƒ½è½¬æ¢ä¸º http æ ¼å¼çš„时间戳。将最åŽä¿®æ”¹æ—¶é—´å›žè½åˆ° 0。\n" -#: src/http.c:1995 +#: src/http.c:1998 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "缺少 BODY æ•°æ®æ–‡ä»¶ %s: %s\n" -#: src/http.c:2087 +#: src/http.c:2090 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "é‡ç”¨å·²æœ‰çš„的到 [%s]:%d 的连接\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "å†æ¬¡ä½¿ç”¨å­˜åœ¨çš„到 %s:%d 的连接。\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "无法读å–代ç†å“应：%s\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s 错误 %d：%s。\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "ä¸æ­£å¸¸çš„状æ€è¡Œ" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "代ç†æ¸ é“错误: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "未知的验è¯æ–¹å¼ã€‚\n" -#: src/http.c:2444 +#: src/http.c:2447 #, c-format msgid "Authentication selected: %s\n" msgstr "选定的验è¯æ–¹å¼ï¼š%s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" msgstr "正在ä¿å­˜è‡³: %s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" @@ -1027,20 +1041,20 @@ "当下载签å:\n" "%s: %s 时。\n" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "无法从临时文件读å–ç­¾å内容。跳过。\n" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "无法创建临时文件。跳过签å下载。\n" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "pri 值无效。å‡å®šä¸º %d。\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1048,42 +1062,42 @@ "无法为 Metalink 资æºæ‰¾åˆ°ä»»ä½•å¯æŽ¥å—的摘è¦ã€‚\n" "将忽略这些资æºã€‚\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "由于é­é‡é”™è¯¯ï¼Œå°†ç¦ç”¨ SSL。\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "å·²å‘出 %s 请求，正在等待回应... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "没有接收到数æ®ã€‚\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "读å–文件头错误 (%s)。\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(没有æè¿°)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "ä½ç½®ï¼š%s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "未指定" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [è·Ÿéšè‡³æ–°çš„ URL]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1092,7 +1106,7 @@ "文件 %s 在æœåŠ¡å™¨ä¸Šæœªè¢«æ›´æ”¹ã€‚忽略此下载。\n" "\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1103,7 +1117,7 @@ "你也许应该附加 --no-if-modified-since 选项。\n" "\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1113,80 +1127,80 @@ " 文件已下载完æˆï¼›ä¸ä¼šè¿›è¡Œä»»ä½•æ“作。\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "长度：" -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "已忽略" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "警告：HTTP ä¸æ”¯æŒé€šé…符。\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "打开 Spider 模å¼ã€‚检查是å¦å­˜åœ¨è¿œç¨‹æ–‡ä»¶ã€‚\n" -#: src/http.c:4387 +#: src/http.c:4380 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "无法写入 %s (%s)。\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" msgstr "接收的å“应头中缺少必è¦çš„属性。\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" msgstr "用户å/密ç è®¤è¯å¤±è´¥ã€‚\n" -#: src/http.c:4409 +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" msgstr "无法写入 WARC 文件。\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" msgstr "无法写入临时 WARC 文件。\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "无法建立 SSL 连接。\n" -#: src/http.c:4426 +#: src/http.c:4432 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "无法清除 %s 的链接 (%s)。\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "错误：é‡å®šå‘ (%d) 但没有指定ä½ç½®ã€‚\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "无法从 HTTP å“应中找到 Metalink æ•°æ®ã€‚使用 HTTP GET 下载文件。\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "å‘现 Metalink å“应头。将切æ¢åˆ° Metalink 模å¼ã€‚\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" msgstr "远程文件ä¸å­˜åœ¨ -- 链接失效ï¼ï¼ï¼\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "缺少“Last-modifiedâ€æ–‡ä»¶å¤´ -- 关闭时间戳标记。\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "无效的“Last-modifiedâ€æ–‡ä»¶å¤´ -- 忽略时间戳标记。\n" -#: src/http.c:4572 +#: src/http.c:4580 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1195,16 +1209,16 @@ "远程文件比本地文件 %s æ›´è€ -- ä¸èŽ·å–。\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "文件大å°ä¸ç¬¦ (本地文件 %s) -- 获å–。\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "远程文件较新，获å–。\n" -#: src/http.c:4607 +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1213,7 +1227,7 @@ "存在远程文件且å¯èƒ½å«æœ‰åˆ°å…¶å®ƒèµ„æºçš„链接 -- 获å–。\n" "\n" -#: src/http.c:4613 +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1221,7 +1235,7 @@ "存在远程文件但ä¸å«ä»»ä½•é“¾æŽ¥ -- 无法获å–。\n" "\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1231,7 +1245,7 @@ "但ä¸èƒ½è¿›è¡Œé€’å½’æ“作 -- 无法获å–。\n" "\n" -#: src/http.c:4628 +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" @@ -1239,12 +1253,12 @@ "存在远程文件。\n" "\n" -#: src/http.c:4637 +#: src/http.c:4645 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4687 +#: src/http.c:4695 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1253,7 +1267,7 @@ "%s (%s) - 已写入至标准输出 %s[%s/%s]\n" "\n" -#: src/http.c:4688 +#: src/http.c:4696 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1262,58 +1276,58 @@ "%s (%s) - å·²ä¿å­˜ %s [%s/%s])\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - 在 %s 字节处连接关闭。" -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - 在 %s 字节处å‘生读å–错误 (%s)。" -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - 在 %s/%s 字节处å‘生读å–错误 (%s)。" -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "ä¸æ”¯æŒçš„ä¿æŠ¤è´¨é‡ '%s'。\n" -#: src/http.c:5024 +#: src/http.c:5032 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "ä¸æ”¯æŒçš„算法‘%s’。\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" -msgstr "%s: WGETRCæŒ‡å‘ %s，但它并ä¸å­˜åœ¨ã€‚\n" +msgstr "%s: WGETRC æŒ‡å‘ %s，但它因为错误而无法访问：%s。\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%sï¼šæ— æ³•è¯»å– %s (%s)。\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%1$s：错误å‘生于第 %3$d 行的 %2$s。\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%1$s: 第 %3$d 行的 %2$s 处å‘生语法错误。\n" -#: src/init.c:713 +#: src/init.c:706 #, 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:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1324,7 +1338,7 @@ "'%s'，\n" "或使用 --config å‚数指定å¦ä¸€ä¸ªé…置文件。\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1335,47 +1349,47 @@ "'%s'，\n" "或使用 --config å‚数指定å¦ä¸€ä¸ªé…置文件。\n" -#: src/init.c:783 +#: src/init.c:776 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s：警告：系统与用户的 wgetrc éƒ½æŒ‡å‘ %s。\n" -#: src/init.c:983 +#: src/init.c:977 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s：无效的 --execute 命令 %s\n" -#: src/init.c:1043 +#: src/init.c:1037 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s：%s：无效的布尔值 %s；请使用“onâ€æˆ–“offâ€ã€‚\n" -#: src/init.c:1076 +#: src/init.c:1070 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s：%s：无效的 %s；请使用“onâ€ã€â€œoffâ€æˆ–“quietâ€ã€‚\n" -#: src/init.c:1096 +#: src/init.c:1090 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s：%s：无效数字 %s。\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s åªèƒ½å•æ¬¡ä½¿ç”¨\n" -#: src/init.c:1333 src/init.c:1354 +#: src/init.c:1327 src/init.c:1348 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s：%s：无效的字节数值 %s\n" -#: src/init.c:1379 +#: src/init.c:1373 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s：%s：无效的时间周期 %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1384,29 +1398,29 @@ "use-askpass 功能需è¦å¾—到一个字符串å‚数，或是è¦æ±‚环境å˜é‡ WGET_ASKPASS 或 " "SSH_ASKPASS 被设置。\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s：%s：无效的值 %s。\n" -#: src/init.c:1515 +#: src/init.c:1509 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s：%s：无效的文件头 %s。\n" -#: src/init.c:1536 +#: src/init.c:1530 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s：%s：无效的 WARC 头 %s。\n" -#: src/init.c:1602 +#: src/init.c:1596 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s：%sï¼šæ— æ•ˆçš„è¿›åº¦æŒ‡ç¤ºæ–¹å¼ %s。\n" # 对应å‚数是逗å·åˆ†éš”的一个列表，ä¸è¦å˜æˆé¡¿å·ã€‚ -#: src/init.c:1684 +#: src/init.c:1678 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1420,16 +1434,16 @@ msgid "Encoding %s isn't valid\n" msgstr "ç¼–ç  %s 无效\n" -#: src/iri.c:139 src/url.c:1571 +#: 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:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "出现ä¸å®Œæ•´æˆ–无效的多字节åºåˆ—\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" msgstr "无法处ç†çš„错误 %d\n" @@ -1462,12 +1476,12 @@ msgid "%s: %s; disabling logging.\n" msgstr "%s：%sï¼›ç¦ç”¨æ—¥å¿—记录。\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "用法： %s [选项]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1475,86 +1489,86 @@ "长选项所必须的å‚数在使用短选项时也是必须的。\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "å¯åŠ¨ï¼š\n" -#: src/main.c:596 +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version 显示 Wget 的版本信æ¯å¹¶é€€å‡º\n" -#: src/main.c:598 +#: src/main.c:599 msgid " -h, --help print this help\n" msgstr " -h, --help 打å°æ­¤å¸®åŠ©\n" -#: src/main.c:600 +#: src/main.c:601 msgid " -b, --background go to background after startup\n" msgstr " -b, --background å¯åŠ¨åŽè½¬å…¥åŽå°\n" -#: src/main.c:602 +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=命令 è¿è¡Œä¸€ä¸ªâ€œ.wgetrcâ€é£Žæ ¼çš„命令\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "日志和输入文件：\n" -#: src/main.c:608 +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=文件 将日志信æ¯å†™å…¥ FILE\n" -#: src/main.c:610 +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=文件 将信æ¯æ·»åŠ è‡³ FILE\n" -#: src/main.c:613 +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug 打å°å¤§é‡è°ƒè¯•ä¿¡æ¯\n" -#: src/main.c:617 +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug æ‰“å° Watt-32 调试信æ¯\n" -#: src/main.c:620 +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet 安é™æ¨¡å¼ (æ— ä¿¡æ¯è¾“出)\n" -#: src/main.c:622 +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose 详尽的输出 (此为默认值)\n" -#: src/main.c:624 +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -nv, --no-verbose 关闭详尽输出，但ä¸è¿›å…¥å®‰é™æ¨¡å¼\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" " --report-speed=类型 以 <类型> 报告带宽。类型å¯ä»¥æ˜¯ bits\n" -#: src/main.c:628 +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr " -i, --input-file=文件 下载本地或外部 <文件> 中的 URL\n" -#: src/main.c:631 +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr " --input-metalink=文件 下载本地 Metalink <文件> 中的文件\n" -#: src/main.c:634 +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html æŠŠè¾“å…¥æ–‡ä»¶å½“æˆ HTML 文件\n" -#: src/main.c:636 +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1562,89 +1576,89 @@ " -B, --base=URL 解æžç›¸å¯¹äºŽ URL çš„ HTML 输入文件链接 (-i -" "F)\n" -#: src/main.c:639 +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" msgstr " --config=文件 指定è¦ä½¿ç”¨çš„é…置文件\n" -#: src/main.c:641 +#: src/main.c:642 msgid " --no-config do not read any config file\n" msgstr " --no-cookies ä¸è¯»å–任何é…置文件\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr " --rejected-log=文件 å°†æ‹’ç» URL 的原因写入 <文件>。\n" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "下载：\n" -#: src/main.c:649 +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" " -t, --tries=æ•°å­— 设置é‡è¯•æ¬¡æ•°ä¸º <æ•°å­—> (0 代表无é™åˆ¶)\n" -#: src/main.c:651 +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr " --retry-connrefused å³ä½¿æ‹’ç»è¿žæŽ¥ä¹Ÿæ˜¯é‡è¯•\n" -#: src/main.c:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" -msgstr " --ignore-tags=列表 逗å·åˆ†éš”的忽略的 HTML 标识列表\n" +msgstr "" +" --retry-on-http-error=ERRORS æ供以逗å·åˆ†éš”的列表，列出é‡åˆ°æ—¶è¿›è¡Œé‡" +"试的 HTTP 错误\n" -#: src/main.c:655 +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=文件 将文档写入 FILE\n" -#: src/main.c:657 +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr " -nc, --no-clobber ä¸è¦ä¸‹è½½å·²å­˜åœ¨å°†è¢«è¦†ç›–的文件\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-cookies ä¸è¯»å–任何é…置文件\n" +msgstr " --no-netrc ä¸è¦å°è¯•ä»Ž .netrc 获å–凭æ®\n" -#: src/main.c:662 +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr " -c, --continue 断点续传下载文件\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr " --start-pos=åç§»é‡ ä»Žç”±é›¶è®¡æ•°çš„ <å移é‡> 开始下载\n" -#: src/main.c:666 +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=类型 选择进度æ¡ç±»åž‹\n" -#: src/main.c:668 +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --show-progress 在任æ„啰嗦状æ€ä¸‹éƒ½æ˜¾ç¤ºè¿›åº¦æ¡\n" -#: src/main.c:670 +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr " -N, --timestamping åªèŽ·å–比本地文件新的文件\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1653,33 +1667,33 @@ " --no-if-modified-since ä¸è¦åœ¨æ—¶é—´æˆ³ (timestamping) 模å¼ä¸‹ä½¿ç”¨\n" " if-modified-since get æ¡ä»¶è¯·æ±‚\n" -#: src/main.c:676 +#: src/main.c:677 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" -#: src/main.c:679 +#: src/main.c:680 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response 打å°æœåŠ¡å™¨å“应\n" -#: src/main.c:681 +#: src/main.c:682 msgid " --spider don't download anything\n" msgstr " --spider ä¸ä¸‹è½½ä»»ä½•æ–‡ä»¶\n" -#: src/main.c:683 +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -T, --timeout=SECONDS 将所有超时设为 SECONDS 秒\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" " --dns-servers=åœ°å€ æŒ‡å®šè¯·æ±‚çš„ DNS æœåŠ¡å™¨åˆ—表（逗å·åˆ†éš”）\n" -#: src/main.c:688 +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1687,30 +1701,30 @@ " --bind-dns-address=åœ°å€ å°† DNS 解æžå™¨ç»‘定至本地主机上的<地å€> (主" "机å或 IP)\n" -#: src/main.c:691 +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr " --dns-timeout=SECS 设置 DNS 查寻超时为 SECS 秒\n" -#: src/main.c:693 +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=SECS 设置连接超时为 SECS 秒\n" -#: src/main.c:695 +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SECS 设置读å–超时为 SECS 秒\n" -#: src/main.c:697 +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SECONDS 等待间隔为 SECONDS 秒\n" -#: src/main.c:699 +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" " --waitretry=SECONDS 在获å–文件的é‡è¯•æœŸé—´ç­‰å¾… 1..SECONDS 秒\n" -#: src/main.c:701 +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1718,15 +1732,15 @@ " --random-wait 获å–多个文件时，æ¯æ¬¡éšæœºç­‰å¾…é—´éš” " "(0.5~1.5)*WAIT 秒\n" -#: src/main.c:703 +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy ç¦æ­¢ä½¿ç”¨ä»£ç†\n" -#: src/main.c:705 +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=æ•°å­— 设置获å–é…é¢ä¸º <æ•°å­—> 字节\n" -#: src/main.c:707 +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1734,36 +1748,36 @@ " --bind-address=ADDRESS 绑定至本地主机上的 ADDRESS (主机å或是 " "IP)\n" -#: src/main.c:709 +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=RATE é™åˆ¶ä¸‹è½½é€ŸçŽ‡ä¸º RATE\n" -#: src/main.c:711 +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache 关闭 DNS 查询缓存\n" -#: src/main.c:713 +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" " --restrict-file-names=系统 é™å®šæ–‡ä»¶å中的字符为 <系统> å…许的字符\n" -#: src/main.c:715 +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr " --ignore-case 匹é…文件/目录时忽略大å°å†™\n" -#: src/main.c:718 +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only 仅连接至 IPv4 地å€\n" -#: src/main.c:720 +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only 仅连接至 IPv6 地å€\n" -#: src/main.c:722 +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1772,22 +1786,22 @@ " --prefer-family=地å€æ— 首先连接至指定家æ—（IPv6，IPv4 或 none）的" "地å€\n" -#: src/main.c:726 +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=用户 å°† ftp å’Œ http 的用户åå‡è®¾ç½®ä¸º <用户>\n" -#: src/main.c:728 +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=å¯†ç  å°† ftp å’Œ http 的密ç å‡è®¾ç½®ä¸º <密ç >\n" -#: src/main.c:730 +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password æ示输入密ç \n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1802,27 +1816,27 @@ "WGET_ASKPASS 或\n" " SSH_ASKPASS 环境å˜é‡ã€‚\n" -#: src/main.c:737 +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri 关闭 IRI 支æŒ\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=ENC 使用 ENC 作为 IRI (国际化资æºæ ‡è¯†ç¬¦) 的本" "地编ç \n" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr " --remote-encoding=ENC 使用 ENC 作为默认远程编ç \n" -#: src/main.c:743 +#: src/main.c:744 msgid " --unlink remove file before clobber\n" msgstr " --unlink 覆盖å‰ç§»é™¤æ–‡ä»¶\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1830,181 +1844,183 @@ " --keep-badhash ä¿ç•™æ ¡éªŒå’Œä¸æ­£ç¡®çš„文件（附加åŽç¼€ ." "badhash）\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" " --metalink-over-http 使用æ¥è‡ª HTTP å“应头的 Metalink 元数æ®\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr " --preferred-location Metalink 资æºçš„首选ä½ç½®\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr " --no-xattr ä¸è¦åœ¨æ–‡ä»¶çš„拓展属性中储存元数æ®\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "目录：\n" -#: src/main.c:763 +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ä¸åˆ›å»ºç›®å½•\n" -#: src/main.c:765 +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories 强制创建目录\n" -#: src/main.c:767 +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ä¸è¦åˆ›å»ºä¸» (host) 目录\n" -#: src/main.c:769 +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories 在目录中使用åè®®å称\n" -#: src/main.c:771 +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=å‰ç¼€ ä¿å­˜æ–‡ä»¶åˆ° <å‰ç¼€>/..\n" -#: src/main.c:773 +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr " --cut-dirs=æ•°å­— 忽略远程目录中 <æ•°å­—> 个目录层。\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP 选项：\n" -#: src/main.c:779 +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=用户 设置 http 用户å为 <用户>\n" -#: src/main.c:781 +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=å¯†ç  è®¾ç½® http 密ç ä¸º <密ç >\n" -#: src/main.c:783 +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache ä¸ä½¿ç”¨æœåŠ¡å™¨ç¼“存的数æ®ã€‚\n" -#: src/main.c:785 +#: src/main.c:786 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:788 +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr " -E, --adjust-extension 以åˆé€‚的扩展åä¿å­˜ HTML/CSS 文档\n" -#: src/main.c:790 +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length 忽略头部的‘Content-Length’区域\n" -#: src/main.c:792 +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=字符串 在头部æ’å…¥ <字符串>\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=类型 选择进度æ¡ç±»åž‹\n" +msgstr "" +" --compression=类型 选择压缩类型，值å¯ä»¥ä¸º autoã€gzip å’Œ " +"none。（默认：none）\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr " --max-redirect æ¯é¡µæ‰€å…许的最大é‡å®šå‘\n" -#: src/main.c:800 +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=用户 使用 <用户> 作为代ç†ç”¨æˆ·å\n" -#: src/main.c:802 +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=å¯†ç  ä½¿ç”¨ <密ç > 作为代ç†å¯†ç \n" -#: src/main.c:804 +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr " --referer=URL 在 HTTP 请求头包å«â€˜Referer: URL’\n" -#: src/main.c:806 +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers å°† HTTP 头ä¿å­˜è‡³æ–‡ä»¶ã€‚\n" -#: src/main.c:808 +#: src/main.c:809 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" " -U, --user-agent=ä»£ç† æ ‡è¯†è‡ªå·±ä¸º <代ç†> 而ä¸æ˜¯ Wget/VERSION。\n" -#: src/main.c:810 +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr " --no-http-keep-alive ç¦ç”¨ HTTP keep-alive (æŒä¹…连接)。\n" -#: src/main.c:812 +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ä¸ä½¿ç”¨ cookies。\n" -#: src/main.c:814 +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=文件 会è¯å¼€å§‹å‰ä»Ž <文件> 中载入 cookies。\n" -#: src/main.c:816 +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --save-cookies=文件 会è¯ç»“æŸåŽä¿å­˜ cookies 至 FILE。\n" -#: src/main.c:818 +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr " --keep-session-cookies 载入并ä¿å­˜ä¼šè¯ (éžæ°¸ä¹…) cookies。\n" -#: src/main.c:820 +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" " --post-data=字符串 使用 POST æ–¹å¼ï¼›æŠŠ <字串>作为数æ®å‘é€ã€‚\n" -#: src/main.c:822 +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" " --post-file=文件 使用 POST æ–¹å¼ï¼›å‘é€ <文件> 内容。\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr " --method=HTTP方法 在请求中使用指定的 。\n" -#: src/main.c:826 +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2012,14 +2028,14 @@ " --post-data=字符串 把 <字串> 作为数æ®å‘é€ï¼Œå¿…须设置 --" "method\n" -#: src/main.c:828 +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" " --post-file=文件 å‘é€ <文件> 内容，必须设置 --method\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2030,13 +2046,13 @@ "Disposition\n" " 头部 (实验中)。\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr " --content-on-error 在æœåŠ¡å™¨é”™è¯¯æ—¶è¾“出接收到的内容\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2046,61 +2062,60 @@ " --auth-no-challenge ä¸å…ˆç­‰å¾…æœåŠ¡å™¨è¯¢é—®å°±å‘é€åŸºæœ¬ HTTP 验è¯ä¿¡" "æ¯ã€‚\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) 选项：\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -" --secure-protocol=PR 选择安全å议，å¯ä»¥æ˜¯ autoã€SSLv2ã€\n" -" SSLv3ã€TLSv1ã€PFS 中的一个。\n" +" --secure-protocol=PR 选择安全å议，值å¯ä»¥æ˜¯ autoã€SSLv2ã€\n" +" SSLv3ã€TLSv1ã€TLSv1_1ã€TLSv1_2 或 PFS\n" -#: src/main.c:847 +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only åªè·Ÿéšå®‰å…¨çš„ HTTPS 链接\n" -#: src/main.c:849 +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate ä¸è¦éªŒè¯æœåŠ¡å™¨çš„è¯ä¹¦ã€‚\n" -#: src/main.c:851 +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=文件 客户端è¯ä¹¦æ–‡ä»¶ã€‚\n" -#: src/main.c:853 +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr " --certificate-type=类型 客户端è¯ä¹¦ç±»åž‹ï¼ŒPEM 或 DER。\n" -#: src/main.c:855 +#: src/main.c:856 msgid " --private-key=FILE private key file\n" msgstr " --private-key=文件 ç§é’¥æ–‡ä»¶ã€‚\n" -#: src/main.c:857 +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=类型 ç§é’¥æ–‡ä»¶ç±»åž‹ï¼ŒPEM 或 DER。\n" -#: src/main.c:859 +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=文件 带有一组 CA è¯ä¹¦çš„文件。\n" -#: src/main.c:861 +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr " --ca-directory=DIR ä¿å­˜ CA è¯ä¹¦çš„哈希列表的目录。\n" -#: src/main.c:863 +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=文件 带有一组 CA è¯ä¹¦çš„文件。\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2114,7 +2129,7 @@ "ç ã€\n" " “sha256//†开头ã€ç”¨â€œ;â€é—´éš”\n" -#: src/main.c:871 +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2123,7 +2138,7 @@ "件，\n" " 应å«æœ‰éšæœºæ•°æ®\n" -#: src/main.c:875 +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2131,7 +2146,7 @@ " --egd-file=文件 用于命å带有éšæœºæ•°æ®çš„ EGD 套接字的文" "件。\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2141,74 +2156,74 @@ "depend on the specific SSL/TLS engine.\n" msgstr "" -#: src/main.c:886 +#: src/main.c:887 msgid "HSTS options:\n" msgstr "HSTS 选项：\n" -#: src/main.c:888 +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts ç¦ç”¨ HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr " --hsts-file HSTS æ•°æ®åº“路径（将覆盖默认值）\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP 选项：\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" " --ftp-stmlf 对所有二进制 FTP 文件使用 Stream_LF æ ¼å¼\n" -#: src/main.c:901 +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=用户 设置 ftp 用户å为 <用户>。\n" -#: src/main.c:903 +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=å¯†ç  è®¾ç½® ftp 密ç ä¸º <密ç >\n" -#: src/main.c:905 +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ä¸è¦åˆ é™¤â€˜.listing’文件\n" -#: src/main.c:907 +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob ä¸åœ¨ FTP 文件å中使用通é…符展开\n" -#: src/main.c:909 +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp ç¦ç”¨â€œpassiveâ€ä¼ è¾“模å¼\n" -#: src/main.c:911 +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions ä¿ç•™è¿œç¨‹æ–‡ä»¶çš„æƒé™\n" -#: src/main.c:913 +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" " --retr-symlinks 递归目录时，获å–链接的文件 (而éžç›®å½•)\n" -#: src/main.c:918 +#: src/main.c:919 msgid "FTPS options:\n" msgstr "FTPS 选项：\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr " --ftps-implicit 使用éšå¼ FTPSï¼ˆé»˜è®¤ç«¯å£ 990）\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2217,14 +2232,14 @@ " --ftps-resume-ssl 打开数æ®è¿žæŽ¥æ—¶ç»§ç»­æŽ§åˆ¶è¿žæŽ¥ä¸­çš„ SSL/" "TLS 会è¯\n" -#: src/main.c:925 +#: src/main.c:926 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:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2232,68 +2247,68 @@ " --ftps-fallback-to-ftp 回è½åˆ° FTP，如果目标æœåŠ¡å™¨ä¸æ”¯æŒ " "FTPS\n" -#: src/main.c:931 +#: src/main.c:932 msgid "WARC options:\n" msgstr "WARC 选项：\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" " --warc-file=文件å 在一个 .warc.gz 文件里ä¿æŒè¯·æ±‚/å“应数æ®\n" -#: src/main.c:935 +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=字符串 在头部æ’å…¥ <字符串>\n" -#: src/main.c:937 +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr " --warc-max-size=æ•°å­— å°† WARC 的最大尺寸设置为 <æ•°å­—>\n" -#: src/main.c:939 +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx 写入 CDX 索引文件\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr " --warc-dedup=文件å ä¸è¦è®°å½•åˆ—在此 CDX 文件内的记录\n" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-warc-compression ä¸è¦ GZIP 压缩 WARC 文件\n" -#: src/main.c:947 +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ä¸è¦è®¡ç®— SHA1 摘è¦\n" -#: src/main.c:949 +#: src/main.c:950 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:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr " --warc-tempdir=目录 WARC 写入器的临时文件目录\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "递归下载：\n" -#: src/main.c:958 +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive 指定递归下载\n" -#: src/main.c:960 +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2301,13 +2316,13 @@ " -l, --level=æ•°å­— 最大递归深度 (inf 或 0 代表无é™åˆ¶ï¼Œå³å…¨éƒ¨" "下载)。\n" -#: src/main.c:962 +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after 下载完æˆåŽåˆ é™¤æœ¬åœ°æ–‡ä»¶\n" -#: src/main.c:964 +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2316,7 +2331,7 @@ " -k, --convert-links 让下载得到的 HTML 或 CSS 中的链接指å‘本地" "文件\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2324,28 +2339,28 @@ " --convert-file-only åªè½¬æ¢ URL 的文件部分（一般å«åšâ€œåŸºç¡€åâ€/" "basename）\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" " --backups=N 写入文件 X å‰ï¼Œè½®æ¢ç§»åŠ¨æœ€å¤š N 个备份文件\n" -#: src/main.c:973 +#: src/main.c:974 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:976 +#: src/main.c:977 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:979 +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2353,7 +2368,7 @@ " -m, --mirror -N -r -l inf --no-remove-listing 的缩写形" "å¼ã€‚\n" -#: src/main.c:981 +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2361,85 +2376,85 @@ " -p, --page-requisites 下载所有用于显示 HTML 页é¢çš„图片之类的元" "素。\n" -#: src/main.c:983 +#: src/main.c:984 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" " --strict-comments ç”¨ä¸¥æ ¼æ–¹å¼ (SGML) å¤„ç† HTML 注释。\n" -#: src/main.c:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "递归接å—/æ‹’ç»ï¼š\n" -#: src/main.c:989 +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=列表 逗å·åˆ†éš”çš„å¯æŽ¥å—的扩展å列表\n" -#: src/main.c:991 +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=列表 逗å·åˆ†éš”çš„è¦æ‹’ç»çš„扩展å列表\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr " --accept-regex=REGEX 匹é…接å—çš„ URL 的正则表达å¼\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=REGEX 匹é…æ‹’ç»çš„ URL 的正则表达å¼\n" -#: src/main.c:998 +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=类型 正则类型 (posix|pcre)\n" -#: src/main.c:1001 +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=类型 正则类型 (posix)\n" -#: src/main.c:1004 +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr " -D, --domains=列表 逗å·åˆ†éš”çš„å¯æŽ¥å—的域å列表\n" -#: src/main.c:1006 +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr " --exclude-domains=列表 逗å·åˆ†éš”çš„è¦æ‹’ç»çš„域å列表\n" -#: src/main.c:1008 +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr " --follow-ftp 跟踪 HTML 文档中的 FTP 链接\n" -#: src/main.c:1010 +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr " --follow-tags=列表 逗å·åˆ†éš”的跟踪的 HTML 标识列表\n" -#: src/main.c:1012 +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr " --ignore-tags=列表 逗å·åˆ†éš”的忽略的 HTML 标识列表\n" -#: src/main.c:1014 +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr " -H, --span-hosts 递归时转å‘外部主机\n" -#: src/main.c:1016 +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative 仅跟踪相对链接\n" -#: src/main.c:1018 +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=列表 å…许目录的列表\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2447,88 +2462,89 @@ msgstr "" " --trust-server-names 使用é‡å®šå‘ URL 的最åŽä¸€æ®µä½œä¸ºæœ¬åœ°æ–‡ä»¶å\n" -#: src/main.c:1023 +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=列表 排除目录的列表\n" -#: src/main.c:1025 +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent ä¸è¿½æº¯è‡³çˆ¶ç›®å½•\n" -#: src/main.c:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" -msgstr "请将错误报告或建议寄给 \n" +msgstr "请将错误报告ã€é—®é¢˜å’Œè®¨è®ºå¯„信至 \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"å’Œ/或在 https://savannah.gnu.org/bugs/?func=additem&group=wget å¼€ issue 进行" +"讨论。\n" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s，éžäº¤äº’å¼çš„网络文件下载工具。\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " msgstr "用户 %s 的密ç : " -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " msgstr "密ç : " -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" msgstr "无法创建管é“\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "读å–命令“%s %sâ€çš„å“应时出错：%s\n" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " msgstr "“%s%sâ€çš„用户å：" -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " msgstr "%s%s@%s 的密ç ï¼š" -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " msgstr "语区: " -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " msgstr "编译: " -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " msgstr "链接: " -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2537,29 +2553,29 @@ "GNU Wget %s 在 %s 上编译。\n" "\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" msgstr " %s (环境)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" msgstr " %s (用户)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, 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:1323 +#: src/main.c:1324 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2573,7 +2589,7 @@ #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2581,36 +2597,36 @@ "\n" "最åˆç”± Hrvoje NikÅ¡ić 编写。\n" -#: src/main.c:1337 +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" msgstr "请将错误报告或建议寄给 。\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" msgstr "内存分é…问题\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" msgstr "由于 %s 出错退出\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "请å°è¯•ä½¿ç”¨â€œ%s --helpâ€æŸ¥çœ‹æ›´å¤šçš„选项。\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s：éžæ³•çš„选项 -- “-n%câ€\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "未编译调试支æŒï¼Œå¿½ç•¥ --debug。\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2618,29 +2634,29 @@ msgstr "" "åŒæ—¶æŒ‡å®šäº† --no-clobber åŠ --convert-links å‚数，将使用 --convert-links\n" -#: src/main.c:1599 +#: src/main.c:1600 #, 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:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "无法åŒæ—¶ä½¿ç”¨è¯¦ç»†è¾“出模å¼å’Œå®‰é™æ¨¡å¼ã€‚\n" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "无法修改时间戳标记而ä¸æ›´æ”¹æœ¬åœ°æ–‡ä»¶ã€‚\n" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "无法åŒæ—¶æŒ‡å®š --inet4-only å’Œ --inet6-only。\n" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2652,7 +2668,7 @@ "结åˆä½¿ç”¨ã€‚å‚阅手册æ¥èŽ·å–详细信æ¯ã€‚\n" "\n" -#: src/main.c:1666 +#: src/main.c:1667 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" @@ -2662,7 +2678,7 @@ "会被放入您指定的那个å•ä¸€æ–‡ä»¶ã€‚\n" "\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2672,49 +2688,49 @@ "å‚阅手册æ¥èŽ·å–详细信æ¯ã€‚\n" "\n" -#: src/main.c:1692 +#: src/main.c:1693 #, 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:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "WARC 输出ä¸èƒ½å’Œæ—¶é—´æˆ³æ¨¡å¼ (timestamping) åŒæ—¶å·¥ä½œï¼ŒåŽè€…将被ç¦ç”¨ã€‚\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC 输出ä¸èƒ½å’Œ --spider åŒæ—¶å·¥ä½œã€‚\n" -#: src/main.c:1712 +#: src/main.c:1713 #, 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:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "å·²ç¦ç”¨æ‘˜è¦ï¼›WARC 去é‡å°†ä¸æŸ¥æ‰¾é‡å¤è®°å½•ã€‚\n" -#: src/main.c:1741 -#, fuzzy, c-format +#: src/main.c:1742 +#, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" -msgstr "WARC 输出ä¸èƒ½å’Œ --continue 或 --start-pos åŒæ—¶å·¥ä½œï¼ŒåŽè€…将被ç¦ç”¨ã€‚\n" +msgstr "压缩ä¸èƒ½å’Œ --continue 或 --start-pos åŒæ—¶å·¥ä½œï¼ŒåŽè€…将被ç¦ç”¨ã€‚\n" -#: src/main.c:1752 +#: src/main.c:1753 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "无法åŒæ—¶æŒ‡å®š --ask-password å’Œ --password。\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2722,17 +2738,17 @@ msgstr "" "ä¸æŽ¨èåŒæ—¶æŒ‡å®š --start-pos åŠ --continue å‚数；将ç¦ç”¨ --continue å‚数。\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s：未指定 URL\n" -#: src/main.c:1815 +#: src/main.c:1822 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "无法åŒæ—¶æŒ‡å®š --post-data å’Œ --post-file。\n" -#: src/main.c:1820 +#: src/main.c:1827 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2741,7 +2757,7 @@ "--post-data åŠ --post-file å‚æ•°ä¸èƒ½ä¸Ž --method 一起使用。--method 期望从 --" "body-data åŠ --body-file å‚数获å–æ•°æ®\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2750,23 +2766,23 @@ "使用 --body-data 或 --body-file å‚数时必须通过 --method=HTTPMethod 指定一个传" "输方å¼ã€‚\n" -#: src/main.c:1835 +#: src/main.c:1842 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "无法åŒæ—¶æŒ‡å®š --body-data å’Œ --body-file。\n" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" msgstr "此版本ä¸æ”¯æŒ IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, 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:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2774,42 +2790,42 @@ msgstr "" "--convert-links 或 --convert-file-only åªæœ‰åœ¨è¾“出至普通文件时æ‰å¯å…±ç”¨ã€‚\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" msgstr "未能åˆå§‹åŒ– libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" msgstr "未能åˆå§‹åŒ– c-ares ä¿¡é“\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "æ— æ³•è§£æž IP 地å€â€œ%sâ€\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "错误：未能设置 DNS æœåŠ¡å™¨â€œ%sâ€ï¼ˆ%d）。\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "在 %s 中找ä¸åˆ° URL。\n" -#: src/main.c:2200 +#: src/main.c:2207 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "æ— æ³•è§£æž metalink 文件 %s。\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "无法从 %s 下载所有资æºã€‚\n" -#: src/main.c:2257 +#: src/main.c:2264 #, c-format msgid "" "FINISHED --%s--\n" @@ -2820,7 +2836,7 @@ "总用时：%2$s\n" "下载了：%3$d 个文件，%5$s (%6$s) 中的 %4$s\n" -#: src/main.c:2271 +#: src/main.c:2278 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "超过下载é™é¢ (%s 字节)ï¼\n" @@ -2835,9 +2851,9 @@ msgstr "[--trust-server-names %s, --directory-prefix=%s]\n" #: src/metalink.c:176 -#, fuzzy, c-format +#, c-format msgid "Planned metalink file: %s\n" -msgstr "æ— æ³•è§£æž metalink 文件 %s。\n" +msgstr "计划的 metalink 文件：%s\n" #: src/metalink.c:179 #, fuzzy, c-format @@ -2986,7 +3002,7 @@ msgid "Continuing in background, pid %lu.\n" msgstr "继续在åŽå°è¿è¡Œï¼Œpid 为 %lu。\n" -#: src/mswindows.c:291 src/utils.c:505 +#: src/mswindows.c:291 src/utils.c:508 #, c-format msgid "Output will be written to %s.\n" msgstr "将把输出写入至 %s。\n" @@ -3031,64 +3047,62 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s：无法 stat %s：%s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "警告: 正在使用一个弱å£ä»¤çš„éšæœºç§å­ã€‚\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "无法 seed PRNG；考虑使用 --random-file。\n" -#: src/openssl.c:263 -#, fuzzy +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "ä½ çš„ OpenSSL 版本太è€ï¼Œä¸æ”¯æŒ TLSv1.1\n" +msgstr "您的 OpenSSL 版本太旧，ä¸æ”¯æŒ TLS 1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" -msgstr "ä½ çš„ OpenSSL 版本太è€ï¼Œä¸æ”¯æŒ TLSv1.1\n" +msgstr "您的 OpenSSL 版本太旧，ä¸æ”¯æŒ TLSv1.1\n" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" -msgstr "ä½ çš„ OpenSSL 版本太è€ï¼Œä¸æ”¯æŒ TLSv1.2\n" +msgstr "您的 OpenSSL 版本太旧，ä¸æ”¯æŒ TLSv1.2\n" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL：未实现‘secure-protocol’选项值 %d\n" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s：无效的 URL %s: %s\n" +msgstr "OpenSSL：无效的 cipher 列表：%s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "无法 seed PRNG；考虑使用 --random-file。\n" +msgstr "警告：无法 seed PRNG；考虑使用 --random-file。\n" -#: src/openssl.c:856 +#: src/openssl.c:860 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: æ— æ³•éªŒè¯ %s çš„ç”± %s é¢å‘çš„è¯ä¹¦:\n" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" msgstr " 无法本地校验é¢å‘者的æƒé™ã€‚\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" msgstr " 出现了自己签åçš„è¯ä¹¦ã€‚\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" msgstr " é¢å‘çš„è¯ä¹¦è¿˜æœªç”Ÿæ•ˆã€‚\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" msgstr " é¢å‘çš„è¯ä¹¦å·²ç»è¿‡æœŸã€‚\n" -#: src/openssl.c:966 +#: src/openssl.c:970 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3097,13 +3111,13 @@ "%s: 没有匹é…çš„è¯ä¹¦ä¸»ä½“别å (Subject Alternative Name)。\n" "\t请求的主机å为 %s。\n" -#: src/openssl.c:985 +#: src/openssl.c:989 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr " %s: è¯ä¹¦é€šç”¨å %s 与所è¦æ±‚的主机å %s ä¸ç¬¦ã€‚\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3114,7 +3128,7 @@ " è¿™å¯èƒ½æ„味ç€è¯¥ä¸»æœºæ‰€å£°ç§°çš„身份与实际ä¸ç¬¦ã€‚\n" " (也就是说，它ä¸æ˜¯çœŸæ­£çš„ %s)。\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "è¦ä»¥ä¸å®‰å…¨çš„æ–¹å¼è¿žæŽ¥è‡³ %s，使用“--no-check-certificateâ€ã€‚\n" @@ -3152,7 +3166,7 @@ #: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" -msgstr "正在删除 %s 因为它应该被指定了拒ç»ä¸‹è½½ã€‚\n" +msgstr "正在删除 %s 因它应该被指定为拒ç»ä¸‹è½½ã€‚\n" #: src/res.c:394 #, c-format @@ -3163,22 +3177,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "正在载入 robots.txt；请忽略错误消æ¯ã€‚\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "解æžä»£ç†æœåŠ¡å™¨ URL %s æ—¶å‘生错误：%s。\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "代ç†æœåŠ¡å™¨ URL %s 错误：必须是 HTTP。\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "已超过 %d 次é‡å®šå‘。\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3186,7 +3200,7 @@ "放弃æ“作。\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3255,97 +3269,105 @@ msgid "HTTPS support not compiled in" msgstr "未将 HTTPS 支æŒç¼–译到程åºä¸­" -#: src/url.c:1604 -#, fuzzy +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "出现ä¸å®Œæ•´æˆ–无效的多字节åºåˆ—\n" +msgstr "出现无法转æ¢çš„多字节åºåˆ—\n" -#: src/utils.c:125 +#: src/utils.c:128 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: 无法分é…足够内存；内存耗尽。\n" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: æ— æ³•åˆ†é… %ld 字节；内存耗尽。\n" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: 文本缓冲区太大 (%d 字节)，退出。\n" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "继续在åŽå°è¿è¡Œï¼Œpid 为 %d。\n" -#: src/utils.c:554 +#: src/utils.c:557 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "无法删除符å·é“¾æŽ¥ %s: %s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "未能åˆå§‹åŒ– libcares\n" +msgstr "Fopen 打开文件 %s 失败\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "无法设定 %s çš„æƒé™\n" +msgstr "无法获å–文件 %s 的文件æ述符\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "无法设定 %s çš„æƒé™\n" +msgstr "无法对文件 %s 进行 stat，（请检查æƒé™ï¼‰\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." -msgstr "" +msgstr "文件 %s 自上次检查åŽå·²æ”¹å˜ã€‚安全检查失败。" -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "æ— æ³•è§£æž IP 地å€â€œ%sâ€\n" +msgstr "打开文件 %s 失败，原因：%s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "无法设定 %s çš„æƒé™\n" +msgstr "无法对文件 %s 进行 stat，错误：%s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." -msgstr "" +msgstr "å°è¯•æ‰“开文件 %s 但它自上次检查åŽå·²æ”¹å˜ã€‚安全检查失败。" + +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "æ— æ•ˆçš„æ­£åˆ™è¡¨è¾¾å¼ %s, PCRE2 错误 %d\n" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "æ— æ•ˆçš„æ­£åˆ™è¡¨è¾¾å¼ %s, %s\n" -#: src/utils.c:2486 src/utils.c:2510 +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 #, c-format msgid "Error while matching %s: %d\n" msgstr "åŒ¹é… %s 出错: %d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "跳过大å°é”™è¯¯çš„ key（%d/%d）：%s\n" + +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "å¤åˆ¶ WARC 文件æ述符时出错。\n" -#: src/warc.c:223 +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" msgstr "从 GZIP æµæ‰“å¼€ WARC 文件失败。\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" msgstr "å‘ WARC 文件写入 warcinfo 记录时å‘生错误。\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" @@ -3354,24 +3376,24 @@ "正打开 WARC 文件 %s。\n" "\n" -#: src/warc.c:867 +#: src/warc.c:878 #, c-format msgid "Error opening WARC file %s.\n" msgstr "打开 WARC 文件 %s 出错。\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" msgstr "CDX æ–‡ä»¶æœªåˆ—å‡ºæº URL。（缺少列 'a'）\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" msgstr "CDX 文件未列出校验值。（缺少列 'k'）\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" msgstr "CDX 文件未列出记录 ID。（缺少列 'u'）\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3383,32 +3405,32 @@ "从 CDX 加载了 %d 个记录。\n" "\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" msgstr "æ— æ³•è¯»å– CDX 文件 %s 以供去é‡ã€‚\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" msgstr "无法打开临时 WARC 清å•æ–‡ä»¶ã€‚\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" msgstr "无法打开临时 WARC 日志文件。\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" msgstr "无法打开 WARC 文件。\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" msgstr "无法打开 CDX 文件以供输出。\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" msgstr "无法打开临时 WARC 文件。\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "从 CDX 文件å‘现了精确匹é…。正将é‡è®¿é—®è®°å½•ä¿å­˜åˆ° WARC。\n" Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/po/zh_TW.gmo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/po/zh_TW.gmo differ diff -Nru wget-1.19.5/po/zh_TW.po wget-1.20.1/po/zh_TW.po --- wget-1.19.5/po/zh_TW.po 2018-05-06 16:48:24.000000000 +0000 +++ wget-1.20.1/po/zh_TW.po 2018-12-26 20:10:51.000000000 +0000 @@ -1,33 +1,35 @@ -# traditional Chinese translation of wget. +# Traditional Chinese translation of wget. # Copyright (C) 1998, 2000, 01, 02, 05 Free Software Foundation, Inc. +# This file is distributed under the same license as the wget package. # CD Chen , 1998. # Pofeng Lee , 1998. # Jing-Jong Shyue , 2000. # Abel Cheung , 2001-2002, 2005. +# pan93412 , 2018. # msgid "" msgstr "" -"Project-Id-Version: wget 1.10.1-b1\n" +"Project-Id-Version: wget 1.20\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2018-05-06 18:48+0200\n" -"PO-Revision-Date: 2005-08-17 13:30+0800\n" -"Last-Translator: Abel Cheung \n" +"POT-Creation-Date: 2018-12-26 21:10+0100\n" +"PO-Revision-Date: 2018-11-17 14:02+0800\n" +"Last-Translator: pan93412 \n" "Language-Team: Chinese (traditional) \n" "Language: zh_TW\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" +"X-Generator: Poedit 2.2\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: lib/error.c:195 -#, fuzzy msgid "Unknown system error" -msgstr "錯誤原因ä¸æ˜Ž" +msgstr "未知系統錯誤" #: lib/gai_strerror.c:57 -#, fuzzy msgid "Address family for hostname not supported" -msgstr "ä¸æ”¯æ´ IPv6 ä½å€" +msgstr "ä¸æ”¯æ´ä¸»æ©Ÿå稱的ä½å€ç³»åˆ—" #: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" @@ -35,109 +37,106 @@ #: lib/gai_strerror.c:59 msgid "Bad value for ai_flags" -msgstr "" +msgstr "ai_flags 值無效" #: lib/gai_strerror.c:60 -#, fuzzy msgid "Non-recoverable failure in name resolution" -msgstr "暫時無法檢索主機å稱" +msgstr "解æžå稱時發生無法挽救的錯誤" #: lib/gai_strerror.c:61 msgid "ai_family not supported" -msgstr "" +msgstr "ä¸æ”¯æ´ ai_family" #: lib/gai_strerror.c:62 msgid "Memory allocation failure" -msgstr "" +msgstr "記憶體分é…失敗" #: lib/gai_strerror.c:63 msgid "No address associated with hostname" -msgstr "" +msgstr "沒有å°æ‡‰åˆ°æ­¤ä¸»æ©Ÿå稱的ä½å€" #: lib/gai_strerror.c:64 msgid "Name or service not known" -msgstr "" +msgstr "未知的å稱或æœå‹™" #: lib/gai_strerror.c:65 msgid "Servname not supported for ai_socktype" -msgstr "" +msgstr "ai_socktype ä¸æ”¯æ´ä¼ºæœå™¨å稱" #: lib/gai_strerror.c:66 -#, fuzzy msgid "ai_socktype not supported" -msgstr "ä¸æ”¯æ´ IPv6 ä½å€" +msgstr "ä¸æ”¯æ´ ai_socktype" #: lib/gai_strerror.c:67 -#, fuzzy msgid "System error" -msgstr "沒有錯誤" +msgstr "系統錯誤" #: lib/gai_strerror.c:68 msgid "Argument buffer too small" -msgstr "" +msgstr "引數緩è¡å€éŽå°" #: lib/gai_strerror.c:70 msgid "Processing request in progress" -msgstr "" +msgstr "正在處ç†è«‹æ±‚" #: lib/gai_strerror.c:71 msgid "Request canceled" -msgstr "" +msgstr "å·²å–消請求" #: lib/gai_strerror.c:72 msgid "Request not canceled" -msgstr "" +msgstr "請求未å–消" #: lib/gai_strerror.c:73 msgid "All requests done" -msgstr "" +msgstr "已完æˆæ‰€æœ‰è«‹æ±‚" #: lib/gai_strerror.c:74 msgid "Interrupted by a signal" -msgstr "" +msgstr "被一個信號中止" #: lib/gai_strerror.c:75 msgid "Parameter string not correctly encoded" -msgstr "" +msgstr "引數字串以ä¸æ­£ç¢ºçš„æ–¹å¼ç·¨ç¢¼" #: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "錯誤原因ä¸æ˜Ž" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: é¸é …‘%s’ä¸æ˜Žç¢º\n" +msgstr "%s：「%s%sã€é¸é …ä¸æ˜Žç¢º\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: é¸é …‘%s’ä¸æ˜Žç¢º\n" +msgstr "%s：é¸é …「%s%sã€ä¸æ˜Žç¢ºï¼›å¯èƒ½å€¼ç‚ºï¼š" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: 無法識別é¸é …‘%c%s’\n" +msgstr "%s：無法識別的é¸é …「%s%sã€\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: é¸é …‘%c%s’ä¸å¯é…åˆå¼•æ•¸ä½¿ç”¨\n" +msgstr "%s：「%s%sã€é¸é …ä¸å…許引數\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: é¸é …‘%s’需è¦å¼•æ•¸\n" +msgstr "%s：「%s%sã€é¸é …需è¦å¼•æ•¸\n" #: lib/getopt.c:621 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: é¸é …無效 ─ %c\n" +msgstr "%s：無效的é¸é … --「%cã€\n" #: lib/getopt.c:636 lib/getopt.c:682 -#, fuzzy, c-format +#, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: é¸é …需è¦å¼•æ•¸ ─ %c\n" +msgstr "%s：é¸é …需è¦å¼•æ•¸ --「%cã€\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -162,127 +161,124 @@ #. and use glyphs suitable for your language. #: lib/quotearg.c:362 msgid "`" -msgstr "" +msgstr "`" #: lib/quotearg.c:363 msgid "'" -msgstr "" +msgstr "'" #: lib/regcomp.c:135 msgid "Success" -msgstr "" +msgstr "æˆåŠŸ" #: lib/regcomp.c:138 msgid "No match" -msgstr "" +msgstr "沒有符åˆé …ç›®" #: lib/regcomp.c:141 msgid "Invalid regular expression" -msgstr "" +msgstr "無效的正è¦è¡¨é”å¼" #: lib/regcomp.c:144 msgid "Invalid collation character" -msgstr "" +msgstr "無效的整ç†å­—å…ƒ" #: lib/regcomp.c:147 -#, fuzzy msgid "Invalid character class name" -msgstr "主機å稱無效" +msgstr "無效的字元類別å稱" #: lib/regcomp.c:150 msgid "Trailing backslash" -msgstr "" +msgstr "尾隨倒斜線" #: lib/regcomp.c:153 -#, fuzzy msgid "Invalid back reference" -msgstr "用戶å稱無效" +msgstr "無效的後å‘引用" #: lib/regcomp.c:156 msgid "Unmatched [, [^, [:, [., or [=" -msgstr "" +msgstr "沒有符åˆçš„ [ã€[^ã€[:ã€[. 或 [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" -msgstr "" +msgstr "沒有符åˆçš„ ( 或 \\(" #: lib/regcomp.c:162 msgid "Unmatched \\{" -msgstr "" +msgstr "沒有符åˆçš„ \\{" #: lib/regcomp.c:165 msgid "Invalid content of \\{\\}" -msgstr "" +msgstr "無效的 \\{\\} 內容" #: lib/regcomp.c:168 -#, fuzzy msgid "Invalid range end" -msgstr "用戶å稱無效" +msgstr "無效的範åœçµå°¾" #: lib/regcomp.c:171 msgid "Memory exhausted" -msgstr "" +msgstr "記憶體用盡" #: lib/regcomp.c:174 msgid "Invalid preceding regular expression" -msgstr "" +msgstr "無效的å‰ç½®æ­£è¦è¡¨é”å¼" #: lib/regcomp.c:177 msgid "Premature end of regular expression" -msgstr "" +msgstr "æ­£è¦è¡¨é”å¼æå‰çµæŸ" #: lib/regcomp.c:180 msgid "Regular expression too big" -msgstr "" +msgstr "æ­£è¦è¡¨é”å¼éŽå¤§" #: lib/regcomp.c:183 msgid "Unmatched ) or \\)" -msgstr "" +msgstr "沒有符åˆçš„ ) 或 \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:688 msgid "No previous regular expression" -msgstr "" +msgstr "沒有上一個正è¦è¡¨é”å¼" -#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 -#: lib/spawn-pipe.c:269 +#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" -msgstr "" +msgstr "無法建立管線" -#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 +#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" -msgstr "" +msgstr "%s å­åŸ·è¡Œç¨‹åºå¤±æ•—" #: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" -msgstr "" +msgstr "_open_osfhandle 失敗" #: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" -msgstr "" +msgstr "無法還原第 %d 個 fd：dup2 失敗" #: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317 #, c-format msgid "%s subprocess" -msgstr "" +msgstr "%s å­åŸ·è¡Œç¨‹åº" #: lib/wait-process.c:274 lib/wait-process.c:346 #, c-format msgid "%s subprocess got fatal signal %d" -msgstr "" +msgstr "%s å­åŸ·è¡Œç¨‹åºå–å¾—åš´é‡éŒ¯èª¤ä¿¡è™Ÿ %d" #: lib/xalloc-die.c:34 msgid "memory exhausted" -msgstr "" +msgstr "記憶體用盡" #: src/connect.c:200 -#, fuzzy, c-format +#, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" -msgstr "%s: 無法解æžä½å€ ‘%s’；ä¸ä½¿ç”¨ bind。\n" +msgstr "%sï¼šç„¡æ³•è§£æž bind ä½å€ %sï¼›é¸æ“‡åœç”¨ bind。\n" #: src/connect.c:281 #, c-format @@ -295,14 +291,14 @@ msgstr "正在連接 %s:%d... " #: src/connect.c:292 -#, fuzzy, c-format +#, c-format msgid "Connecting to [%s]:%d... " -msgstr "正在連接 %s:%d... " +msgstr "正在連線到 [%s]:%d…" #: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" -msgstr "" +msgstr "setsockopt SO_RCVBUF 失敗：%s\n" #: src/connect.c:356 msgid "connected.\n" @@ -313,30 +309,30 @@ msgid "failed: %s.\n" msgstr "失敗: %s。\n" -#: src/connect.c:399 src/http.c:2105 -#, fuzzy, c-format +#: src/connect.c:399 src/http.c:2108 +#, c-format msgid "%s: unable to resolve host address %s\n" -msgstr "%s: 無法解æžä½å€ ‘%s’；ä¸ä½¿ç”¨ bind。\n" +msgstr "%s：無法解æžä¸»æ©Ÿä½å€ %s\n" #: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" -msgstr "" +msgstr "setsockopt SO_REUSEADDR 失敗：%s\n" #: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" -msgstr "" +msgstr "é–‹å•ŸéŽå¤š fd。無法在 fd >= %d 的環境下使用 select\n" #: src/convert.c:198 -#, fuzzy, c-format +#, c-format msgid "Converted links in %d files in %s seconds.\n" -msgstr "已在 %3$.*2$f 秒之內轉æ›äº† %1$d 個檔案。\n" +msgstr "已在 %2$s 秒轉æ›å¥½ %1$d 個檔案中的連çµã€‚\n" #: src/convert.c:227 -#, fuzzy, c-format +#, c-format msgid "Converting links in %s... " -msgstr "æ­£åœ¨è½‰æ› %s... " +msgstr "æ­£åœ¨è½‰æ› %s 中連çµâ€¦" #: src/convert.c:240 msgid "nothing to do.\n" @@ -348,9 +344,9 @@ msgstr "ç„¡æ³•è½‰æ› %s 中的éˆçµ: %s\n" #: src/convert.c:263 -#, fuzzy, c-format +#, c-format msgid "Unable to delete %s: %s\n" -msgstr "無法刪除‘%s’: %s\n" +msgstr "無法刪除 %s：%s\n" #: src/convert.c:578 #, c-format @@ -358,9 +354,9 @@ msgstr "無法將 %s å‚™ä»½æˆ %s: %s\n" #: src/cookies.c:310 -#, fuzzy, c-format +#, c-format msgid "Unable to get cookie for %s\n" -msgstr "無法刪除‘%s’: %s\n" +msgstr "無法å–å¾— %s çš„ cookie\n" #: src/cookies.c:457 #, c-format @@ -368,29 +364,29 @@ msgstr "Set-Cookie 出ç¾èªžæ³•éŒ¯èª¤: 在 %2$d ä½ç½®çš„ %1$s。\n" #: src/cookies.c:771 -#, fuzzy, c-format +#, c-format msgid "Cookie coming from %s attempted to set domain to " -msgstr "來自 %s çš„ cookie 嘗試將網域設定為 %s\n" +msgstr "來自 %s çš„ cookie 嘗試將網域設定為 " #: src/cookies.c:774 src/spider.c:92 #, c-format msgid "%s\n" -msgstr "" +msgstr "%s\n" #: src/cookies.c:1225 src/cookies.c:1346 -#, fuzzy, c-format +#, c-format msgid "Cannot open cookies file %s: %s\n" -msgstr "無法開啟 cookie 檔‘%s’: %s\n" +msgstr "無法開啟 cookie 檔案 %s：%s\n" #: src/cookies.c:1383 -#, fuzzy, c-format +#, c-format msgid "Error writing to %s: %s\n" -msgstr "寫入‘%s’時發生錯誤: %s\n" +msgstr "儲存到「%sã€æ™‚出錯：%s\n" #: src/cookies.c:1386 -#, fuzzy, c-format +#, c-format msgid "Error closing %s: %s\n" -msgstr "關閉‘%s’時發生錯誤: %s\n" +msgstr "關閉「%sã€æ™‚出錯：%s\n" #: src/ftp-ls.c:1045 msgid "Unsupported listing type, trying Unix listing parser.\n" @@ -436,12 +432,12 @@ msgid "Length: %s" msgstr "長度: %s" -#: src/ftp.c:231 src/http.c:4037 +#: src/ftp.c:231 src/http.c:4030 #, c-format msgid ", %s (%s) remaining" msgstr "，剩餘 %s (%s)" -#: src/ftp.c:235 src/http.c:4041 +#: src/ftp.c:235 src/http.c:4034 #, c-format msgid ", %s remaining" msgstr "，剩餘 %s" @@ -452,7 +448,7 @@ #: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." -msgstr "" +msgstr "無法åˆå§‹åŒ– SSL。將åœç”¨ SSL。" #: src/ftp.c:485 #, c-format @@ -488,12 +484,12 @@ #: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" -msgstr "" +msgstr "伺æœå™¨ä¸æŽ¥å—「PBSZ 0ã€æŒ‡ä»¤ã€‚\n" #: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" -msgstr "" +msgstr "伺æœå™¨ä¸æŽ¥å—「PROT %cã€æŒ‡ä»¤ã€‚\n" #: src/ftp.c:598 msgid "Server error, can't determine system type.\n" @@ -522,7 +518,7 @@ #: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" -msgstr "" +msgstr "在 getftp() 中é”到é‚輯上ä¸å¯èƒ½çš„å€åŸŸ" #: src/ftp.c:940 #, c-format @@ -531,14 +527,17 @@ "cwd_start: %d\n" "cwd_end: %d\n" msgstr "" +"cwd_count: %d\n" +"cwd_start: %d\n" +"cwd_end: %d\n" #: src/ftp.c:970 -#, fuzzy, c-format +#, c-format msgid "" "No such directory %s.\n" "\n" msgstr "" -"目錄‘%s’ä¸å­˜åœ¨ã€‚\n" +"ä¸å­˜åœ¨çš„目錄「%sã€ã€‚\n" "\n" #: src/ftp.c:991 @@ -546,9 +545,8 @@ msgstr "==> ä¸éœ€è¦ CWD (切æ›è·¯å¾‘)。\n" #: src/ftp.c:1034 -#, fuzzy msgid "File has already been retrieved.\n" -msgstr "檔案 ‘%s’ 已存在，ä¸æœƒä¸‹è¼‰ã€‚\n" +msgstr "檔案已接收。\n" #: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" @@ -583,34 +581,32 @@ #: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" -msgstr "" +msgstr "已存在 %s 檔案。\n" #: src/ftp.c:1246 -#, fuzzy, c-format +#, c-format msgid "No such file %s.\n" -msgstr "" -"檔案‘%s’ä¸å­˜åœ¨ã€‚\n" -"\n" +msgstr "ä¸å­˜åœ¨æª”案 %s。\n" #: src/ftp.c:1296 -#, fuzzy, c-format +#, c-format msgid "" "No such file %s.\n" "\n" msgstr "" -"檔案‘%s’ä¸å­˜åœ¨ã€‚\n" +"ä¸å­˜åœ¨æª”案 %s。\n" "\n" #: src/ftp.c:1346 -#, fuzzy, c-format +#, c-format msgid "" "No such file or directory %s.\n" "\n" msgstr "" -"檔案或目錄‘%s’ä¸å­˜åœ¨ã€‚\n" +"ä¸å­˜åœ¨æª”案或目錄 %s。\n" "\n" -#: src/ftp.c:1505 src/http.c:2560 +#: src/ftp.c:1505 src/http.c:2563 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s çªç„¶å‡ºç¾ã€‚\n" @@ -633,49 +629,49 @@ msgid "Data transfer aborted.\n" msgstr "已中止傳é€è³‡æ–™ã€‚\n" -#: src/ftp.c:1863 src/main.c:1681 -#, fuzzy, c-format +#: src/ftp.c:1863 src/main.c:1682 +#, c-format msgid "File %s already there; not retrieving.\n" -msgstr "檔案 ‘%s’ 已存在，ä¸æœƒä¸‹è¼‰ã€‚\n" +msgstr "已存在檔案「%sã€ï¼›é¸æ“‡ä¸æŽ¥æ”¶ã€‚\n" -#: src/ftp.c:1948 src/http.c:4307 +#: src/ftp.c:1948 src/http.c:4300 #, c-format msgid "(try:%2d)" msgstr "(嘗試第 %2d 次)" -#: src/ftp.c:2039 src/http.c:4723 -#, fuzzy, c-format +#: src/ftp.c:2039 src/http.c:4731 +#, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -"%s (%s) -- 已儲存 ‘%s’ [%s/%s])\n" +"%s (%s) - 寫入到 stdout %s[%s]\n" "\n" -#: src/ftp.c:2040 src/http.c:4724 -#, fuzzy, c-format +#: src/ftp.c:2040 src/http.c:4732 +#, c-format msgid "" "%s (%s) - %s saved [%s]\n" "\n" msgstr "" -"%s (%s) - 已儲存‘%s’ [%s]\n" +"%s (%s) - 已儲存 %s [%s]\n" "\n" -#: src/ftp.c:2100 src/main.c:2165 src/metalink.c:1135 src/recur.c:511 -#: src/recur.c:749 src/retr.c:1293 +#: src/ftp.c:2100 src/main.c:2172 src/metalink.c:1135 src/recur.c:511 +#: src/recur.c:749 src/retr.c:1309 #, c-format msgid "Removing %s.\n" msgstr "刪除 %s。\n" #: src/ftp.c:2157 -#, fuzzy, c-format +#, c-format msgid "Using %s as listing tmp file.\n" -msgstr "使用‘%s’作為檔案清單暫存檔。\n" +msgstr "å°‡ %s 使用為列出暫存檔案用途。\n" #: src/ftp.c:2174 -#, fuzzy, c-format +#, c-format msgid "Removed %s.\n" -msgstr "已刪除‘%s’。\n" +msgstr "已移除 %s。\n" #: src/ftp.c:2213 #, c-format @@ -683,16 +679,18 @@ msgstr "éˆçµæ·±åº¦ %d 超éŽæœ€å¤§å€¼ %d。\n" #: src/ftp.c:2283 -#, fuzzy, c-format +#, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" -msgstr "é ç«¯æª”案ä¸æ¯”本機檔案‘%s’新 ─ ä¸æœƒä¸‹è¼‰ã€‚\n" +msgstr "é ç«¯æª”案沒比本機檔案 %s æ–° -- é¸æ“‡ä¸æŽ¥æ”¶ã€‚\n" #: src/ftp.c:2291 -#, fuzzy, c-format +#, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" -msgstr "é ç«¯æª”案較本機檔案‘%s’新 ─ 會下載檔案。\n" +msgstr "" +"é ç«¯æª”案比本機檔案 %s æ–° -- é¸æ“‡æŽ¥æ”¶ã€‚\n" +"\n" #: src/ftp.c:2298 #, c-format @@ -722,14 +720,14 @@ msgstr "建立符號éˆçµ %s → %s\n" #: src/ftp.c:2352 -#, fuzzy, c-format +#, c-format msgid "Symlinks not supported, skipping symlink %s.\n" -msgstr "本系統ä¸æ”¯æ´ç¬¦è™Ÿéˆçµï¼Œç•¥éŽç¬¦è™Ÿéˆçµâ€˜%s’。\n" +msgstr "ä¸æ”¯æ´ç¬¦è™Ÿé€£çµï¼Œé¸æ“‡è·³éŽç¬¦è™Ÿé€£çµ %s。\n" #: src/ftp.c:2367 -#, fuzzy, c-format +#, c-format msgid "Skipping directory %s.\n" -msgstr "ç•¥éŽç›®éŒ„‘%s’。\n" +msgstr "é¸æ“‡è·³éŽç›®éŒ„ %s。\n" #: src/ftp.c:2380 #, c-format @@ -737,9 +735,9 @@ msgstr "%s: 檔案類別ä¸è©³æˆ–ä¸æ”¯æ´ã€‚\n" #: src/ftp.c:2404 -#, fuzzy, c-format +#, c-format msgid "Failed to set permissions for %s.\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "無法設定 %s 的權é™ã€‚\n" #: src/ftp.c:2425 #, c-format @@ -752,171 +750,183 @@ msgstr "因為深度為 %d (最大值為 %d)，所以ä¸ä¸‹è¼‰ã€‚\n" #: src/ftp.c:2500 -#, fuzzy, c-format +#, c-format msgid "Not descending to %s as it is excluded/not-included.\n" -msgstr "ä¸é€²å…¥â€˜%s’目錄因為已被排除或ä¸è¢«åˆ—入清單中。\n" +msgstr "未進入到 %s å› å…¶ä¸åŒ…å«æˆ–被排除\n" -#: src/ftp.c:2590 src/ftp.c:2604 -#, fuzzy, c-format +#: src/ftp.c:2613 +#, c-format msgid "Rejecting %s.\n" -msgstr "拒絕‘%s’。\n" +msgstr "拒絕 %s。\n" + +#: src/ftp.c:2623 +#, c-format +msgid "Rejecting %s (Invalid Entry).\n" +msgstr "拒絕 %s (無效項目)。\n" + +#: src/ftp.c:2631 +#, c-format +msgid "%s is excluded/not-included through regex.\n" +msgstr "%s 被從正è¦è¡¨é”å¼æŽ’除或ä¸åŒ…å«ã€‚\n" -#: src/ftp.c:2627 -#, fuzzy, c-format +#: src/ftp.c:2645 +#, c-format msgid "Error matching %s against %s: %s\n" -msgstr "寫入‘%s’時發生錯誤: %s\n" +msgstr "å°‡ %s 與 %s 比較時發生錯誤：%s\n" -#: src/ftp.c:2683 -#, fuzzy, c-format +#: src/ftp.c:2685 +#, c-format msgid "No matches on pattern %s.\n" -msgstr "沒有任何項目符åˆæ¨£å¼â€˜%s’。\n" +msgstr "æ²’æœ‰ç¬¦åˆ %s 樣å¼çš„çµæžœã€‚\n" -#: src/ftp.c:2755 -#, fuzzy, c-format +#: src/ftp.c:2757 +#, c-format msgid "Wrote HTML-ized index to %s [%s].\n" -msgstr "å°‡ HTML 化的索引寫入至 ‘%s’ [%s]。\n" +msgstr "å°‡ HTML 化的索引寫入至 %s [%s]。\n" -#: src/ftp.c:2760 -#, fuzzy, c-format +#: src/ftp.c:2762 +#, c-format msgid "Wrote HTML-ized index to %s.\n" -msgstr "å°‡ HTML 化的索引寫入至 ‘%s’。\n" +msgstr "å°‡ HTML 化的索引寫至 %s。\n" -#: src/gnutls.c:114 +#: src/gnutls.c:119 #, c-format msgid "ERROR: Cannot open directory %s.\n" -msgstr "" +msgstr "錯誤：無法開啟 %s 目錄。\n" -#: src/gnutls.c:164 +#: src/gnutls.c:169 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" -msgstr "" +msgstr "錯誤：無法開啟 %s 憑證：(%d)。\n" -#: src/gnutls.c:169 +#: src/gnutls.c:174 #, c-format msgid "Loaded CA certificate '%s'\n" -msgstr "" +msgstr "已載入 CA 憑證「%sã€\n" -#: src/gnutls.c:179 +#: src/gnutls.c:184 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" -msgstr "" +msgstr "錯誤：無法載入 CRL 檔案「%sã€ï¼š(%d)\n" -#: src/gnutls.c:183 +#: src/gnutls.c:188 #, c-format msgid "Loaded CRL file '%s'\n" -msgstr "" +msgstr "已載入 CRL 檔案「%sã€\n" -#: src/gnutls.c:207 +#: src/gnutls.c:212 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" -msgstr "" +msgstr "錯誤：GnuTLS è¦æ±‚金鑰與憑證必須為åŒä¸€æ ¼å¼ã€‚\n" + +#: src/gnutls.c:664 src/gnutls.c:728 +msgid "Your GnuTLS version is too old to support TLS 1.3\n" +msgstr "您的 OpenSSL 版本舊到ä¸æ”¯æ´ TLS 1.3\n" -#: src/gnutls.c:576 +#: src/gnutls.c:676 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" -msgstr "" +msgstr "GnuTLS：未實åšã€Œsecure-protocolã€é¸é …的值 %u\n" -#: src/gnutls.c:578 src/gnutls.c:615 src/host.c:157 src/openssl.c:280 -#, fuzzy +#: src/gnutls.c:678 src/gnutls.c:734 src/host.c:157 src/openssl.c:284 msgid "Please report this issue to bug-wget@gnu.org\n" -msgstr "請將錯誤報告或建議寄給 。\n" +msgstr "請回報此å•é¡Œè‡³ bug-wget@gnu.org\n" -#: src/gnutls.c:614 +#: src/gnutls.c:733 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" -msgstr "" +msgstr "GnuTLS：未實åšã€Œsecure-protocolã€é¸é …的值 %d\n" -#: src/gnutls.c:662 +#: src/gnutls.c:786 msgid "" "GnuTLS: Cannot set prio string directly. Falling back to default priority.\n" -msgstr "" +msgstr "GnuTLS：無法直接設定優先級 (prio) 字串。é¸æ“‡é€€å›žåˆ°é è¨­çš„優先級。\n" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "ERROR" msgstr "錯誤" -#: src/gnutls.c:790 src/openssl.c:821 +#: src/gnutls.c:914 src/openssl.c:825 msgid "WARNING" msgstr "警告" -#: src/gnutls.c:801 src/openssl.c:834 +#: src/gnutls.c:925 src/openssl.c:838 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s：%s 沒有æ供憑證。\n" -#: src/gnutls.c:807 -#, fuzzy, c-format +#: src/gnutls.c:931 +#, c-format msgid "%s: The certificate of %s is not trusted.\n" -msgstr "%s：%s 沒有æ供憑證。\n" +msgstr "%s：%s 的憑證ä¸å—信任。\n" -#: src/gnutls.c:808 +#: src/gnutls.c:932 #, c-format -msgid "%s: The certificate of %s hasn't got a known issuer.\n" -msgstr "" +msgid "%s: The certificate of %s doesn't have a known issuer.\n" +msgstr "%s：%s 的憑證沒有已知的發行者。\n" -#: src/gnutls.c:809 -#, fuzzy, c-format +#: src/gnutls.c:933 +#, c-format msgid "%s: The certificate of %s has been revoked.\n" -msgstr "%s：%s 沒有æ供憑證。\n" +msgstr "%s：%s 的憑證已被撤回。\n" -#: src/gnutls.c:810 -#, fuzzy, c-format +#: src/gnutls.c:934 +#, c-format msgid "%s: The certificate signer of %s was not a CA.\n" -msgstr "%s：%s 沒有æ供憑證。\n" +msgstr "%s：%s 的憑證簽發者ä¸æ˜¯å€‹æ†‘證頒發機構 (CA)。\n" -#: src/gnutls.c:811 +#: src/gnutls.c:935 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" -msgstr "" +msgstr "%s：%s 的憑證以ä¸å®‰å…¨çš„算法簽å。\n" -#: src/gnutls.c:812 +#: src/gnutls.c:936 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" -msgstr "" +msgstr "%s：%s 的憑證尚未啟用。\n" -#: src/gnutls.c:813 -#, fuzzy, c-format +#: src/gnutls.c:937 +#, c-format msgid "%s: The certificate of %s has expired.\n" -msgstr "%s：%s 沒有æ供憑證。\n" +msgstr "%s：%s 的憑證已經到期。\n" -#: src/gnutls.c:825 +#: src/gnutls.c:949 #, c-format msgid "Error initializing X509 certificate: %s\n" -msgstr "" +msgstr "åˆå§‹åŒ– X509 憑證時出錯：%s\n" -#: src/gnutls.c:834 -#, fuzzy +#: src/gnutls.c:958 msgid "No certificate found\n" -msgstr "%s：%s 沒有æ供憑證。\n" +msgstr "找ä¸åˆ°æ†‘è­‰\n" -#: src/gnutls.c:841 -#, fuzzy, c-format +#: src/gnutls.c:965 +#, c-format msgid "Error parsing certificate: %s\n" -msgstr "分æžä»£ç†ä¼ºæœå™¨ URL %s 時發生錯誤: %s。\n" +msgstr "解æžæ†‘證時出錯：%s\n" -#: src/gnutls.c:848 +#: src/gnutls.c:972 msgid "The certificate has not yet been activated\n" -msgstr "" +msgstr "憑證尚未啟用\n" -#: src/gnutls.c:853 +#: src/gnutls.c:977 msgid "The certificate has expired\n" -msgstr "" +msgstr "憑證已éŽæœŸ\n" -#: src/gnutls.c:860 -#, fuzzy, c-format +#: src/gnutls.c:984 +#, c-format msgid "The certificate's owner does not match hostname %s\n" -msgstr "%s：憑證的 common name ‘%s’ 和主機å稱 ‘%s’ ä¸ç¬¦ã€‚\n" +msgstr "憑證所有者與主機å稱 %s ä¸ç›¸ç¬¦\n" -#: src/gnutls.c:869 src/openssl.c:1030 +#: src/gnutls.c:993 src/openssl.c:1034 msgid "The public key does not match pinned public key!\n" -msgstr "" +msgstr "公鑰與釘é¸å…¬é‘°ä¸ç¬¦ï¼\n" -#: src/gnutls.c:878 +#: src/gnutls.c:1002 msgid "Certificate must be X.509\n" -msgstr "" +msgstr "憑證必須為 X.509 æ ¼å¼\n" #: src/host.c:156 msgid "Error in handling the address list.\n" -msgstr "" +msgstr "處ç†ä½å€åˆ—表時出錯。\n" #: src/host.c:367 msgid "Unknown host" @@ -950,154 +960,163 @@ msgid "Failed writing HTTP request: %s.\n" msgstr "無法寫入 HTTP è¦æ±‚: %s。\n" -#: src/http.c:790 +#: src/http.c:793 msgid "No headers, assuming HTTP/0.9" msgstr "沒有任何標頭資料，å‡è¨­ç‚º HTTP/0.9" -#: src/http.c:1620 -#, fuzzy, c-format +#: src/http.c:1623 +#, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "" -"檔案 ‘%s’ 已存在，ä¸æœƒä¸‹è¼‰ã€‚\n" +"檔案 %s 已經存在；é¸æ“‡ä¸æŽ¥æ”¶ã€‚\n" "\n" -#: src/http.c:1830 +#: src/http.c:1833 msgid "gmtime failed. This is probably a bug.\n" -msgstr "" +msgstr "gmtime 失敗，這å¯èƒ½æ˜¯å€‹ bug。\n" -#: src/http.c:1891 +#: src/http.c:1894 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" -msgstr "" +msgstr "無法轉æ›æ™‚間戳至 HTTP æ ¼å¼ã€‚將上次修改時間設定為回退到時間值 0。\n" -#: src/http.c:1995 -#, fuzzy, c-format +#: src/http.c:1998 +#, c-format msgid "BODY data file %s missing: %s\n" -msgstr "載有 POST 資料的檔案 ‘%s’ ä¸è¦‹äº†ï¼š%s\n" +msgstr "BODY 資料檔案 %s éºå¤±ï¼š%s\n" -#: src/http.c:2087 -#, fuzzy, c-format +#: src/http.c:2090 +#, c-format msgid "Reusing existing connection to [%s]:%d.\n" -msgstr "繼續使用和 %s:%d 的連線。\n" +msgstr "ç¹¼çºŒä½¿ç”¨å° [%s]:%d 的已存在連線。\n" -#: src/http.c:2092 +#: src/http.c:2095 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "繼續使用和 %s:%d 的連線。\n" -#: src/http.c:2158 +#: src/http.c:2161 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "無法讀å–代ç†ä¼ºæœå™¨å›žæ‡‰: %s。\n" -#: src/http.c:2177 src/http.c:3416 src/http.c:4517 +#: src/http.c:2180 src/http.c:3419 src/http.c:4525 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s 錯誤 %d: %s。\n" -#: src/http.c:2179 src/http.c:3418 src/http.c:3606 +#: src/http.c:2182 src/http.c:3421 src/http.c:3609 msgid "Malformed status line" msgstr "ä¸æ­£å¸¸çš„狀態行" -#: src/http.c:2190 +#: src/http.c:2193 #, c-format msgid "Proxy tunneling failed: %s" msgstr "無法é€éŽä»£ç†ä¼ºæœå™¨é€²è¡Œ tunneling: %s" -#: src/http.c:2426 +#: src/http.c:2429 msgid "Unknown authentication scheme.\n" msgstr "èªè­‰æ–¹å¼ä¸è©³ã€‚\n" -#: src/http.c:2444 -#, fuzzy, c-format +#: src/http.c:2447 +#, c-format msgid "Authentication selected: %s\n" -msgstr "èªè­‰æ–¹å¼ä¸è©³ã€‚\n" +msgstr "å·²é¸å–çš„èªè­‰æ–¹å¼ï¼š%s\n" -#: src/http.c:2575 +#: src/http.c:2578 #, c-format msgid "Saving to: %s\n" -msgstr "" +msgstr "儲存到：%s\n" -#: src/http.c:2794 +#: src/http.c:2797 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" +"下載憑證時：\n" +"%s：%s。\n" -#: src/http.c:2830 +#: src/http.c:2833 msgid "Unable to read signature content from temporary file. Skipping.\n" -msgstr "" +msgstr "無法從暫存檔案讀å–憑證內容。跳éŽã€‚\n" -#: src/http.c:2853 +#: src/http.c:2856 msgid "Could not create temporary file. Skipping signature download.\n" -msgstr "" +msgstr "無法建立暫存檔案。跳éŽæ†‘證下載。\n" -#: src/http.c:2887 src/http.c:2969 +#: src/http.c:2890 src/http.c:2972 #, c-format msgid "Invalid pri value. Assuming %d.\n" -msgstr "" +msgstr "無效的 pri 值。å‡å®šå€¼ç‚º %d。\n" -#: src/http.c:3073 +#: src/http.c:3076 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" +"無法找到 Metalink 資æºçš„å¯æŽ¥å—摘è¦ã€‚\n" +"é¸æ“‡è·³éŽå®ƒå€‘。\n" -#: src/http.c:3210 +#: src/http.c:3213 msgid "Disabling SSL due to encountered errors.\n" msgstr "å› é‡åˆ°éŒ¯èª¤è€Œåœæ­¢ä½¿ç”¨ SSL。\n" -#: src/http.c:3352 +#: src/http.c:3355 #, c-format msgid "%s request sent, awaiting response... " msgstr "å·²é€å‡º %s è¦æ±‚，正在等候回應... " -#: src/http.c:3392 +#: src/http.c:3395 msgid "No data received.\n" msgstr "收ä¸åˆ°è³‡æ–™ã€‚\n" -#: src/http.c:3398 +#: src/http.c:3401 #, c-format msgid "Read error (%s) in headers.\n" msgstr "讀å–標頭時發生錯誤 (%s)。\n" -#: src/http.c:3608 +#: src/http.c:3611 msgid "(no description)" msgstr "(沒有任何說明)" -#: src/http.c:3796 +#: src/http.c:3799 #, c-format msgid "Location: %s%s\n" msgstr "ä½ç½®: %s%s\n" -#: src/http.c:3797 src/http.c:4047 +#: src/http.c:3800 src/http.c:4040 msgid "unspecified" msgstr "未指定" -#: src/http.c:3798 +#: src/http.c:3801 msgid " [following]" msgstr " [跟隨至新的 URL]" -#: src/http.c:3880 +#: src/http.c:3883 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" +"檔案 %s 未在伺æœå™¨ä¸Šè®Šæ›´ã€‚忽略此下載任務。\n" +"\n" -#: src/http.c:3953 +#: src/http.c:3956 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" "You might want to add --no-if-modified-since option.\n" "\n" msgstr "" +"伺æœå™¨å¿½ç•¥äº†æª”案 %s çš„ If-Modified-Since 標頭。\n" +"ä½ å¯èƒ½æƒ³è¦åŠ ä¸Š --no-if-modified-since é¸é …。\n" +"\n" -#: src/http.c:3983 +#: src/http.c:3976 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1107,345 +1126,362 @@ " 檔案早已下載完æˆï¼›ä¸æœƒé€²è¡Œä»»ä½•æ“作。\n" "\n" -#: src/http.c:4027 +#: src/http.c:4020 msgid "Length: " msgstr "長度: " -#: src/http.c:4047 +#: src/http.c:4040 msgid "ignored" msgstr "忽略" -#: src/http.c:4215 +#: src/http.c:4208 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "警告: HTTP ä¸æ”¯æ´è¬ç”¨å­—元。\n" -#: src/http.c:4297 +#: src/http.c:4290 msgid "Spider mode enabled. Check if remote file exists.\n" -msgstr "" +msgstr "已啟用蜘蛛模å¼ã€‚當é ç«¯æª”案存在時則檢查。\n" -#: src/http.c:4387 -#, fuzzy, c-format +#: src/http.c:4380 +#, c-format msgid "Cannot write to %s (%s).\n" -msgstr "無法寫入‘%s’(%s)。\n" +msgstr "無法寫到 %s (%s)。\n" -#: src/http.c:4398 +#: src/http.c:4404 msgid "Required attribute missing from Header received.\n" -msgstr "" +msgstr "接收的標頭缺少所需屬性。\n" -#: src/http.c:4403 +#: src/http.c:4409 msgid "Username/Password Authentication Failed.\n" -msgstr "" +msgstr "使用者或密碼核å°å¤±æ•—。\n" -#: src/http.c:4409 -#, fuzzy +#: src/http.c:4415 msgid "Cannot write to WARC file.\n" -msgstr "無法寫入‘%s’(%s)。\n" +msgstr "無法寫到 WARC 檔案。\n" -#: src/http.c:4415 +#: src/http.c:4421 msgid "Cannot write to temporary WARC file.\n" -msgstr "" +msgstr "無法寫到暫存 WARC 檔案中。\n" -#: src/http.c:4420 +#: src/http.c:4426 msgid "Unable to establish SSL connection.\n" msgstr "無法建立 SSL 連線。\n" -#: src/http.c:4426 -#, fuzzy, c-format +#: src/http.c:4432 +#, c-format msgid "Cannot unlink %s (%s).\n" -msgstr "無法寫入‘%s’(%s)。\n" +msgstr "無法å–æ¶ˆé€£çµ %s (%s)。\n" -#: src/http.c:4436 +#: src/http.c:4442 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "錯誤: é‡æ–°å°Žå‘ (%d) 但沒有指定ä½ç½®ã€‚\n" -#: src/http.c:4458 +#: src/http.c:4464 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" -msgstr "" +msgstr "HTTP 回應中找ä¸åˆ° Metalink 資料。é¸æ“‡é€éŽ HTTP GET 下載檔案。\n" -#: src/http.c:4467 +#: src/http.c:4473 msgid "Metalink headers found. Switching to Metalink mode.\n" -msgstr "" +msgstr "已找到 Metalink 標頭資料。é¸æ“‡åˆ‡æ›åˆ° Metalink 模å¼ã€‚\n" -#: src/http.c:4507 +#: src/http.c:4514 msgid "Remote file does not exist -- broken link!!!\n" -msgstr "" +msgstr "é ç«¯æª”案ä¸å­˜åœ¨ -- 連çµæ壞ï¼\n" -#: src/http.c:4534 +#: src/http.c:4542 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "缺少了最後修改時間標頭 ─ 關閉時間標記。\n" -#: src/http.c:4542 +#: src/http.c:4550 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "無效的最後修改時間標頭 ─ 忽略時間標記。\n" -#: src/http.c:4572 -#, fuzzy, c-format +#: src/http.c:4580 +#, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "" -"é ç«¯æª”案ä¸æ¯”本機檔案‘%s’新 ─ ä¸æœƒä¸‹è¼‰ã€‚\n" +"伺æœå™¨æª”案沒比本機檔案 %s æ–° -- é¸æ“‡ä¸æŽ¥æ”¶ã€‚\n" "\n" -#: src/http.c:4580 +#: src/http.c:4588 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "檔案大å°ä¸ç¬¦ (本機檔案為 %s) -- 會下載檔案。\n" -#: src/http.c:4589 +#: src/http.c:4597 msgid "Remote file is newer, retrieving.\n" msgstr "é ç«¯æª”案較新，會下載檔案。\n" -#: src/http.c:4607 -#, fuzzy +#: src/http.c:4615 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" "\n" -msgstr "é ç«¯æª”案較本機檔案‘%s’新 ─ 會下載檔案。\n" +msgstr "" +"é ç«¯æª”案存在，且å¯èƒ½åŒ…å«å…¶ä»–資æºçš„é€£çµ -- é¸æ“‡æŽ¥æ”¶ã€‚\n" +"\n" -#: src/http.c:4613 -#, fuzzy +#: src/http.c:4621 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" -msgstr "é ç«¯æª”案ä¸æ¯”本機檔案‘%s’新 ─ ä¸æœƒä¸‹è¼‰ã€‚\n" +msgstr "" +"é ç«¯æª”案存在，但ä¸åŒ…å«ä»»ä½•é€£çµ -- é¸æ“‡ä¸æŽ¥æ”¶ã€‚\n" +"\n" -#: src/http.c:4622 +#: src/http.c:4630 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" +"é ç«¯æª”案已經存在，且å¯èƒ½åŒ…å«æ›´å¤šçš„連çµè³‡è¨Šï¼Œ\n" +"但éžè¿´ä¸‹è¼‰å·²ç¶“åœç”¨ -- é¸æ“‡ä¸æŽ¥æ”¶ã€‚\n" +"\n" -#: src/http.c:4628 -#, fuzzy +#: src/http.c:4636 msgid "" "Remote file exists.\n" "\n" -msgstr "é ç«¯æª”案較新，會下載檔案。\n" +msgstr "" +"é ç«¯æª”案存在。\n" +"\n" -#: src/http.c:4637 -#, fuzzy, c-format +#: src/http.c:4645 +#, c-format msgid "%s URL: %s %2d %s\n" -msgstr "%s: URL ‘%s’ 無效: %s\n" +msgstr "%s URL：%s %2d %s\n" -#: src/http.c:4687 -#, fuzzy, c-format +#: src/http.c:4695 +#, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -"%s (%s) -- 已儲存 ‘%s’ [%s/%s])\n" +"%s (%s) - 已輸出到 stdout %s[%s/%s]\n" "\n" -#: src/http.c:4688 -#, fuzzy, c-format +#: src/http.c:4696 +#, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" "\n" msgstr "" -"%s (%s) -- 已儲存 ‘%s’ [%s/%s])\n" +"%s (%s) - 已儲存 %s [%s/%s]\n" "\n" -#: src/http.c:4749 +#: src/http.c:4757 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - 在 %s ä½å…ƒçµ„後連線çªç„¶ä¸­æ–·ã€‚ " -#: src/http.c:4772 +#: src/http.c:4780 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - 讀å–至 %s ä½å…ƒçµ„時發生錯誤 (%s)。" -#: src/http.c:4781 +#: src/http.c:4789 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - 讀å–至 %s/%s ä½å…ƒçµ„時發生錯誤 (%s)。" -#: src/http.c:5019 +#: src/http.c:5027 #, c-format msgid "Unsupported quality of protection '%s'.\n" -msgstr "" +msgstr "ä¸æ”¯æ´çš„「%sã€ä¿è­·å“質。\n" -#: src/http.c:5024 -#, fuzzy, c-format +#: src/http.c:5032 +#, c-format msgid "Unsupported algorithm '%s'.\n" -msgstr "ä¸æ”¯æ´é€™ç¨® URL æ ¼å¼" +msgstr "ä¸æ”¯æ´çš„演算法「%sã€ã€‚\n" -#: src/init.c:585 -#, fuzzy, c-format +#: src/init.c:579 +#, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" -msgstr "%s: WGETRC ä½ç½®ç‚º %s，但該檔案ä¸å­˜åœ¨ã€‚\n" +msgstr "%s: WGETRC å°æ‡‰åˆ° %s - 無法存å–，因為該錯誤：%s。\n" -#: src/init.c:685 src/netrc.c:452 +#: src/init.c:678 src/netrc.c:452 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: ç„¡æ³•è®€å– %s (%s)。\n" -#: src/init.c:702 +#: src/init.c:695 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%1$s: 錯誤發生於第 %3$d 行的 %2$s。\n" -#: src/init.c:708 +#: src/init.c:701 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%1$s: 錯誤發生於第 %3$d 行的 %2$s。\n" -#: src/init.c:713 -#, fuzzy, c-format +#: src/init.c:706 +#, c-format msgid "%s: Unknown command %s in %s at line %d.\n" -msgstr "%1$s: 第 %4$d 行的 %3$s 出ç¾ä¸æ˜ŽæŒ‡ä»¤ ‘%2$s’。\n" +msgstr "%1$s：第 %4$d 行中 %3$s 發ç¾æœªçŸ¥æŒ‡ä»¤ %2$s。\n" -#: src/init.c:752 +#: src/init.c:745 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" "'%s',\n" "or specify a different file using --config.\n" msgstr "" +"解æžç³»çµ±çš„ wgetrc 檔案 (env SYSTEM_WGETRC) 失敗。請檢查\n" +"「%sã€ï¼Œ\n" +"或é€éŽ --config 指定ä¸åŒçš„檔案。\n" -#: src/init.c:767 +#: src/init.c:760 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" "'%s',\n" "or specify a different file using --config.\n" msgstr "" +"解æžç³»çµ±çš„ wgetrc 檔案失敗。請檢查\n" +"「%sã€ï¼Œ\n" +"或é€éŽ --config 指定ä¸åŒçš„檔案。\n" -#: src/init.c:783 -#, fuzzy, c-format +#: src/init.c:776 +#, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" -msgstr "%s: 警告: 系統與使用者的 wgetrc 都指å‘‘%s’。\n" +msgstr "%s：警告：系統與使用者的 wgetrc éƒ½æŒ‡å‘ %s。\n" -#: src/init.c:983 -#, fuzzy, c-format +#: src/init.c:977 +#, c-format msgid "%s: Invalid --execute command %s\n" -msgstr "%s: --execute 指令 ‘%s’ 無效\n" +msgstr "%s：無效的 --execute 指令 %s\n" -#: src/init.c:1043 -#, fuzzy, c-format +#: src/init.c:1037 +#, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" -msgstr "%s: %s: é‚輯值 ‘%s’ 無效，請使用 ‘on’ 或 ‘off’。\n" +msgstr "" +"%s：%s：%s 布林值無效；請使用「onã€æˆ–「offã€ã€‚\n" +"\n" -#: src/init.c:1076 -#, fuzzy, c-format +#: src/init.c:1070 +#, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" -msgstr "%s: %s: é‚輯值 ‘%s’ 無效，請使用 ‘on’ 或 ‘off’。\n" +msgstr "%s：%s：%s 無效；請使用「onã€ã€ã€Œoffã€æˆ–「quietã€ã€‚\n" -#: src/init.c:1096 -#, fuzzy, c-format +#: src/init.c:1090 +#, c-format msgid "%s: %s: Invalid number %s.\n" -msgstr "%s: %s: 數值 ‘%s’ 無效。\n" +msgstr "%s：%s：無效的數字 %s。\n" -#: src/init.c:1178 +#: src/init.c:1172 #, c-format msgid "%s: %s must only be used once\n" -msgstr "" +msgstr "%s：%s å¿…é ˆåªèƒ½ä½¿ç”¨ä¸€æ¬¡\n" -#: src/init.c:1333 src/init.c:1354 -#, fuzzy, c-format +#: src/init.c:1327 src/init.c:1348 +#, c-format msgid "%s: %s: Invalid byte value %s\n" -msgstr "%s: %s: ä½å…ƒå€¼ ‘%s’ 無效。\n" +msgstr "%s：%s：無效的ä½å…ƒå€¼ %s\n" -#: src/init.c:1379 -#, fuzzy, c-format +#: src/init.c:1373 +#, c-format msgid "%s: %s: Invalid time period %s\n" -msgstr "%s: %s: 時間 ‘%s’ 無效。\n" +msgstr "%s：%sï¼šç„¡æ•ˆçš„æ™‚é–“æœŸé™ %s\n" -#: src/init.c:1441 src/main.c:1905 +#: src/init.c:1435 src/main.c:1912 #, 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_ASKPAS。\n" -#: src/init.c:1459 src/init.c:1481 src/init.c:1589 src/init.c:1645 -#: src/init.c:1711 src/init.c:1731 src/init.c:1756 -#, fuzzy, c-format +#: src/init.c:1453 src/init.c:1475 src/init.c:1583 src/init.c:1639 +#: src/init.c:1705 src/init.c:1725 src/init.c:1750 +#, c-format msgid "%s: %s: Invalid value %s.\n" -msgstr "%s: %s: 數值 ‘%s’ 無效。\n" +msgstr "%s：%s：無效值 %s。\n" -#: src/init.c:1515 -#, fuzzy, c-format +#: src/init.c:1509 +#, c-format msgid "%s: %s: Invalid header %s.\n" -msgstr "%s: %s: 標頭內容 ‘%s’ 無效。\n" +msgstr "%s：%s：無效的標頭資訊 %s。\n" -#: src/init.c:1536 -#, fuzzy, c-format +#: src/init.c:1530 +#, c-format msgid "%s: %s: Invalid WARC header %s.\n" -msgstr "%s: %s: 標頭內容 ‘%s’ 無效。\n" +msgstr "%s：%s：無效的 WARC 標頭資訊 %s。\n" -#: src/init.c:1602 -#, fuzzy, c-format +#: src/init.c:1596 +#, c-format msgid "%s: %s: Invalid progress type %s.\n" -msgstr "%s: %s: 無效的進度指示方å¼â€˜%s’。\n" +msgstr "%s：%s：無效的進度類型 %s。\n" -#: src/init.c:1684 -#, fuzzy, c-format +#: src/init.c:1678 +#, 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" +msgstr "" +"%s：%s：無效的é™åˆ¶æ–¹å¼ %s，\n" +" 請使用 [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii]\n" #: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" -msgstr "" +msgstr "ç·¨ç¢¼æ–¹å¼ %s 無效\n" -#: src/iri.c:139 src/url.c:1571 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" -msgstr "" +msgstr "ä¸æ”¯æ´å¾ž %s 轉æ›åˆ° %s\n" -#: src/iri.c:179 src/url.c:1601 +#: src/iri.c:179 src/url.c:1600 msgid "Incomplete or invalid multibyte sequence encountered\n" -msgstr "" +msgstr "é‡åˆ°ä¸å®Œæ•´æˆ–無效的多ä½å…ƒåºåˆ—\n" -#: src/iri.c:198 src/url.c:1618 +#: src/iri.c:198 src/url.c:1617 #, c-format msgid "Unhandled errno %d\n" -msgstr "" +msgstr "未處ç†çš„ errno %d\n" #: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" -msgstr "" +msgstr "locale_to_utf8：locale 未設定\n" #: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" -msgstr "" +msgstr "idn_encode 失敗 (%d)：%s\n" #: src/iri.c:288 -#, fuzzy, c-format +#, c-format msgid "Failed to convert to lower: %d: %s\n" -msgstr "無法連上 %s 的埠號 %d: %s\n" +msgstr "無法轉æ›è‡³å°å¯«ï¼š%d：%s\n" #: src/log.c:931 src/log.c:950 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Redirecting output to %s.\n" msgstr "" "\n" -"下載 %s 完畢，將輸出導å‘至‘%s’。\n" +"æ­£é‡æ–°å°Žå‘輸出至「%sã€ã€‚\n" #: src/log.c:943 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s；無法進行任何記錄。\n" -#: src/main.c:576 +#: src/main.c:577 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "用法: %s [é¸é …]... [URL]...\n" -#: src/main.c:592 +#: src/main.c:593 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1453,358 +1489,323 @@ "é•·é¸é …必須用的åƒæ•¸åœ¨ä½¿ç”¨çŸ­é¸é …時也是必須的。\n" "\n" -#: src/main.c:594 +#: src/main.c:595 msgid "Startup:\n" msgstr "啟動：\n" -#: src/main.c:596 -#, fuzzy +#: src/main.c:597 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version 顯示 Wget 版本並離開\n" -#: src/main.c:598 -#, fuzzy +#: src/main.c:599 msgid " -h, --help print this help\n" -msgstr " -h, --help å°å‡ºé€™æ®µèªªæ˜Žæ–‡å­—\n" +msgstr " -h, --help å°å‡ºé€™æ®µèªªæ˜Žæ–‡å­—\n" -#: src/main.c:600 -#, fuzzy +#: src/main.c:601 msgid " -b, --background go to background after startup\n" -msgstr " -b, --background 啟動後進入背景作業\n" +msgstr " -b, --background 啟動後進入背景作業\n" -#: src/main.c:602 -#, fuzzy +#: src/main.c:603 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" -msgstr " -e, --execute=指令 執行 ‘.wgetrc’ å½¢å¼çš„指令\n" +msgstr " -e, --execute=指令 執行 ‘.wgetrc’ å½¢å¼çš„指令\n" -#: src/main.c:606 +#: src/main.c:607 msgid "Logging and input file:\n" msgstr "紀錄訊æ¯åŠè¼¸å…¥æª”案：\n" -#: src/main.c:608 -#, fuzzy +#: src/main.c:609 msgid " -o, --output-file=FILE log messages to FILE\n" -msgstr " -o, --output-file=檔案 將紀錄訊æ¯å¯«å…¥<檔案>中\n" +msgstr " -o, --output-file=檔案 將紀錄訊æ¯å¯«å…¥<檔案>中\n" -#: src/main.c:610 -#, fuzzy +#: src/main.c:611 msgid " -a, --append-output=FILE append messages to FILE\n" -msgstr " -a, --append-output=檔案 將紀錄訊æ¯åŠ å…¥<檔案>末端\n" +msgstr " -a, --append-output=檔案 將紀錄訊æ¯åŠ å…¥<檔案>末端\n" -#: src/main.c:613 -#, fuzzy +#: src/main.c:614 msgid "" " -d, --debug print lots of debugging information\n" -msgstr " -d, --debug å°å‡ºåµéŒ¯è¨Šæ¯\n" +msgstr " -d, --debug å°å‡ºå¤§é‡åµéŒ¯è¨Šæ¯\n" -#: src/main.c:617 -#, fuzzy +#: src/main.c:618 msgid " --wdebug print Watt-32 debug output\n" -msgstr " -d, --debug å°å‡ºåµéŒ¯è¨Šæ¯\n" +msgstr " --wdebug å°å‡º Watt-32 åµéŒ¯è¼¸å‡ºè¨Šæ¯\n" -#: src/main.c:620 -#, fuzzy +#: src/main.c:621 msgid " -q, --quiet quiet (no output)\n" -msgstr " -q, --quiet 安éœæ¨¡å¼ (ä¸è¼¸å‡ºè¨Šæ¯)\n" +msgstr " -q, --quiet 安éœæ¨¡å¼ (ä¸è¼¸å‡ºè¨Šæ¯)\n" -#: src/main.c:622 -#, fuzzy +#: src/main.c:623 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose è©³ç´°è¼¸å‡ºæ¨¡å¼ (é è¨­ä½¿ç”¨é€™å€‹æ¨¡å¼)\n" -#: src/main.c:624 -#, fuzzy +#: src/main.c:625 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" -msgstr " -nv, --non-verbose 關閉詳細輸出模å¼ï¼Œä½†ä¸å•Ÿç”¨å®‰éœæ¨¡å¼\n" +msgstr "" +" -nv, --no-verbose 關閉詳細輸出模å¼ï¼Œä½†ä¸å•Ÿç”¨å®‰éœæ¨¡å¼\n" -#: src/main.c:626 +#: src/main.c:627 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" +" --report-speed=TYPE 以 TYPE æ ¼å¼è¼¸å‡ºæµé‡ã€‚TYPE å¯ç‚º bits。\n" -#: src/main.c:628 -#, fuzzy +#: src/main.c:629 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" -msgstr " -i, --input-file=檔案 下載從檔案中找到的 URL\n" +msgstr "" +" -i, --input-file=檔案 下載從本機或外部 <檔案> 中找到的 URL\n" -#: src/main.c:631 -#, fuzzy +#: src/main.c:632 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" -msgstr " -i, --input-file=檔案 下載從檔案中找到的 URL\n" +msgstr "" +" --input-metalink=檔案 下載寫在本機 Metalink <檔案> 中的 URL\n" -#: src/main.c:634 -#, fuzzy +#: src/main.c:635 msgid " -F, --force-html treat input file as HTML\n" -msgstr " -F, --force-html 以 HTML æ–¹å¼è™•ç†è¼¸å…¥æª”\n" +msgstr " -F, --force-html 將輸入檔案看作 HTML 檔案\n" -#: src/main.c:636 -#, fuzzy +#: src/main.c:637 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -" -N, --timestamping 除éžé ç«¯æª”案比較新，å¦å‰‡ä¸ä¸‹è¼‰é ç«¯æª”案\n" +" -B, --base=URL 解æžç›¸å°æ–¼ URL çš„ HTML\n" +" è¼¸å…¥æª”æ¡ˆé€£çµ (-i -F)\n" -#: src/main.c:639 -#, fuzzy +#: src/main.c:640 msgid " --config=FILE specify config file to use\n" -msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" +msgstr " --config=檔案 指定è¦ä½¿ç”¨çš„組態檔\n" -#: src/main.c:641 -#, fuzzy +#: src/main.c:642 msgid " --no-config do not read any config file\n" -msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" +msgstr " --no-config ä¸è®€ä»»ä½•çµ„態檔案\n" -#: src/main.c:643 +#: src/main.c:644 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" -msgstr "" +msgstr " --rejected-log=FILE 記錄 URL 拒絕原因至 FILE\n" -#: src/main.c:647 +#: src/main.c:648 msgid "Download:\n" msgstr "下載：\n" -#: src/main.c:649 -#, fuzzy +#: src/main.c:650 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr " -t, --tries=次數 設定é‡è©¦æ¬¡æ•¸ (0 表示無é™)\n" -#: src/main.c:651 -#, fuzzy +#: src/main.c:652 msgid "" " --retry-connrefused retry even if connection is refused\n" -msgstr " --retry-connrefused å³ä½¿é€£ç·šè¢«æ‹’ä»ç„¶æœƒä¸æ–·å˜—試\n" +msgstr " --retry-connrefused å³ä½¿é€£ç·šè¢«æ‹’ä»æœƒä¸æ–·å˜—試\n" -#: src/main.c:653 -#, fuzzy +#: src/main.c:654 msgid "" " --retry-on-http-error=ERRORS comma-separated list of HTTP errors " "to retry\n" -msgstr " -G, --ignore-tags=清單 會忽略的 HTML 標籤，以逗號分隔\n" +msgstr "" +" --retry-on-http-error=錯誤 è¦é‡è©¦çš„ HTTP 錯誤的逗號分割列表。\n" -#: src/main.c:655 -#, fuzzy +#: src/main.c:656 msgid " -O, --output-document=FILE write documents to FILE\n" -msgstr " -O --output-document=檔案 將資料寫入指定檔案中\n" +msgstr " -O --output-document=檔案 將資料寫入 <檔案> 中\n" -#: src/main.c:657 -#, fuzzy +#: src/main.c:658 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" -msgstr " -nc, --no-clobber ä¸è¦†å¯«å·²ç¶“存在的檔案\n" +msgstr "" +" -nc, --no-clobber è·³éŽè¦ä¸‹è¼‰åˆ°ç¾æœ‰æª”案\n" +" (也就是覆蓋它們) 的下載\n" -#: src/main.c:660 -#, fuzzy +#: src/main.c:661 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" +msgstr " --no-netrc ä¸è¦å˜—試從 .netrc å–得憑證\n" -#: src/main.c:662 -#, fuzzy +#: src/main.c:663 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" -msgstr " -c, --continue 繼續下載已下載了一部份的檔案\n" +msgstr " -c, --continue 繼續下載已下載了一部份的檔案\n" -#: src/main.c:664 +#: src/main.c:665 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" -msgstr "" +msgstr " --start-pos=OFFSET 從 0 開始的ä½ç½® OFFSET 開始下載\n" -#: src/main.c:666 -#, fuzzy +#: src/main.c:667 msgid " --progress=TYPE select progress gauge type\n" -msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" +msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" -#: src/main.c:668 -#, fuzzy +#: src/main.c:669 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" -msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" +msgstr " --show-progress 在任何詳細輸出模å¼ä¸­é¡¯ç¤ºé€²åº¦æ¬„\n" -#: src/main.c:670 -#, fuzzy +#: src/main.c:671 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -" -N, --timestamping 除éžé ç«¯æª”案比較新，å¦å‰‡ä¸ä¸‹è¼‰é ç«¯æª”案\n" +" -N, --timestamping 除éžé ç«¯æª”案比較新，å¦å‰‡ä¸é‡æ–°\n" +" 下載é ç«¯æª”案\n" -#: src/main.c:673 +#: src/main.c:674 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" +" --no-if-modified-since ä¸ä½¿ç”¨æœ‰æ¢ä»¶çš„ if-modified-since get\n" +" 使用時間戳模å¼è«‹æ±‚\n" -#: src/main.c:676 +#: src/main.c:677 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" +" 伺æœå™¨æª”案的值\n" -#: src/main.c:679 -#, fuzzy +#: src/main.c:680 msgid " -S, --server-response print server response\n" -msgstr " -S, --server-response 顯示伺æœå™¨å›žæ‡‰è¨Šæ¯\n" +msgstr " -S, --server-response 顯示伺æœå™¨å›žæ‡‰è¨Šæ¯\n" -#: src/main.c:681 -#, fuzzy +#: src/main.c:682 msgid " --spider don't download anything\n" -msgstr " --spider ä¸ä¸‹è¼‰ä»»ä½•è³‡æ–™\n" +msgstr " --spider ä¸ä¸‹è¼‰ä»»ä½•è³‡æ–™\n" -#: src/main.c:683 -#, fuzzy +#: src/main.c:684 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" -msgstr " -T, --timeout=秒數 指定所有時é™ç‚ºåŒä¸€æ•¸å€¼\n" +msgstr " -T, --timeout=秒數 設定所有逾時時é™ç‚º <秒數>\n" -#: src/main.c:686 +#: src/main.c:687 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" +" --dns-servers=ADDRESSES è¦æŸ¥è©¢çš„ DNS 伺æœå™¨åˆ—表 (以逗號分割)\n" -#: src/main.c:688 -#, fuzzy +#: src/main.c:689 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -" --bind-address=ä½å€ 使用本機的指定ä½å€ (主機å稱或 IP) 進行連" -"ç·š\n" +" --bind-dns-address=ä½å€ ç¶å®š DNS 解æžå™¨åˆ°å€åŸŸä¸»æ©Ÿä¸Šçš„ <ä½å€> (主機å" +"稱或 IP)\n" -#: src/main.c:691 -#, fuzzy +#: src/main.c:692 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" -msgstr " --dns-timeout=秒數 指定 DNS 查找主機的時é™\n" +msgstr " --dns-timeout=秒數 設定 DNS 查詢主機的逾時為 <秒數>\n" -#: src/main.c:693 -#, fuzzy +#: src/main.c:694 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" -msgstr " --connect-timeout=秒數 指定連線時é™\n" +msgstr " --connect-timeout=秒數 設定連線逾時為 <秒數>\n" -#: src/main.c:695 -#, fuzzy +#: src/main.c:696 msgid " --read-timeout=SECS set the read timeout to SECS\n" -msgstr " --read-timeout=秒數 指定讀å–資料的時é™\n" +msgstr " --read-timeout=秒數 設定讀å–逾時為 <秒數>\n" -#: src/main.c:697 -#, fuzzy +#: src/main.c:698 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=秒數 æ¯æ¬¡ä¸‹è¼‰æª”案之å‰ç­‰å¾…指定秒數\n" -#: src/main.c:699 -#, fuzzy +#: src/main.c:700 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" -msgstr "" -" --waitretry=秒數 æ¯æ¬¡é‡è¦†å˜—試å‰ç¨ç­‰ä¸€æ®µæ™‚é–“ (ç”± 1 秒至指\n" -" 定秒數ä¸ç­‰)\n" +msgstr " --waitretry=秒數 在下次接收é‡è©¦å‰ç­‰ 1 到 <秒數> 秒\n" -#: src/main.c:701 -#, fuzzy +#: src/main.c:702 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" -msgstr " --random-wait æ¯æ¬¡ä¸‹è¼‰ä¹‹å‰éš¨æ©Ÿåœ°æŒ‡å®šç­‰å¾…的時間\n" +msgstr "" +" --random-wait æ¯æ¬¡ä¸‹è¼‰ä¹‹å‰ç­‰å¾… 0.5*WAIT...1.5*WAIT 秒\n" -#: src/main.c:703 -#, fuzzy +#: src/main.c:704 msgid " --no-proxy explicitly turn off proxy\n" -msgstr " --no-proxy ç¦æ­¢ä½¿ç”¨ä»£ç†ä¼ºæœå™¨\n" +msgstr " --no-proxy ç¦æ­¢ä½¿ç”¨ä»£ç†ä¼ºæœå™¨\n" -#: src/main.c:705 -#, fuzzy +#: src/main.c:706 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" -msgstr " -Q, --quota=å¤§å° è¨­å®šä¸‹è¼‰è³‡æ–™çš„é™é¡å¤§å°\n" +msgstr " -Q, --quota=å¤§å° è¨­å®šä¸‹è¼‰è³‡æ–™çš„é™é¡å¤§å°ç‚º <大å°>\n" -#: src/main.c:707 -#, fuzzy +#: src/main.c:708 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -" --bind-address=ä½å€ 使用本機的指定ä½å€ (主機å稱或 IP) 進行連" -"ç·š\n" +" --bind-address=ä½å€ ç¶å®šåˆ°å€åŸŸä¸»æ©Ÿä¸Šçš„ <ä½å€> (主機å稱或 IP)\n" -#: src/main.c:709 -#, fuzzy +#: src/main.c:710 msgid " --limit-rate=RATE limit download rate to RATE\n" -msgstr " --limit-rate=速率 é™åˆ¶ä¸‹è¼‰é€ŸçŽ‡\n" +msgstr " --limit-rate=速率 é™åˆ¶ä¸‹è¼‰é€ŸçŽ‡æœ€é«˜ç‚º <速率>\n" -#: src/main.c:711 -#, fuzzy +#: src/main.c:712 msgid " --no-dns-cache disable caching DNS lookups\n" -msgstr " --no-dns-cache ä¸è¨˜æ†¶ DNS 查找主機的資料\n" +msgstr " --no-dns-cache åœç”¨å¿«å– DNS 查詢\n" -#: src/main.c:713 -#, fuzzy +#: src/main.c:714 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -" --restrict-file-names=OS åªä½¿ç”¨ä½œæ¥­ç³»çµ±èƒ½å¤ æŽ¥å—的字元作為檔案字元\n" +" --restrict-file-names=作業系統 åªä½¿ç”¨ <作業系統> å…許的字元作為檔案" +"å­—å…ƒ\n" -#: src/main.c:715 -#, fuzzy +#: src/main.c:716 msgid "" " --ignore-case ignore case when matching files/" "directories\n" -msgstr " --ignore-length 忽略 ‘Content-Length’ 標頭欄ä½\n" +msgstr " --ignore-case 忽略尋找相é…檔案或目錄的大å°å¯«\n" -#: src/main.c:718 -#, fuzzy +#: src/main.c:719 msgid " -4, --inet4-only connect only to IPv4 addresses\n" -msgstr " -4, --inet4-only åªæœƒé€£æŽ¥ IPv4 地å€\n" +msgstr " -4, --inet4-only åªæœƒé€£åˆ° IPv4 ä½å€\n" -#: src/main.c:720 -#, fuzzy +#: src/main.c:721 msgid " -6, --inet6-only connect only to IPv6 addresses\n" -msgstr " -6, --inet6-only åªæœƒé€£æŽ¥ IPv6 地å€\n" +msgstr " -6, --inet6-only åªæœƒé€£åˆ° IPv6 ä½å€\n" -#: src/main.c:722 -#, fuzzy +#: src/main.c:723 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -" --prefer-family=FAMILY 優先採用指定的ä½å€æ ¼å¼ï¼Œå¯ä»¥æ˜¯ IPv6ã€IPv4\n" -" 或者 none\n" +" --prefer-family=FAMILY 優先連線到指定æ—çš„ä½å€ï¼Œå¯ä»¥æ˜¯ IPv6ã€" +"IPv4\n" +" 或者 none\n" -#: src/main.c:726 -#, fuzzy +#: src/main.c:727 msgid " --user=USER set both ftp and http user to USER\n" -msgstr " --user=用戶 指定 ftp å’Œ http 用戶å稱\n" +msgstr "" +" --user=使用者 指定 ftp å’Œ http 使用者å稱為 <使用者>\n" -#: src/main.c:728 -#, fuzzy +#: src/main.c:729 msgid "" " --password=PASS set both ftp and http password to PASS\n" -msgstr " --password=PASS 指定 ftp å’Œ http 密碼\n" +msgstr " --password=密碼 指定 ftp å’Œ http 的密碼為 <密碼>\n" -#: src/main.c:730 -#, fuzzy +#: src/main.c:731 msgid " --ask-password prompt for passwords\n" -msgstr " --password=PASS 指定 ftp å’Œ http 密碼\n" +msgstr " --ask-password è©¢å•å¯†ç¢¼\n" -#: src/main.c:732 +#: src/main.c:733 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1814,328 +1815,321 @@ "SSH_ASKPASS \n" " environment variable is used.\n" msgstr "" +" --use-askpass=COMMAND 指定接收使用者帳號與密碼的憑據處ç†å™¨ã€‚\n" +" è‹¥ COMMAND 未指定，則使用\n" +" WGET_ASKPASS 或 SSH_ASKPASS \n" +" 的環境變數值。\n" -#: src/main.c:737 -#, fuzzy +#: src/main.c:738 msgid " --no-iri turn off IRI support\n" -msgstr " --no-proxy ç¦æ­¢ä½¿ç”¨ä»£ç†ä¼ºæœå™¨\n" +msgstr " --no-iri 關閉 IRI 支æ´\n" -#: src/main.c:739 +#: src/main.c:740 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" +" --local-encoding=ENC å°‡ ENC 作為 IRI 的本機編碼方å¼ä½¿ç”¨ã€‚\n" -#: src/main.c:741 +#: src/main.c:742 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" -msgstr "" +msgstr " --remote-encoding=ENC å°‡ ENC 作為é è¨­é ç«¯ç·¨ç¢¼æ–¹å¼ä½¿ç”¨\n" -#: src/main.c:743 -#, fuzzy +#: src/main.c:744 msgid " --unlink remove file before clobber\n" -msgstr " --no-glob ä¸å±•é–‹æœ‰è¬ç”¨å­—元的 FTP 檔å\n" +msgstr " --unlink 在é‡å¯«å‰ç§»é™¤æª”案\n" -#: src/main.c:746 +#: src/main.c:747 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" +" --keep-badhash ä¿ç•™æ ¡é©—碼ä¸ç¬¦åˆçš„檔案 (附加到 .badhash)\n" -#: src/main.c:748 +#: src/main.c:749 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" +" --metalink-index=NUMBER Metalink application/metalink4+xml 中繼連" +"çµçš„åºæ•¸ NUMBER\n" -#: src/main.c:750 +#: src/main.c:751 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" +" --metalink-over-http 使用來自 HTTP 回應標頭的 Metalink 中繼資" +"æ–™\n" -#: src/main.c:752 +#: src/main.c:753 msgid "" " --preferred-location preferred location for Metalink " "resources\n" -msgstr "" +msgstr " --preferred-location Metalink 資æºçš„å好ä½ç½®\n" -#: src/main.c:756 +#: src/main.c:757 +#, fuzzy msgid "" -" --no-xattr turn off storage of metadata in extended " +" --xattr turn on storage of metadata in extended " "file attributes\n" msgstr "" +" --no-xattr 在延伸檔案屬性中關閉中繼資料的儲存。\n" -#: src/main.c:761 +#: src/main.c:762 msgid "Directories:\n" msgstr "目錄：\n" -#: src/main.c:763 -#, fuzzy +#: src/main.c:764 msgid " -nd, --no-directories don't create directories\n" -msgstr " -nd --no-directories ä¸å»ºç«‹ç›®éŒ„\n" +msgstr " -nd, --no-directories ä¸å»ºç«‹ç›®éŒ„\n" -#: src/main.c:765 -#, fuzzy +#: src/main.c:766 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories 強制建立目錄\n" -#: src/main.c:767 -#, fuzzy +#: src/main.c:768 msgid " -nH, --no-host-directories don't create host directories\n" -msgstr " -nH, --no-host-directories ä¸å»ºç«‹å«æœ‰é ç«¯ä¸»æ©Ÿå稱的目錄\n" +msgstr " -nH, --no-host-directories ä¸å»ºç«‹é ç«¯ä¸»æ©Ÿç›®éŒ„\n" -#: src/main.c:769 -#, fuzzy +#: src/main.c:770 msgid " --protocol-directories use protocol name in directories\n" -msgstr " --protocol-directories 在目錄中加上通訊å”定å稱\n" +msgstr " --protocol-directories 在目錄中加上通訊å”定å稱\n" -#: src/main.c:771 -#, fuzzy +#: src/main.c:772 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" -msgstr " -P, --directory-prefix=å稱 儲存檔案å‰å…ˆå»ºç«‹æŒ‡å®šå稱的目錄\n" +msgstr " -P, --directory-prefix=後綴 將檔案儲存到 <後綴>/..\n" -#: src/main.c:773 -#, fuzzy +#: src/main.c:774 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" -msgstr " --cut-dirs=數目 忽略é ç«¯ç›®éŒ„中指定<數目>的目錄層\n" +msgstr " --cut-dirs=數目 忽略 <數目> 個é ç«¯ç›®éŒ„元件\n" -#: src/main.c:777 +#: src/main.c:778 msgid "HTTP options:\n" msgstr "HTTP é¸é …：\n" -#: src/main.c:779 -#, fuzzy +#: src/main.c:780 msgid " --http-user=USER set http user to USER\n" -msgstr " --http-user=用戶 指定 HTTP 用戶å稱\n" +msgstr " --http-user=使用者 指定 HTTP 使用者為 <使用者>\n" -#: src/main.c:781 -#, fuzzy +#: src/main.c:782 msgid " --http-password=PASS set http password to PASS\n" -msgstr " --http-passwd=密碼 指定 HTTP 密碼\n" +msgstr " --http-password=密碼 指定 HTTP 密碼為 <密碼>\n" -#: src/main.c:783 -#, fuzzy +#: src/main.c:784 msgid " --no-cache disallow server-cached data\n" -msgstr " --no-cache ä¸ä½¿ç”¨ä¼ºæœå™¨ä¸­çš„å¿«å–記憶資料\n" +msgstr " --no-cache ä¸ä½¿ç”¨ä¼ºæœå™¨ä¸­çš„å¿«å–資料\n" -#: src/main.c:785 +#: src/main.c:786 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" +" --default-page=NAME 變更é è¨­é é¢çš„å稱 (一般情æ³ä¸‹\n" +" 其為「index.htmlã€ã€‚)\n" -#: src/main.c:788 -#, fuzzy +#: src/main.c:789 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" -msgstr " -E, --html-extension 將所有 HTML 文件加上 “.html†延伸檔å\n" +msgstr "" +" -E, --adjust-extension 以é©ç•¶çš„副檔å儲存 HTML 或 CSS 檔案\n" -#: src/main.c:790 -#, fuzzy +#: src/main.c:791 msgid "" " --ignore-length ignore 'Content-Length' header field\n" -msgstr " --ignore-length 忽略 ‘Content-Length’ 標頭欄ä½\n" +msgstr " --ignore-length 忽略「Content-Lengthã€æ¨™é ­æ¬„ä½\n" -#: src/main.c:792 -#, fuzzy +#: src/main.c:793 msgid " --header=STRING insert STRING among the headers\n" -msgstr " --header=字串 在連線資料標頭中加入指定字串\n" +msgstr " --header=字串 在標頭資料中æ’å…¥ <字串>\n" -#: src/main.c:795 -#, fuzzy +#: src/main.c:796 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none. (default: none)\n" -msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" +msgstr "" +" --compression=TYPE é¸æ“‡ autoã€gzip 或 none 中任一壓縮方å¼ã€‚" +"(é è¨­ï¼šnone)\n" -#: src/main.c:798 +#: src/main.c:799 msgid "" " --max-redirect maximum redirections allowed per page\n" -msgstr "" +msgstr " --max-redirect æ¯å€‹é é¢å…許的最大跳轉次數\n" -#: src/main.c:800 -#, fuzzy +#: src/main.c:801 msgid " --proxy-user=USER set USER as proxy username\n" -msgstr " --proxy-user=用戶 設定代ç†ä¼ºæœå™¨ç”¨æˆ¶å稱\n" +msgstr "" +" --proxy-user=使用者 設定代ç†ä¼ºæœå™¨ä½¿ç”¨è€…å稱為 <使用者>\n" -#: src/main.c:802 -#, fuzzy +#: src/main.c:803 msgid " --proxy-password=PASS set PASS as proxy password\n" -msgstr " --proxy-password=密碼 設定代ç†ä¼ºæœå™¨å¯†ç¢¼\n" +msgstr " --proxy-password=密碼 設定代ç†ä¼ºæœå™¨å¯†ç¢¼ç‚º <密碼>\n" -#: src/main.c:804 -#, fuzzy +#: src/main.c:805 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -" --referer=URL 在 HTTP 請求中包括 ‘Referer: URL’ 標頭\n" +" --referer=URL 在 HTTP 請求中包括「Referer: URLã€æ¨™é ­\n" -#: src/main.c:806 -#, fuzzy +#: src/main.c:807 msgid " --save-headers save the HTTP headers to file\n" -msgstr " --save-headers å°‡ HTTP 連線資料標頭存檔\n" +msgstr " --save-headers 存檔 HTTP 標頭資料\n" -#: src/main.c:808 -#, fuzzy +#: src/main.c:809 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:810 -#, fuzzy +#: src/main.c:811 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" -msgstr " --no-http-keep-alive ä¸ä½¿ç”¨ HTTP keep-alive (æŒä¹…性連線)\n" +msgstr "" +" --no-http-keep-alive ä¸ä½¿ç”¨ HTTP keep-alive (æŒä¹…性連線)\n" -#: src/main.c:812 -#, fuzzy +#: src/main.c:813 msgid " --no-cookies don't use cookies\n" -msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" +msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" -#: src/main.c:814 -#, fuzzy +#: src/main.c:815 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" -msgstr " --load-cookies=檔案 程å¼å•Ÿå‹•æ™‚由指定檔案載入 cookie\n" +msgstr " --load-cookies=檔案 開始階段å‰å¾ž <檔案> 載入 Cookie\n" -#: src/main.c:816 -#, fuzzy +#: src/main.c:817 msgid " --save-cookies=FILE save cookies to FILE after session\n" -msgstr " --save-cookies=檔案 程å¼çµæŸå¾Œå°‡ cookie 儲存至指定檔案\n" +msgstr " --save-cookies=檔案 階段çµæŸå¾Œå°‡ cookie 存至 <檔案>\n" -#: src/main.c:818 -#, fuzzy +#: src/main.c:819 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" -msgstr " --keep-session-cookies 會載入和儲存暫時性的 cookie\n" +msgstr "" +" --keep-session-cookies 載入和儲存階段性 (暫時性) çš„ cookie\n" -#: src/main.c:820 -#, fuzzy +#: src/main.c:821 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" -msgstr " --post-data=字串 使用 POST æ–¹å¼é€å‡ºå­—串\n" +msgstr " --post-data=字串 使用 POST æ–¹å¼å°‡å­—串以資料方å¼é€å‡º\n" -#: src/main.c:822 -#, fuzzy +#: src/main.c:823 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" -msgstr " --post-file=檔案 使用 POST æ–¹å¼é€å‡ºæª”案內容\n" +msgstr " --post-file=檔案 使用 POST æ–¹å¼é€å‡º <檔案> 的內容\n" -#: src/main.c:824 +#: src/main.c:825 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" -msgstr "" +msgstr " --method=HTTPMethod 在請求中使用「HTTPMethodã€æ–¹æ³•\n" -#: src/main.c:826 -#, fuzzy +#: src/main.c:827 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" -msgstr " --post-data=字串 使用 POST æ–¹å¼é€å‡ºå­—串\n" +msgstr "" +" --body-data=字串 å°‡ <字串> 當作資料傳é€ã€‚--method 必須設" +"定ï¼\n" -#: src/main.c:828 -#, fuzzy +#: src/main.c:829 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" -msgstr " --post-file=檔案 使用 POST æ–¹å¼é€å‡ºæª”案內容\n" +msgstr "" +" --body-file=檔案 å°‡ <檔案> 當作內容傳é€ã€‚--method 必須設" +"定ï¼\n" -#: src/main.c:830 +#: src/main.c:831 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" " choosing local file names " "(EXPERIMENTAL)\n" msgstr "" +" --content-disposition å°Šé‡ Content-Disposition 標頭，當é¸æ“‡\n" +" 本機檔案å稱時 (實驗性)\n" -#: src/main.c:833 +#: src/main.c:834 msgid "" " --content-on-error output the received content on server " "errors\n" -msgstr "" +msgstr " --content-on-error 輸出伺æœå™¨éŒ¯èª¤æ™‚的接收到內容\n" -#: src/main.c:835 +#: src/main.c:836 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" " without first waiting for the server's\n" " challenge\n" msgstr "" +" --auth-no-challenge 傳é€åŸºæœ¬ HTTP æ ¸å°è³‡è¨Šï¼Œè€Œä¸\n" +" 等待伺æœå™¨çš„請求。\n" -#: src/main.c:842 +#: src/main.c:843 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) é¸é …：\n" -#: src/main.c:844 -#, fuzzy +#: src/main.c:845 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -" --secure-protocol=PR é¸æ“‡å®‰å…¨é€šè¨Šå”定，å¯ä»¥ä½¿ç”¨ auto, SSLv2, \n" -" SSLv3 或 TLSv1\n" +" --secure-protocol=PR é¸æ“‡å®‰å…¨é€šè¨Šå”定，å¯ä»¥ä½¿ç”¨ auto, SSLv2,\n" +" SSLv3, TLSv1, TLSv1_1, TLSv1_2 å’Œ PFS\n" +"\n" -#: src/main.c:847 -#, fuzzy +#: src/main.c:848 msgid " --https-only only follow secure HTTPS links\n" -msgstr " -L, --relative åªè·Ÿéš¨ç›¸å°éˆçµ\n" +msgstr " --https-only 僅追蹤安全 HTTPS 連çµ\n" -#: src/main.c:849 -#, fuzzy +#: src/main.c:850 msgid "" " --no-check-certificate don't validate the server's certificate\n" -msgstr " --no-check-certificate ä¸æª¢é©—伺æœå™¨çš„憑證\n" +msgstr " --no-check-certificate ä¸é©—證伺æœå™¨æ†‘è­‰\n" -#: src/main.c:851 -#, fuzzy +#: src/main.c:852 msgid " --certificate=FILE client certificate file\n" -msgstr " --certificate=檔案 指定用戶端的憑證檔案å稱\n" +msgstr " --certificate=檔案 指定使用者端的憑證檔案\n" -#: src/main.c:853 -#, fuzzy +#: src/main.c:854 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" -msgstr " --certificate-type=é¡žåž‹ 用戶端憑證的類型，å¯ä»¥æ˜¯ PEM 或 DER\n" +msgstr "" +" --certificate-type=é¡žåž‹ 使用者端憑證的類型，å¯ä»¥æ˜¯ PEM 或 DER\n" -#: src/main.c:855 -#, fuzzy +#: src/main.c:856 msgid " --private-key=FILE private key file\n" -msgstr " --private-key=檔案 指定ç§é‘°æª”案\n" +msgstr " --certificate-type=é¡žåž‹ 指定ç§é‘°æª”案\n" -#: src/main.c:857 -#, fuzzy +#: src/main.c:858 msgid " --private-key-type=TYPE private key type, PEM or DER\n" -msgstr " --private-key-type=é¡žåž‹ ç§é‘°çš„類型，å¯ä»¥æ˜¯ PEM 或 DER\n" +msgstr " --private-key-type=é¡žåž‹ ç§é‘°çš„類型，å¯ä»¥æ˜¯ PEM 或 DER\n" -#: src/main.c:859 -#, fuzzy +#: src/main.c:860 msgid " --ca-certificate=FILE file with the bundle of CAs\n" -msgstr " --ca-certificate=檔案 載有憑證管ç†ä¸­å¿ƒ (CA) 簽章的檔案\n" +msgstr "" +" --ca-certificate=檔案 包å«æ­¤æ†‘證頒發機構 (CA) bundle 的檔案\n" # (Abel) 這裡 hashed filename å’Œé¸é …的用æ„無關，所以ä¸ç¿»è­¯ -#: src/main.c:861 -#, fuzzy +#: src/main.c:862 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" -msgstr " --ca-directory=目錄 載有憑證管ç†ä¸­å¿ƒ (CA) 簽章的目錄\n" +msgstr " --ca-directory=目錄 載有憑證頒發機構 (CA) 簽章的目錄\n" -#: src/main.c:863 -#, fuzzy +#: src/main.c:864 msgid " --crl-file=FILE file with bundle of CRLs\n" -msgstr " --ca-certificate=檔案 載有憑證管ç†ä¸­å¿ƒ (CA) 簽章的檔案\n" +msgstr "" +" --crl-file=FILE 包å«æ†‘è­‰åŠéŠ·åˆ—表 (CRL) bundle 的檔案\n" -#: src/main.c:865 +#: src/main.c:866 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2144,24 +2138,28 @@ "verify\n" " peer against\n" msgstr "" +" --pinnedpubkey=FILE/HASHES 公鑰 (PEM/DER) 檔案，或任何以\n" +" 「sha256//ã€é–‹é ­ä¸”以「;ã€åˆ†å‰²ä¸”以 base64 " +"編碼\n" +" çš„ SHA256 雜湊值號碼以驗證 peer against\n" +"\n" -#: src/main.c:871 -#, fuzzy +#: src/main.c:872 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -" --random-file=檔案 作為 SSL éš¨æ©Ÿæ•¸ç”¢ç”Ÿç¨‹åº (PRNG) 的來æºæ•¸æ“šæª”" +" --random-file=檔案 用於 SSL éš¨æ©Ÿæ•¸ç”¢ç”Ÿç¨‹åº (PRNG) 隨機資料的檔" "案\n" -#: src/main.c:875 -#, fuzzy +#: src/main.c:876 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" -msgstr " --egd-file=檔案 產生隨機數據的 EGD socket 檔案å稱\n" +msgstr "" +" --egd-file=檔案 用包å«éš¨æ©Ÿè³‡æ–™çš„ EGD socket 命å的檔案\n" -#: src/main.c:879 +#: src/main.c:880 msgid "" " --ciphers=STR Set the priority string (GnuTLS) or cipher " "list string (OpenSSL) directly.\n" @@ -2170,452 +2168,441 @@ " The format and syntax of this string " "depend on the specific SSL/TLS engine.\n" msgstr "" +" --ciphers=STR 直接設定優先級字串 (GnuTLS) 或密文列表字串 " +"(OpenSSL)。\n" +" è«‹å°å¿ƒä½¿ç”¨ã€‚æ­¤é¸é …覆蓋 --secure-protocol " +"的設定值。\n" +" 此字串的格å¼å’Œèªžæ³•åŸºæ–¼æŒ‡å®šçš„ SSL/TLS 引" +"擎。\n" -#: src/main.c:886 -#, fuzzy +#: src/main.c:887 msgid "HSTS options:\n" -msgstr "HTTP é¸é …：\n" +msgstr "HSTS é¸é …：\n" -#: src/main.c:888 -#, fuzzy +#: src/main.c:889 msgid " --no-hsts disable HSTS\n" -msgstr " --no-cache ä¸ä½¿ç”¨ä¼ºæœå™¨ä¸­çš„å¿«å–記憶資料\n" +msgstr " --no-hsts åœç”¨ HSTS\n" -#: src/main.c:890 +#: src/main.c:891 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" -msgstr "" +msgstr " --hsts-file HSTS 資料庫ä½ç½® (將會覆蓋é è¨­å€¼)\n" -#: src/main.c:895 +#: src/main.c:896 msgid "FTP options:\n" msgstr "FTP é¸é …：\n" -#: src/main.c:898 +#: src/main.c:899 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" +" --ftp-stmlf å°æ‰€æœ‰äºŒé€²ä½ FTP 檔案使用 Stream_LF æ ¼å¼\n" -#: src/main.c:901 -#, fuzzy +#: src/main.c:902 msgid " --ftp-user=USER set ftp user to USER\n" -msgstr " --ftp-user=用戶 指定 FTP 用戶å稱\n" +msgstr " --ftp-user=使用者 指定 FTP 使用者å稱\n" -#: src/main.c:903 -#, fuzzy +#: src/main.c:904 msgid " --ftp-password=PASS set ftp password to PASS\n" -msgstr " --ftp-password=密碼 設定 FTP 密碼\n" +msgstr " --ftp-password=密碼 設定 FTP 密碼\n" -#: src/main.c:905 -#, fuzzy +#: src/main.c:906 msgid " --no-remove-listing don't remove '.listing' files\n" -msgstr " --no-remove-listing ä¸åˆªé™¤ ‘.listing’ 檔案\n" +msgstr " --no-remove-listing ä¸ç§»é™¤ã€Œ.listingã€æª”案\n" -#: src/main.c:907 -#, fuzzy +#: src/main.c:908 msgid " --no-glob turn off FTP file name globbing\n" -msgstr " --no-glob ä¸å±•é–‹æœ‰è¬ç”¨å­—元的 FTP 檔å\n" +msgstr " --no-glob 關閉 FTP 檔案å稱的 glob 功能\n" -#: src/main.c:909 -#, fuzzy +#: src/main.c:910 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" -msgstr " --no-passive-ftp ä¸ä½¿ç”¨ã€Œè¢«å‹•ã€å‚³è¼¸æ¨¡å¼\n" +msgstr " --no-passive-ftp åœç”¨ã€Œè¢«å‹•ã€å‚³è¼¸æ¨¡å¼\n" -#: src/main.c:911 -#, fuzzy +#: src/main.c:912 msgid " --preserve-permissions preserve remote file permissions\n" -msgstr " --preserve-permissions 沿用é ç«¯æª”案的權é™\n" +msgstr " --preserve-permissions ä¿ç•™é ç«¯æª”案的權é™\n" -#: src/main.c:913 -#, fuzzy +#: src/main.c:914 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -" --retr-symlinks 在éžè¿´æ¨¡å¼ä¸­ï¼Œä¸‹è¼‰éˆçµæŒ‡ç¤ºçš„目標檔案 \n" -" (ä¸åŒ…括目錄)\n" +" --retr-symlinks 在éžè¿´æ¨¡å¼ä¸­ï¼Œä¸‹è¼‰é€£çµåˆ°çš„檔案 (éžç›®éŒ„)\n" -#: src/main.c:918 -#, fuzzy +#: src/main.c:919 msgid "FTPS options:\n" -msgstr "FTP é¸é …：\n" +msgstr "FTPS é¸é …：\n" -#: src/main.c:920 +#: src/main.c:921 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" +" --ftps-implicit ä½¿ç”¨éš±å« FTPS (é è¨­é€£ç·šåŸ ç‚º 990)\n" -#: src/main.c:922 +#: src/main.c:923 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" +" --ftps-resume-ssl 當開啟一資料連線時，回復在控制連線中\n" +" 開始的 SSL/TLS 階段。\n" +"\n" -#: src/main.c:925 +#: src/main.c:926 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:927 +#: src/main.c:928 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" +" --ftps-fallback-to-ftp 若目標伺æœå™¨ä¸æ”¯æ´ FTPS 則回退到 FTP\n" -#: src/main.c:931 -#, fuzzy +#: src/main.c:932 msgid "WARC options:\n" -msgstr "FTP é¸é …：\n" +msgstr "WARC é¸é …：\n" -#: src/main.c:933 +#: src/main.c:934 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" +" --warc-file=FILENAME 儲存請求與回應資料至 .warc.gz 檔案\n" -#: src/main.c:935 -#, fuzzy +#: src/main.c:936 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" -msgstr " --header=字串 在連線資料標頭中加入指定字串\n" +msgstr " --warc-header=字串 在 warcinfo 記錄中æ’入指定字串\n" -#: src/main.c:937 -#, fuzzy +#: src/main.c:938 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" -msgstr " -t, --tries=次數 設定é‡è©¦æ¬¡æ•¸ (0 表示無é™)\n" +msgstr " --warc-max-size=å¤§å° æŒ‡å®š WARC 檔案的最大大å°\n" -#: src/main.c:939 -#, fuzzy +#: src/main.c:940 msgid " --warc-cdx write CDX index files\n" -msgstr " --spider ä¸ä¸‹è¼‰ä»»ä½•è³‡æ–™\n" +msgstr " --warc-cdx 寫入 CDX 索引檔案\n" -#: src/main.c:941 +#: src/main.c:942 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" -msgstr "" +msgstr " --warc-dedup=FILENAME ä¸å„²å­˜åˆ—在此 CDX 檔案的紀錄\n" -#: src/main.c:944 +#: src/main.c:945 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" -msgstr "" +msgstr " --no-warc-compression ä¸ä»¥ GZIP 壓縮方å¼å£“縮 WARC 檔案\n" -#: src/main.c:947 -#, fuzzy +#: src/main.c:948 msgid " --no-warc-digests do not calculate SHA1 digests\n" -msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" +msgstr " --no-warc-digests ä¸è¨ˆç®— SHA1 摘è¦\n" -#: src/main.c:949 +#: src/main.c:950 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" -msgstr "" +msgstr " --no-warc-keep-log ä¸å„²å­˜ WARC 紀錄中的日誌檔案\n" -#: src/main.c:951 +#: src/main.c:952 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" -msgstr "" +msgstr " --warc-tempdir=DIRECTORY ç”± WARC 寫入器建立的暫存檔ä½ç½®\n" -#: src/main.c:956 +#: src/main.c:957 msgid "Recursive download:\n" msgstr "éžè¿´ä¸‹è¼‰ï¼š\n" -#: src/main.c:958 -#, fuzzy +#: src/main.c:959 msgid " -r, --recursive specify recursive download\n" -msgstr " -r, --recursive éžè¿´ä¸‹è¼‰\n" +msgstr " -r, --recursive 指定éžè¿´ä¸‹è¼‰\n" -#: src/main.c:960 -#, fuzzy +#: src/main.c:961 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" -msgstr " -l, --level=數字 最大æœå°‹æ·±åº¦ (inf 或 0 表示無é™)\n" +msgstr " -l, --level=數字 最大éžè¿´æ·±åº¦ (inf 或 0 表示無é™)\n" -#: src/main.c:962 -#, fuzzy +#: src/main.c:963 msgid "" " --delete-after delete files locally after downloading " "them\n" -msgstr " --delete-after 刪除下載後的檔案\n" +msgstr " --delete-after 下載檔案後於本機刪除檔案\n" -#: src/main.c:964 -#, fuzzy +#: src/main.c:965 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" -msgstr " -k, --convert-links 將下載後的 HTML çš„éˆçµè½‰æ›ç‚ºæœ¬åœ°æª”案\n" +msgstr "" +" -k, --convert-links 將下載到的 HTML 或 CSS 連çµå°åˆ°æœ¬æ©Ÿæª”案\n" -#: src/main.c:967 +#: src/main.c:968 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" +" --convert-file-only åªè½‰æ› URL 的檔案部份 (通常為 basename)\n" -#: src/main.c:969 +#: src/main.c:970 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" +" --backups=N 寫入檔案 X 之å‰ï¼Œæœ€å¤šä¿ç•™ N 個備份檔案\n" -#: src/main.c:973 -#, fuzzy +#: src/main.c:974 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" -msgstr " -K, --backup-converted 將檔案 X 轉æ›å‰å…ˆå‚™ä»½ç‚º X.orig\n" +msgstr " -K, --backup-converted 將轉æ›æª”案 X å‰å°‡å…¶å‚™ä»½ç‚º X_orig\n" -#: src/main.c:976 -#, fuzzy +#: src/main.c:977 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" -msgstr " -K, --backup-converted 將檔案 X 轉æ›å‰å…ˆå‚™ä»½ç‚º X.orig\n" +msgstr " -K, --backup-converted 將轉æ›æª”案 X å‰å°‡å…¶å‚™ä»½ç‚º X.orig\n" -#: src/main.c:979 -#, fuzzy +#: src/main.c:980 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -" -m, --mirror 相等於 -N -r -l inf --no-remove-listing é¸é …\n" +" -m, --mirror -N -r -l inf --no-remove-listing 指令的æ·" +"徑\n" -#: src/main.c:981 -#, fuzzy +#: src/main.c:982 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" -msgstr " -p, --page-requisites 下載所有顯示網é æ‰€éœ€çš„檔案，例如圖片等\n" +msgstr "" +" -p, --page-requisites 下載所有顯示網é æ‰€éœ€çš„檔案，例如圖片等\n" -#: src/main.c:983 -#, fuzzy +#: src/main.c:984 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:987 +#: src/main.c:988 msgid "Recursive accept/reject:\n" msgstr "éžè¿´ä¸‹è¼‰æ™‚有關接å—/拒絕的é¸é …：\n" -#: src/main.c:989 -#, fuzzy +#: src/main.c:990 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" -msgstr " -A, --accept=清單 接å—的檔案樣å¼ï¼Œä»¥é€—號分隔\n" +msgstr " -A, --accept=清單 接å—的副檔å列表，用逗號分隔\n" -#: src/main.c:991 -#, fuzzy +#: src/main.c:992 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" -msgstr " -R, --reject=清單 排除的檔案樣å¼ï¼Œä»¥é€—號分隔\n" +msgstr " -R, --reject=清單 排除的副檔å列表，以逗號分隔\n" -#: src/main.c:993 +#: src/main.c:994 msgid " --accept-regex=REGEX regex matching accepted URLs\n" -msgstr "" +msgstr " --accept-regex=REGEX 符åˆé€šéŽ URL çš„ Regex\n" -#: src/main.c:995 +#: src/main.c:996 msgid " --reject-regex=REGEX regex matching rejected URLs\n" -msgstr "" +msgstr " --reject-regex=REGEX 符åˆæ‹’絕 URL çš„ Regex\n" -#: src/main.c:998 -#, fuzzy +#: src/main.c:999 msgid " --regex-type=TYPE regex type (posix|pcre)\n" -msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" +msgstr " --regex-type=TYPE æ­£è¦è¡¨é”å¼é¡žåž‹ (posix|pcre)\n" -#: src/main.c:1001 -#, fuzzy +#: src/main.c:1002 msgid " --regex-type=TYPE regex type (posix)\n" -msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" +msgstr " --regex-type=é¡žåž‹ æ­£è¦è¡¨é”å¼é¡žåž‹ (posix)\n" -#: src/main.c:1004 -#, fuzzy +#: src/main.c:1005 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" -msgstr " -D, --domains=清單 接å—的網域，以逗號分隔\n" +msgstr " -D, --domains=列表 接å—的網域列表，以逗號分隔\n" -#: src/main.c:1006 -#, fuzzy +#: src/main.c:1007 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" -msgstr " --exclude-domains=清單 排除的網域，以逗號分隔\n" +msgstr " --exclude-domains=列表 拒絕的網域列表，以逗號分割\n" -#: src/main.c:1008 -#, fuzzy +#: src/main.c:1009 msgid "" " --follow-ftp follow FTP links from HTML documents\n" -msgstr " --follow-ftp 跟隨 HTML 文件中的 FTP éˆçµ\n" +msgstr " --follow-ftp 追蹤 HTML 檔案中的 FTP 連çµ\n" -#: src/main.c:1010 -#, fuzzy +#: src/main.c:1011 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" -msgstr " --follow-tags=清單 會跟隨的 HTML 標籤，以逗號分隔\n" +msgstr "" +" --follow-tags=列表 會追蹤的 HTML 標籤列表，以逗號分隔\n" -#: src/main.c:1012 -#, fuzzy +#: src/main.c:1013 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" -msgstr " -G, --ignore-tags=清單 會忽略的 HTML 標籤，以逗號分隔\n" +msgstr "" +" --ignore-tags=LIST 會忽略的 HTML 標籤列表，以逗號分隔\n" -#: src/main.c:1014 -#, fuzzy +#: src/main.c:1015 msgid " -H, --span-hosts go to foreign hosts when recursive\n" -msgstr " -H, --span-hosts éžè¿´æ¨¡å¼ä¸­å¯é€²å…¥å…¶å®ƒä¸»æ©Ÿ\n" +msgstr " -H, --span-hosts éžè¿´æ¨¡å¼ä¸­å¯é€²å…¥å¤–部主機\n" -#: src/main.c:1016 -#, fuzzy +#: src/main.c:1017 msgid " -L, --relative follow relative links only\n" -msgstr " -L, --relative åªè·Ÿéš¨ç›¸å°éˆçµ\n" +msgstr " -L, --relative åªè¿½è¹¤ç›¸å°é€£çµ\n" -#: src/main.c:1018 -#, fuzzy +#: src/main.c:1019 msgid " -I, --include-directories=LIST list of allowed directories\n" -msgstr " -I, --include-directories=清單 準備下載的目錄\n" +msgstr " -I, --include-directories=列表 å…許下載的目錄列表\n" -#: src/main.c:1020 +#: src/main.c:1021 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" -msgstr "" +msgstr " --trust-server-names 使用跳轉 URL 的最後部份指定的å稱\n" -#: src/main.c:1023 -#, fuzzy +#: src/main.c:1024 msgid " -X, --exclude-directories=LIST list of excluded directories\n" -msgstr " -X, --exclude-directories=清單 準備排除的目錄\n" +msgstr " -X, --exclude-directories=清單 è¦æŽ’除目錄的清單\n" -#: src/main.c:1025 -#, fuzzy +#: src/main.c:1026 msgid "" " -np, --no-parent don't ascend to the parent directory\n" -msgstr " -np, --no-parent ä¸é€²å…¥ä¸Šå±¤çš„目錄\n" +msgstr " -np, --no-parent ä¸é€²å…¥ä¸Šå±¤ç›®éŒ„\n" -#: src/main.c:1028 -#, fuzzy +#: src/main.c:1029 msgid "Email bug reports, questions, discussions to \n" -msgstr "請將錯誤報告或建議寄給 。\n" +msgstr "請將臭蟲報告ã€å•é¡Œèˆ‡è¨Žè«–寄到 \n" -#: src/main.c:1029 +#: src/main.c:1030 msgid "" "and/or open issues at https://savannah.gnu.org/bugs/?" "func=additem&group=wget.\n" msgstr "" +"å’Œ/或在 https://savannah.gnu.org/bugs/?func=additem&group=wget 開啟議題。\n" -#: src/main.c:1034 +#: src/main.c:1035 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s，éžäº’å‹•å¼æª”案下載工具。\n" -#: src/main.c:1077 +#: src/main.c:1078 #, c-format msgid "Password for user %s: " -msgstr "" +msgstr "使用者 %s 的密碼：" -#: src/main.c:1079 +#: src/main.c:1080 #, c-format msgid "Password: " -msgstr "" +msgstr "密碼：" -#: src/main.c:1103 +#: src/main.c:1104 #, c-format msgid "Cannot create pipe\n" -msgstr "" +msgstr "無法建立 pipe\n" -#: src/main.c:1111 +#: src/main.c:1112 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" -msgstr "" +msgstr "åˆå§‹åŒ– use-askpass 的生æˆæª”案動作時出錯：%d\n" -#: src/main.c:1120 +#: src/main.c:1121 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" -msgstr "" +msgstr "設定 use-askpass 的生æˆæª”案動作時出錯：%d\n" -#: src/main.c:1144 +#: src/main.c:1145 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" -msgstr "" +msgstr "從「%s %sã€æŒ‡ä»¤ä¸­è®€å–回應時出錯：%s\n" -#: src/main.c:1167 +#: src/main.c:1168 #, c-format msgid "Username for '%s%s': " -msgstr "" +msgstr "「%s%sã€çš„使用者帳號：" -#: src/main.c:1177 +#: src/main.c:1178 #, c-format msgid "Password for '%s%s@%s': " -msgstr "" +msgstr "「%s%s@%sã€çš„密碼：" -#: src/main.c:1249 +#: src/main.c:1250 msgid "Wgetrc: " -msgstr "" +msgstr "Wgetrc：" -#: src/main.c:1250 +#: src/main.c:1251 msgid "Locale: " -msgstr "" +msgstr "語系：" -#: src/main.c:1251 +#: src/main.c:1252 msgid "Compile: " -msgstr "" +msgstr "編譯：" -#: src/main.c:1252 +#: src/main.c:1253 msgid "Link: " -msgstr "" +msgstr "連çµï¼š" -#: src/main.c:1256 +#: src/main.c:1257 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" +"GNU Wget %s，於 %s 上編譯。\n" +"\n" -#: src/main.c:1283 +#: src/main.c:1284 #, c-format msgid " %s (env)\n" -msgstr "" +msgstr " %s (環境變數)\n" -#: src/main.c:1290 +#: src/main.c:1291 #, c-format msgid " %s (user)\n" -msgstr "" +msgstr " %s (使用者)\n" -#: src/main.c:1295 +#: src/main.c:1296 #, c-format msgid " %s (system)\n" -msgstr "" +msgstr " %s (系統)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1323 -#, fuzzy, c-format +#: src/main.c:1324 +#, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" -msgstr "版權所有 (C) 2005 自由軟體基金會\n" +msgstr "版權所有 (C) %s 自由軟體基金會\n" -#: src/main.c:1326 +#: src/main.c:1327 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" +"GPLv3+ 授權：GNU GPL 第三版或更新版本\n" +"。\n" +"此為自由軟體：您能自由修改與é‡æ•£å¸ƒå®ƒã€‚\n" +"在法律å…許的範åœå…§æ²’有任何擔ä¿ã€‚\n" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1334 +#: src/main.c:1335 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2623,384 +2610,402 @@ "\n" "最åˆç”± Hrvoje Niksic 編寫。\n" -#: src/main.c:1337 -#, fuzzy +#: src/main.c:1338 msgid "Please send bug reports and questions to .\n" -msgstr "請將錯誤報告或建議寄給 。\n" +msgstr "è«‹å°‡æ¼æ´žå ±å‘Šå’Œå•é¡Œå¯„到 。\n" -#: src/main.c:1390 src/main.c:1933 +#: src/main.c:1391 src/main.c:1940 #, c-format msgid "Memory allocation problem\n" -msgstr "" +msgstr "記憶體分é…å•é¡Œ\n" -#: src/main.c:1441 +#: src/main.c:1442 #, c-format msgid "Exiting due to error in %s\n" -msgstr "" +msgstr "因為 %s 中錯誤而退出\n" -#: src/main.c:1471 src/main.c:1542 src/main.c:1778 +#: src/main.c:1472 src/main.c:1543 src/main.c:1779 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "請嘗試執行‘%s --help’查看更多é¸é …。\n" -#: src/main.c:1538 +#: src/main.c:1539 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: é¸é …ä¸åˆæ³• -- ‘-n%c’\n" -#: src/main.c:1584 +#: src/main.c:1585 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" -msgstr "" +msgstr "未編譯進åµéŒ¯æ”¯æ´ã€‚é¸æ“‡å¿½ç•¥ --debug 旗標。\n" -#: src/main.c:1597 +#: src/main.c:1598 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" +"指定了 --no-clobber å’Œ --convert-links 兩者，將åªä½¿ç”¨ --convert-links。\n" -#: src/main.c:1599 +#: src/main.c:1600 #, 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 兩者，將åªä½¿ç”¨ --convert-file-" +"only。\n" -#: src/main.c:1632 +#: src/main.c:1633 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "無法åŒæ™‚使用詳細輸出模å¼åŠå®‰éœæ¨¡å¼ã€‚\n" -#: src/main.c:1638 +#: src/main.c:1639 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "無法åŒæ™‚使用時間標記而ä¸æ›´æ”¹æœ¬æ©Ÿæª”案。\n" -#: src/main.c:1647 +#: src/main.c:1648 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "ä¸å¯ä»¥åŒæ™‚使用 --inet4-only å’Œ --inet6-only é¸é …。\n" -#: src/main.c:1657 +#: src/main.c:1658 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" "with -p or -r. See the manual for details.\n" "\n" msgstr "" +"當指定多個 URL 時ã€æˆ–與 -p 或 -r çµåˆä½¿ç”¨æ™‚，無法åŒæ™‚指定 -k 或 --convert-" +"file-only å’Œ -O。\n" +"閱讀文件以了解詳細資訊。\n" -#: src/main.c:1666 +#: src/main.c:1667 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 "" +"警告：將 -O 與 -r 或 -p çµåˆä»£è¡¨è‘—所有的下載內容將會放置於您指定的單一檔" +"案。\n" +"\n" -#: src/main.c:1672 +#: src/main.c:1673 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" +"警告：與 -O 一起使用時時間戳將沒用。閱讀文件了解更多資訊。\n" +"\n" -#: src/main.c:1692 +#: src/main.c:1693 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" -msgstr "" +msgstr "WARC 輸出用ä¸åˆ° --no-clobber åƒæ•¸ï¼Œ--no-clobber 將被åœç”¨ã€‚\n" -#: src/main.c:1699 +#: src/main.c:1700 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" -msgstr "" +msgstr "WARC 輸出ä¸ä½¿ç”¨æ™‚間戳，時間戳將被åœç”¨ã€‚\n" -#: src/main.c:1706 +#: src/main.c:1707 #, c-format msgid "WARC output does not work with --spider.\n" -msgstr "" +msgstr "WARC 輸出用ä¸åˆ° --spider åƒæ•¸ã€‚\n" -#: src/main.c:1712 +#: src/main.c:1713 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" -msgstr "" +msgstr "WARC 輸出用ä¸åˆ° --continue 或 --start-pos 引數，它們將被åœç”¨ã€‚\n" -#: src/main.c:1720 +#: src/main.c:1721 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" -msgstr "" +msgstr "「摘è¦ã€ç‚ºåœç”¨ç‹€æ…‹ï¼›WARC 刪除é‡è¤‡è³‡æ–™åŠŸèƒ½å°‡ä¸å°‹æ‰¾é‡è¤‡è¨˜éŒ„。\n" -#: src/main.c:1741 +#: src/main.c:1742 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" -msgstr "" +msgstr "壓縮ä¸æ”¯æ´ --continue 或 --start-pos，將åœç”¨é€™äº›é¸é …。\n" -#: src/main.c:1752 -#, fuzzy, c-format +#: src/main.c:1753 +#, c-format msgid "Cannot specify both --ask-password and --password.\n" -msgstr "ä¸å¯ä»¥åŒæ™‚使用 --inet4-only å’Œ --inet6-only é¸é …。\n" +msgstr "ä¸èƒ½åŒæ™‚指定 --ask-password å’Œ --password。\n" -#: src/main.c:1760 +#: src/main.c:1761 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" -msgstr "" +msgstr "ä¸å»ºè­°åŒæ™‚指定 --start-pos å’Œ --continue；將åœç”¨ --continue。\n" -#: src/main.c:1773 +#: src/main.c:1774 #, c-format msgid "%s: missing URL\n" msgstr "%s: 未指定 URL\n" -#: src/main.c:1815 -#, fuzzy, c-format +#: src/main.c:1822 +#, c-format msgid "You cannot specify both --post-data and --post-file.\n" -msgstr "ä¸å¯ä»¥åŒæ™‚使用 --inet4-only å’Œ --inet6-only é¸é …。\n" +msgstr "ä¸èƒ½åŒæ™‚指定 --post-data å’Œ --post-file é¸é …。\n" -#: src/main.c:1820 +#: src/main.c:1827 #, 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 "" +"ä¸èƒ½èˆ‡ --method 一起使用 --post-data 或 --post-file。--method 期望資料é€éŽ --" +"body-data å’Œ --body-file é¸é …輸入\n" -#: src/main.c:1829 +#: src/main.c:1836 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" +"您必須指定é€éŽ --method=HTTPMethod 引數的方å¼ä»¥èˆ‡ --body-data 或 --body-file " +"一起使用。\n" -#: src/main.c:1835 -#, fuzzy, c-format +#: src/main.c:1842 +#, c-format msgid "You cannot specify both --body-data and --body-file.\n" -msgstr "ä¸å¯ä»¥åŒæ™‚使用 --inet4-only å’Œ --inet6-only é¸é …。\n" +msgstr "ä¸èƒ½åŒæ™‚指定 --body-data å’Œ --body-file é¸é …。\n" -#: src/main.c:1887 +#: src/main.c:1894 #, c-format msgid "This version does not have support for IRIs\n" -msgstr "" +msgstr "此版本ä¸æ”¯æ´ IRI\n" -#: src/main.c:1999 +#: src/main.c:2006 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" -msgstr "" +msgstr "å‡è‹¥è¼¸å‡ºåˆ°ä¸€å€‹æ­£å¸¸æª”案，-k 或 -r åªèƒ½èˆ‡ -O 一起使用。\n" -#: src/main.c:2005 +#: src/main.c:2012 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" +"å‡è‹¥è¼¸å‡ºåˆ°ä¸€å€‹æ­£å¸¸æª”案，--convert-links 或 --convert-file-only åªèƒ½ä¸€èµ·ä½¿" +"用。\n" -#: src/main.c:2016 +#: src/main.c:2023 #, c-format msgid "Failed to init libcares\n" -msgstr "" +msgstr "無法åˆå§‹åŒ– libcares\n" -#: src/main.c:2022 +#: src/main.c:2029 #, c-format msgid "Failed to init c-ares channel\n" -msgstr "" +msgstr "無法åˆå§‹åŒ– c-ares é »é“\n" -#: src/main.c:2045 +#: src/main.c:2052 #, c-format msgid "Failed to parse IP address '%s'\n" -msgstr "" +msgstr "ç„¡æ³•è§£æž IP ä½å€ã€Œ%sã€\n" -#: src/main.c:2056 +#: src/main.c:2063 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" -msgstr "" +msgstr "無法設定 DNS 伺æœå™¨ã€Œ%sã€(%d)\n" -#: src/main.c:2184 +#: src/main.c:2191 #, c-format msgid "No URLs found in %s.\n" msgstr "在 %s 中找ä¸åˆ° URL。\n" -#: src/main.c:2200 -#, fuzzy, c-format +#: src/main.c:2207 +#, c-format msgid "Unable to parse metalink file %s.\n" -msgstr "無法刪除‘%s’: %s\n" +msgstr "ç„¡æ³•è§£æž metalink 檔案 %s。\n" -#: src/main.c:2230 src/metalink.c:337 +#: src/main.c:2237 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" -msgstr "" +msgstr "無法從 %s 下載所有資æºã€‚\n" -#: src/main.c:2257 -#, fuzzy, c-format +#: src/main.c:2264 +#, c-format msgid "" "FINISHED --%s--\n" "Total wall clock time: %s\n" "Downloaded: %d files, %s in %s (%s)\n" msgstr "" -"\n" "å®Œæˆ --%s--\n" -"下載了: %s ä½å…ƒçµ„，共 %d 個檔案\n" +"總計 clock 時間：%s\n" +"已下載：%d 個檔案，%s 在 %s (%s) 中\n" -#: src/main.c:2271 -#, fuzzy, c-format +#: src/main.c:2278 +#, c-format msgid "Download quota of %s EXCEEDED!\n" -msgstr "超éŽä¸‹è¼‰é™é¡ (%s ä½å…ƒçµ„)ï¼\n" +msgstr "%s å·²é”下載é™é¡ï¼\n" #: src/metalink.c:93 msgid "-O not supported for metalink download. Ignoring.\n" -msgstr "" +msgstr "Metalink 下載ä¸æ”¯æ´ -O。é¸æ“‡å¿½ç•¥ã€‚\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 +#, c-format msgid "Planned metalink file: %s\n" -msgstr "無法é€éŽä»£ç†ä¼ºæœå™¨é€²è¡Œ tunneling: %s" +msgstr "排定的 metalink 檔案：%s\n" #: src/metalink.c:179 #, c-format msgid "Secured metalink file: %s\n" -msgstr "" +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 msgid "Processing metaurl %s...\n" -msgstr "" +msgstr "æ­£åœ¨è™•ç† metaurl %s…\n" #: src/metalink.c:251 #, c-format msgid "Rejecting metaurl file %s. Unsafe name.\n" msgstr "" +"因為ä¸å®‰å…¨çš„å稱，é¸æ“‡æ‹’絕 metaurl 檔案 %s。\n" +"\n" #: src/metalink.c:268 #, c-format msgid "Failed to download %s. Skipping metaurl.\n" -msgstr "" +msgstr "無法下載 %s。é¸æ“‡è·³éŽ metaurl。\n" #: src/metalink.c:285 -#, fuzzy, c-format +#, c-format msgid "Unable to parse metaurl file %s.\n" -msgstr "無法刪除‘%s’: %s\n" +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 msgid "Resource type %s not supported, ignoring...\n" -msgstr "" +msgstr "ä¸æ”¯æ´è³‡æºé¡žåž‹ %s，é¸æ“‡å¿½ç•¥â€¦\n" #: src/metalink.c:509 msgid "Could not open downloaded file.\n" -msgstr "" +msgstr "無法開啟下載的檔案。\n" #: src/metalink.c:514 #, c-format msgid "Computing size for %s\n" -msgstr "" +msgstr "正在為 %s 計算大å°\n" #: src/metalink.c:519 msgid "File size not declared. Skipping check.\n" -msgstr "" +msgstr "未è²æ˜Žæª”案大å°ï¼Œé¸æ“‡è·³éŽæª¢æŸ¥ã€‚\n" #: src/metalink.c:527 msgid "Could not get downloaded file's size.\n" -msgstr "" +msgstr "無法å–得下載檔案的大å°ã€‚\n" #: src/metalink.c:539 #, c-format msgid "Size mismatch for file %s.\n" -msgstr "" +msgstr "檔案 %s 的大å°ä¸ç›¸ç¬¦ã€‚\n" #: src/metalink.c:547 msgid "Size matches.\n" -msgstr "" +msgstr "大å°ç›¸ç¬¦ã€‚\n" #: src/metalink.c:600 #, c-format msgid "Computing checksum for %s\n" -msgstr "" +msgstr "正在計算 %s 的校驗碼\n" #: src/metalink.c:678 msgid "Checksum matches.\n" -msgstr "" +msgstr "校驗碼相符。\n" #: src/metalink.c:683 #, c-format msgid "Checksum mismatch for file %s.\n" -msgstr "" +msgstr "檔案 %s 的校驗碼ä¸ç¬¦ã€‚\n" #: src/metalink.c:722 msgid "Could not open downloaded file for signature verification.\n" -msgstr "" +msgstr "無法開啟用於簽å驗證的已下載檔案。\n" #: src/metalink.c:780 #, c-format msgid "GPGME data_new_from_mem: %s\n" -msgstr "" +msgstr "GPGME data_new_from_mem: %s\n" #: src/metalink.c:792 #, c-format msgid "GPGME op_verify: %s\n" -msgstr "" +msgstr "GPGME op_verify: %s\n" #: src/metalink.c:805 msgid "GPGME op_verify_result: NULL\n" -msgstr "" +msgstr "GPGME op_verify_result: NULL\n" #: src/metalink.c:821 msgid "Signature validation succeeded.\n" -msgstr "" +msgstr "ç°½åé©—è­‰æˆåŠŸã€‚\n" #: src/metalink.c:829 msgid "Invalid signature. Rejecting resource.\n" -msgstr "" +msgstr "無效簽å。é¸æ“‡æ‹’絕資æºã€‚\n" #: src/metalink.c:838 msgid "Data matches signature, but signature is not trusted.\n" -msgstr "" +msgstr "資料與簽å相符，但簽åä¸å—信任。\n" #: src/metalink.c:865 msgid "No checksums found.\n" -msgstr "" +msgstr "找ä¸åˆ°æ ¡é©—碼。\n" #: src/metalink.c:871 #, c-format msgid "Failed to download %s. Skipping resource.\n" -msgstr "" +msgstr "無法下載 %s。é¸æ“‡è·³éŽè³‡æºã€‚\n" #: src/metalink.c:878 #, c-format msgid "File %s retrieved but size does not match. \n" -msgstr "" +msgstr "接收到 %s 檔案，但大å°å»ä¸ç›¸ç¬¦ã€‚\n" #: src/metalink.c:885 #, c-format msgid "File %s retrieved but checksum does not match. \n" -msgstr "" +msgstr "接收到 %s 檔案，但校驗碼å»ä¸ç›¸ç¬¦ã€‚\n" #: src/metalink.c:894 #, c-format msgid "File %s retrieved but signature does not match. \n" -msgstr "" +msgstr "接收到 %s 檔案，但簽åå»ä¸ç›¸ç¬¦ã€‚\n" #: src/metalink.c:1113 -#, fuzzy, c-format +#, c-format msgid "Renaming %s to %s.\n" -msgstr "刪除 %s。\n" +msgstr "正在將 %s é‡æ–°å‘½å至 %s。\n" #: src/mswindows.c:96 #, c-format @@ -3012,20 +3017,20 @@ msgid "Continuing in background, pid %lu.\n" msgstr "繼續在背景中執行，pid 為 %lu。\n" -#: src/mswindows.c:291 src/utils.c:505 -#, fuzzy, c-format +#: src/mswindows.c:291 src/utils.c:508 +#, c-format msgid "Output will be written to %s.\n" -msgstr "將輸出資料寫入 ‘%s’。\n" +msgstr "將會把輸出寫到 %s。\n" #: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" -msgstr "" +msgstr "fake_fork_child() 失敗\n" #: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" -msgstr "" +msgstr "fake_fork() 失敗\n" #: src/mswindows.c:460 src/mswindows.c:467 #, c-format @@ -3035,12 +3040,12 @@ #: src/mswindows.c:647 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" -msgstr "" +msgstr "ioctl() 失敗。Socket ä¸èƒ½è¨­å®šç‚ºå°éŽ–狀態 (blocking)。\n" #: src/netrc.c:371 -#, fuzzy, c-format +#, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" -msgstr "%s: %s:%d: 警告: 「%sã€å‡ºç¾åœ¨ä¸»æ©Ÿå稱之å‰\n" +msgstr "%s：%s:%d：警告：%s 令牌在機器å稱å‰å‡ºç¾\n" #: src/netrc.c:412 #, c-format @@ -3057,116 +3062,118 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s：無法 stat() %s：%s\n" -#: src/openssl.c:112 +#: src/openssl.c:114 msgid "WARNING: using a weak random seed.\n" msgstr "警告：隨機數å“質ä¸å¤ ã€‚\n" -#: src/openssl.c:190 +#: src/openssl.c:192 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "無法產生 OpenSSL éš¨æ©Ÿæ•¸ç”¢ç”Ÿç¨‹åº (PRNG) 使用的種å­ï¼›è«‹è€ƒæ…®ä½¿ç”¨ --random-file " "é¸é …。\n" -#: src/openssl.c:263 +#: src/openssl.c:267 msgid "Your OpenSSL version is too old to support TLS 1.3\n" -msgstr "" +msgstr "您的 OpenSSL 版本舊到ä¸æ”¯æ´ TLS 1.3\n" -#: src/openssl.c:269 +#: src/openssl.c:273 msgid "Your OpenSSL version is too old to support TLSv1.1\n" -msgstr "" +msgstr "您的 OpenSSL 版本舊到ä¸æ”¯æ´ TLSv1.1\n" -#: src/openssl.c:273 +#: src/openssl.c:277 msgid "Your OpenSSL version is too old to support TLSv1.2\n" -msgstr "" +msgstr "您的 OpenSSL 版本舊到ä¸æ”¯æ´ TLSv1.2\n" -#: src/openssl.c:279 +#: src/openssl.c:283 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" -msgstr "" +msgstr "OpenSSL：未實åšçš„「secure-protocolã€é¸é …值 %d\n" -#: src/openssl.c:319 -#, fuzzy, c-format +#: src/openssl.c:323 +#, c-format msgid "OpenSSL: Invalid cipher list: %s\n" -msgstr "%s: URL ‘%s’ 無效: %s\n" +msgstr "OpenSSL：無效的密文列表：%s\n" -#: src/openssl.c:636 -#, fuzzy +#: src/openssl.c:640 msgid "WARNING: Could not seed PRNG. Consider using --random-file.\n" -msgstr "" -"無法產生 OpenSSL éš¨æ©Ÿæ•¸ç”¢ç”Ÿç¨‹åº (PRNG) 使用的種å­ï¼›è«‹è€ƒæ…®ä½¿ç”¨ --random-file " -"é¸é …。\n" +msgstr "è­¦å‘Šï¼šç„¡æ³•ç”¢ç”Ÿç¨®å­ PRNG。請考慮使用 --random-file。\n" -#: src/openssl.c:856 -#, fuzzy, c-format +#: src/openssl.c:860 +#, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" -msgstr "%s：%s 沒有æ供憑證。\n" +msgstr "%s：無法驗證 %s 的憑證 (ç”± %s 簽發)：\n" -#: src/openssl.c:867 +#: src/openssl.c:871 msgid " Unable to locally verify the issuer's authority.\n" -msgstr "" +msgstr " 無法本機驗證此發行者的身份。\n" -#: src/openssl.c:872 +#: src/openssl.c:876 msgid " Self-signed certificate encountered.\n" -msgstr "" +msgstr " é‡åˆ°è‡ªç°½æ†‘證。\n" -#: src/openssl.c:875 +#: src/openssl.c:879 msgid " Issued certificate not yet valid.\n" -msgstr "" +msgstr " 發行的憑證尚未有效。\n" -#: src/openssl.c:878 +#: src/openssl.c:882 msgid " Issued certificate has expired.\n" -msgstr "" +msgstr " 發行的憑證已éŽæœŸ\n" -#: src/openssl.c:966 -#, fuzzy, c-format +#: src/openssl.c:970 +#, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" -msgstr "%s：憑證的 common name ‘%s’ 和主機å稱 ‘%s’ ä¸ç¬¦ã€‚\n" +msgstr "" +"%s：沒有憑證主旨替代å稱符åˆ\n" +"\t請求的主機å稱 %s。\n" -#: src/openssl.c:985 -#, fuzzy, c-format +#: src/openssl.c:989 +#, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" -msgstr "%s：憑證的 common name ‘%s’ 和主機å稱 ‘%s’ ä¸ç¬¦ã€‚\n" +msgstr " %s：憑證的一般å稱「%sã€å’Œè«‹æ±‚的主機å稱「%sã€ä¸ç¬¦ã€‚\n" -#: src/openssl.c:1017 +#: src/openssl.c:1021 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" " This may be an indication that the host is not who it claims to be\n" " (that is, it is not the real %s).\n" msgstr "" +" %s：憑證的一般å稱無效 (包å«äº† NUL å­—å…ƒ)。\n" +" 這å¯èƒ½æ˜¯ä¸»æ©Ÿéžç”±è²ç¨±è€…æ“有的跡象（也就是說，\n" +" å…¶ä¸æ˜¯çœŸæ­£çš„ %s）。\n" -#: src/openssl.c:1042 +#: src/openssl.c:1046 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "如果ä¸æƒ³ç”¨å®‰å…¨æ¨¡å¼é€£æŽ¥ %s，請使用 ‘--no-check-certificate’ é¸é …\n" #: src/progress.c:244 -#, fuzzy, c-format +#, c-format msgid "" "\n" "%*s[ skipping %sK ]" msgstr "" "\n" -"%*s[ ç•¥éŽ %dK ]" +"%*s[ ç•¥éŽ %sK ]" #: src/progress.c:465 -#, fuzzy, c-format +#, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" -msgstr "é€²åº¦æŒ‡ç¤ºæ–¹å¼ â€˜%s’ 無效；ä¸æœƒæ”¹è®ŠåŽŸä¾†æ–¹å¼ã€‚\n" +msgstr "無效的點樣å¼è¦ç¯„ %sï¼›é¸æ“‡ä¸è®Šæ›´ã€‚\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. #: src/progress.c:857 #, c-format msgid " eta %s" -msgstr "" +msgstr " 剩餘 %s" #: src/progress.c:1147 msgid " in " -msgstr "" +msgstr " æ–¼ " #: src/ptimer.c:157 #, c-format @@ -3187,22 +3194,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "正在載入 robots.txt；請忽略錯誤訊æ¯ã€‚\n" -#: src/retr.c:912 +#: src/retr.c:928 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "分æžä»£ç†ä¼ºæœå™¨ URL %s 時發生錯誤: %s。\n" -#: src/retr.c:924 +#: src/retr.c:940 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "代ç†ä¼ºæœå™¨ URL %s 錯誤: 必須是 HTTP。\n" -#: src/retr.c:1053 +#: src/retr.c:1069 #, c-format msgid "%d redirections exceeded.\n" msgstr "å·²è¶…éŽ %d 次é‡æ–°å°Žå‘。\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Giving up.\n" "\n" @@ -3210,7 +3217,7 @@ "放棄。\n" "\n" -#: src/retr.c:1317 +#: src/retr.c:1333 msgid "" "Retrying.\n" "\n" @@ -3223,6 +3230,8 @@ "Found no broken links.\n" "\n" msgstr "" +"未找到æ壞連çµã€‚\n" +"\n" #: src/spider.c:82 #, c-format @@ -3233,20 +3242,21 @@ "Found %d broken links.\n" "\n" msgstr[0] "" -msgstr[1] "" +"找到 %d 個æ壞連çµã€‚\n" +"\n" #: src/url.c:674 msgid "No error" msgstr "沒有錯誤" #: src/url.c:676 -#, fuzzy, c-format +#, c-format msgid "Unsupported scheme %s" -msgstr "ä¸æ”¯æ´é€™ç¨® URL æ ¼å¼" +msgstr "ä¸æ”¯æ´çš„æ¨£å¼ %s" #: src/url.c:678 msgid "Scheme missing" -msgstr "" +msgstr "缺少基模" #: src/url.c:680 msgid "Invalid host name" @@ -3258,7 +3268,7 @@ #: src/url.c:684 msgid "Invalid user name" -msgstr "用戶å稱無效" +msgstr "使用者å稱無效" #: src/url.c:686 msgid "Unterminated IPv6 numeric address" @@ -3274,122 +3284,133 @@ #: src/url.c:1006 msgid "HTTPS support not compiled in" -msgstr "" +msgstr "未編譯進 HTTPS 支æ´" -#: src/url.c:1604 +#: src/url.c:1603 msgid "Unconvertable multibyte sequence encountered\n" -msgstr "" +msgstr "é‡åˆ°ç„¡æ³•æ•‘æ´çš„多ä½å…ƒé™£åˆ—\n" -#: src/utils.c:125 -#, fuzzy, c-format +#: src/utils.c:128 +#, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" -msgstr "%s：%sï¼šç„¡æ³•åˆ†é… %ld ä½å…ƒçµ„，記憶體已耗盡。\n" +msgstr "%s：%s：無法分é…足夠的記憶體；記憶體資æºå·²ç¶“耗盡。\n" -#: src/utils.c:131 +#: src/utils.c:134 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s：%sï¼šç„¡æ³•åˆ†é… %ld ä½å…ƒçµ„，記憶體已耗盡。\n" -#: src/utils.c:351 +#: src/utils.c:354 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" -msgstr "" +msgstr "%s：aprintf：文字緩è¡å€éŽå¤§ (%d ä½å…ƒçµ„)，é¸æ“‡å¿½ç•¥ã€‚\n" -#: src/utils.c:503 +#: src/utils.c:506 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "繼續在背景中執行，pid 為 %d。\n" -#: src/utils.c:554 -#, fuzzy, c-format +#: src/utils.c:557 +#, c-format msgid "Failed to unlink symlink %s: %s\n" -msgstr "無法刪除符號éˆçµ '%s': %s\n" +msgstr "無法å–æ¶ˆç¬¦è™Ÿé€£çµ %s：%s\n" -#: src/utils.c:859 -#, fuzzy, c-format +#: src/utils.c:865 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "無法 Fopen 檔案 %s\n" -#: src/utils.c:865 -#, fuzzy, c-format +#: src/utils.c:871 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "無法å–得檔案 %s 的檔案æ述符 (FD)\n" -#: src/utils.c:872 -#, fuzzy, c-format +#: src/utils.c:878 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "無法 stat 檔案 %s，（請檢查權é™ï¼‰\n" -#: src/utils.c:882 +#: src/utils.c:888 #, c-format msgid "File %s changed since the last check. Security check failed." -msgstr "" +msgstr "ä¸Šæ¬¡æª¢æŸ¥ä»¥ä¾†ç™¼ç¾ %s 檔案已變更。安全檢查失敗。" -#: src/utils.c:917 -#, fuzzy, c-format +#: src/utils.c:923 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "無法開啟檔案 %s，原因是：%s\n" -#: src/utils.c:923 -#, fuzzy, c-format +#: src/utils.c:929 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "無法 stat 檔案 %s，錯誤為：%s\n" -#: src/utils.c:932 +#: src/utils.c:939 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." -msgstr "" +msgstr "嘗試打開檔案 %s 但其在上次檢查後被修改éŽã€‚安全檢查失敗。" -#: src/utils.c:2438 src/utils.c:2462 +#: src/utils.c:2445 +#, c-format +msgid "Invalid regular expression %s, PCRE2 error %d\n" +msgstr "無效的正è¦è¡¨é”å¼ %s，PCRE2 錯誤 %d\n" + +#: src/utils.c:2462 src/utils.c:2485 #, c-format msgid "Invalid regular expression %s, %s\n" -msgstr "" +msgstr "無效的正è¦è¡¨é”å¼ %s，%s\n" -#: src/utils.c:2486 src/utils.c:2510 -#, fuzzy, c-format +#: src/utils.c:2515 src/utils.c:2537 src/utils.c:2561 +#, c-format msgid "Error while matching %s: %d\n" -msgstr "寫入‘%s’時發生錯誤: %s\n" +msgstr "尋找 %s 符åˆé …目時出錯：%d\n" -#: src/utils.c:2803 +#: src/utils.c:2854 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" -msgstr "" +msgstr "è·³éŽéŒ¯èª¤å¤§å°çš„金鑰 (%d/%d)：%s\n" + +#: src/warc.c:222 +msgid "Error duplicating WARC file file descriptor.\n" +msgstr "複製 WARC 檔案的檔案æ述符時發生錯誤。\n" -#: src/warc.c:223 +#: src/warc.c:233 msgid "Error opening GZIP stream to WARC file.\n" -msgstr "" +msgstr "é–‹å•Ÿçš„ GZIP 串æµæ™‚出錯。\n" -#: src/warc.c:798 +#: src/warc.c:809 msgid "Error writing warcinfo record to WARC file.\n" -msgstr "" +msgstr "寫入 warcinfo 紀錄到 WARC 檔案時出錯。\n" -#: src/warc.c:861 +#: src/warc.c:872 #, c-format msgid "" "Opening WARC file %s.\n" "\n" msgstr "" +"正在開啟 WARC 檔案 %s。\n" +"\n" -#: src/warc.c:867 -#, fuzzy, c-format +#: src/warc.c:878 +#, c-format msgid "Error opening WARC file %s.\n" -msgstr "分æžä»£ç†ä¼ºæœå™¨ URL %s 時發生錯誤: %s。\n" +msgstr "é–‹å•Ÿ WARC 檔案 %s 時出錯。\n" -#: src/warc.c:1064 +#: src/warc.c:1075 msgid "CDX file does not list original urls. (Missing column 'a'.)\n" -msgstr "" +msgstr "CDX 檔案未列出原始 URL。（缺少「aã€æ¬„ä½ï¼‰\n" -#: src/warc.c:1067 +#: src/warc.c:1078 msgid "CDX file does not list checksums. (Missing column 'k'.)\n" -msgstr "" +msgstr "CDX 檔案未列出雜湊值。（缺少「kã€æ¬„ä½ï¼‰\n" -#: src/warc.c:1070 +#: src/warc.c:1081 msgid "CDX file does not list record ids. (Missing column 'u'.)\n" -msgstr "" +msgstr "CDX 檔案未列出紀錄 ID。（缺少「uã€æ¬„ä½ï¼‰\n" -#: src/warc.c:1094 +#: src/warc.c:1105 #, c-format msgid "" "Loaded %d record from CDX.\n" @@ -3398,56 +3419,52 @@ "Loaded %d records from CDX.\n" "\n" msgstr[0] "" -msgstr[1] "" +"已從 CDX 載入 %d 個記錄。\n" +"\n" -#: src/warc.c:1140 +#: src/warc.c:1151 #, c-format msgid "Could not read CDX file %s for deduplication.\n" -msgstr "" +msgstr "無法讀å–用來刪除é‡è¤‡è³‡æ–™çš„ CDX 檔案 %s。\n" -#: src/warc.c:1150 +#: src/warc.c:1161 msgid "Could not open temporary WARC manifest file.\n" -msgstr "" +msgstr "無法開啟暫時 WARC 清單檔案。\n" -#: src/warc.c:1160 +#: src/warc.c:1171 msgid "Could not open temporary WARC log file.\n" -msgstr "" +msgstr "無法開啟暫時 WARC 紀錄檔案。\n" -#: src/warc.c:1169 +#: src/warc.c:1180 msgid "Could not open WARC file.\n" -msgstr "" +msgstr "無法開啟 WARC 檔案。\n" -#: src/warc.c:1178 +#: src/warc.c:1189 msgid "Could not open CDX file for output.\n" -msgstr "" +msgstr "無法開啟用於輸出的 CDX 檔案。\n" -#: src/warc.c:1208 +#: src/warc.c:1219 msgid "Could not open temporary WARC file.\n" -msgstr "" +msgstr "無法開啟暫時 WARC 檔案。\n" -#: src/warc.c:1482 +#: src/warc.c:1495 msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" -msgstr "" +msgstr "在 CDX 檔案中找到精確符åˆé …目。é¸æ“‡å„²å­˜é‡æ–°ç€è¦½ç´€éŒ„到 WARC 中。\n" -#, fuzzy #~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: é¸é …‘--%s’ä¸å¯é…åˆå¼•æ•¸ä½¿ç”¨\n" +#~ msgstr "%s：「--%sã€é¸é …ä¸å…許引數\n" -#, fuzzy #~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s: 無法識別é¸é …‘--%s’\n" +#~ msgstr "%s：無法識別的é¸é …「--%sã€\n" -#, fuzzy #~ msgid "%s: option '-W %s' is ambiguous\n" -#~ msgstr "%s: é¸é …‘-W %s’ä¸æ˜Žç¢º\n" +#~ msgstr "%s：「-W %sã€é¸é …ä¸æ˜Žç¢º\n" -#, fuzzy #~ msgid "%s: option '-W %s' doesn't allow an argument\n" -#~ msgstr "%s: é¸é …‘-W %s’ä¸å¯é…åˆå¼•æ•¸ä½¿ç”¨\n" +#~ msgstr "%s：「-W %sã€é¸é …ä¸å…許引數\n" -#, fuzzy #~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: é¸é …‘%s’需è¦å¼•æ•¸\n" +#~ msgstr "%s：「-W %sã€é¸é …需è¦å¼•æ•¸\n" #~ msgid "File `%s' already there; not retrieving.\n" #~ msgstr "檔案 ‘%s’ 已存在，ä¸æœƒä¸‹è¼‰ã€‚\n" diff -Nru wget-1.19.5/src/config.h.in wget-1.20.1/src/config.h.in --- wget-1.19.5/src/config.h.in 2018-05-06 16:47:49.000000000 +0000 +++ wget-1.20.1/src/config.h.in 2018-12-26 20:09:00.000000000 +0000 @@ -1,80 +1,5 @@ /* 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 @@ -158,6 +83,10 @@ /* Define to 1 if the system's ftello function has the Solaris bug. */ #undef FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE +/* Define to 1 if fflush is known to work on stdin as per POSIX.1-2008, 0 if + fflush is known to not work, -1 if unknown. */ +#undef FUNC_FFLUSH_STDIN + /* Define to 1 if mkdir mistakenly creates a directory given with a trailing dot component. */ #undef FUNC_MKDIR_DOT_BUG @@ -186,6 +115,9 @@ declaration of the second argument to gettimeofday. */ #undef GETTIMEOFDAY_TIMEZONE +/* Compile Gnulib crypto stream ops. */ +#undef GL_COMPILE_CRYPTO_STREAM + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module dirname shall be considered present. */ #undef GNULIB_DIRNAME @@ -195,6 +127,10 @@ #undef GNULIB_FD_SAFER_FLAG /* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module fflush shall be considered present. */ +#undef GNULIB_FFLUSH + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module fscanf shall be considered present. */ #undef GNULIB_FSCANF @@ -265,9 +201,18 @@ /* Define to 1 when the gnulib module fcntl should be tested. */ #undef GNULIB_TEST_FCNTL +/* Define to 1 when the gnulib module fflush should be tested. */ +#undef GNULIB_TEST_FFLUSH + +/* Define to 1 when the gnulib module fnmatch should be tested. */ +#undef GNULIB_TEST_FNMATCH + /* Define to 1 when the gnulib module fopen should be tested. */ #undef GNULIB_TEST_FOPEN +/* Define to 1 when the gnulib module fpurge should be tested. */ +#undef GNULIB_TEST_FPURGE + /* Define to 1 when the gnulib module fseek should be tested. */ #undef GNULIB_TEST_FSEEK @@ -301,6 +246,9 @@ /* Define to 1 when the gnulib module getline should be tested. */ #undef GNULIB_TEST_GETLINE +/* Define to 1 when the gnulib module getpass should be tested. */ +#undef GNULIB_TEST_GETPASS + /* Define to 1 when the gnulib module getpeername should be tested. */ #undef GNULIB_TEST_GETPEERNAME @@ -553,6 +501,9 @@ /* Define to 1 if nanosleep mishandles large arguments. */ #undef HAVE_BUG_BIG_NANOSLEEP +/* Define to 1 if you have the header file. */ +#undef HAVE_BYTESWAP_H + /* Define to 1 if you have the `catgets' function. */ #undef HAVE_CATGETS @@ -608,6 +559,10 @@ don't. */ #undef HAVE_DECL_FLOCKFILE +/* Define to 1 if you have the declaration of `fpurge', and to 0 if you don't. + */ +#undef HAVE_DECL_FPURGE + /* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_FPUTC_UNLOCKED @@ -676,10 +631,6 @@ don't. */ #undef HAVE_DECL_GETNAMEINFO -/* Define to 1 if you have the declaration of `getpass', and to 0 if you - don't. */ -#undef HAVE_DECL_GETPASS - /* Define to 1 if you have the declaration of `h_errno', and to 0 if you don't. */ #undef HAVE_DECL_H_ERRNO @@ -776,6 +727,10 @@ don't. */ #undef HAVE_DECL_WCWIDTH +/* Define to 1 if you have the declaration of `_fseeki64', and to 0 if you + don't. */ +#undef HAVE_DECL__FSEEKI64 + /* Define to 1 if you have the declaration of `_snprintf', and to 0 if you don't. */ #undef HAVE_DECL__SNPRINTF @@ -815,6 +770,15 @@ /* Define to 1 if you have the `fmemopen' function. */ #undef HAVE_FMEMOPEN +/* Define to 1 if you have the `fnmatch' function. */ +#undef HAVE_FNMATCH + +/* Define to 1 if you have the header file. */ +#undef HAVE_FNMATCH_H + +/* Define to 1 if you have the `fpurge' function. */ +#undef HAVE_FPURGE + /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #undef HAVE_FSEEKO @@ -866,6 +830,9 @@ /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE +/* Define to 1 if you have the `getpass' function. */ +#undef HAVE_GETPASS + /* Define to 1 if you have the `getprogname' function. */ #undef HAVE_GETPROGNAME @@ -968,6 +935,9 @@ /* Define if libpcre is available. */ #undef HAVE_LIBPCRE +/* Define if libpcre2 is available. */ +#undef HAVE_LIBPCRE2 + /* PSL support enabled */ #undef HAVE_LIBPSL @@ -992,6 +962,9 @@ /* Define to 1 if you have the `link' function. */ #undef HAVE_LINK +/* Define to 1 if you have 'struct sockaddr_alg' defined. */ +#undef HAVE_LINUX_IF_ALG_H + /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R @@ -1063,9 +1036,6 @@ concept. */ #undef HAVE_MSVC_INVALID_PARAMETER_HANDLER -/* Define to 1 if you have the `nanotime' function. */ -#undef HAVE_NANOTIME - /* Define to 1 if you have the header file. */ #undef HAVE_NETDB_H @@ -1139,746 +1109,6 @@ /* Define to 1 if you have the `rawmemchr' function. */ #undef HAVE_RAWMEMCHR -/* Define to 1 if accept is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_ACCEPT - -/* Define to 1 if accept4 is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_ACCEPT4 - -/* Define to 1 if atoll is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_ATOLL - -/* Define to 1 if bind is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_BIND - -/* Define to 1 if btowc is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_BTOWC - -/* Define to 1 if canonicalize_file_name is declared even after undefining - macros. */ -#undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME - -/* Define to 1 if chdir is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_CHDIR - -/* Define to 1 if chown is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_CHOWN - -/* Define to 1 if connect is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_CONNECT - -/* Define to 1 if dprintf is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_DPRINTF - -/* Define to 1 if dup is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_DUP - -/* Define to 1 if dup2 is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_DUP2 - -/* Define to 1 if dup3 is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_DUP3 - -/* Define to 1 if duplocale is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_DUPLOCALE - -/* Define to 1 if endusershell is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_ENDUSERSHELL - -/* Define to 1 if environ is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_ENVIRON - -/* Define to 1 if euidaccess is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_EUIDACCESS - -/* Define to 1 if faccessat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FACCESSAT - -/* Define to 1 if fchdir is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FCHDIR - -/* Define to 1 if fchmodat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FCHMODAT - -/* Define to 1 if fchownat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FCHOWNAT - -/* Define to 1 if fcntl is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FCNTL - -/* Define to 1 if fdatasync is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FDATASYNC - -/* Define to 1 if ffs is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FFS - -/* Define to 1 if ffsl is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FFSL - -/* Define to 1 if ffsll is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FFSLL - -/* Define to 1 if flock is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FLOCK - -/* Define to 1 if fpurge is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FPURGE - -/* Define to 1 if freeaddrinfo is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FREEADDRINFO - -/* Define to 1 if fseeko is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FSEEKO - -/* Define to 1 if fstat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FSTAT - -/* Define to 1 if fstatat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FSTATAT - -/* Define to 1 if fsync is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FSYNC - -/* Define to 1 if ftello is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FTELLO - -/* Define to 1 if ftruncate is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FTRUNCATE - -/* Define to 1 if futimens is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_FUTIMENS - -/* Define to 1 if gai_strerror is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GAI_STRERROR - -/* Define to 1 if getaddrinfo is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETADDRINFO - -/* Define to 1 if getcwd is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETCWD - -/* Define to 1 if getdelim is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETDELIM - -/* Define to 1 if getdomainname is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETDOMAINNAME - -/* Define to 1 if getdtablesize is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETDTABLESIZE - -/* Define to 1 if getgroups is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETGROUPS - -/* Define to 1 if gethostname is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETHOSTNAME - -/* Define to 1 if getline is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETLINE - -/* Define to 1 if getloadavg is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETLOADAVG - -/* Define to 1 if getlogin is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETLOGIN - -/* Define to 1 if getlogin_r is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETLOGIN_R - -/* Define to 1 if getnameinfo is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETNAMEINFO - -/* Define to 1 if getpagesize is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETPAGESIZE - -/* Define to 1 if getpeername is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETPEERNAME - -/* Define to 1 if gets is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETS - -/* Define to 1 if getsockname is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETSOCKNAME - -/* Define to 1 if getsockopt is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETSOCKOPT - -/* Define to 1 if getsubopt is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETSUBOPT - -/* Define to 1 if gettimeofday is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETTIMEOFDAY - -/* Define to 1 if getusershell is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GETUSERSHELL - -/* Define to 1 if grantpt is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GRANTPT - -/* Define to 1 if group_member is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_GROUP_MEMBER - -/* Define to 1 if imaxabs is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_IMAXABS - -/* Define to 1 if imaxdiv is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_IMAXDIV - -/* Define to 1 if inet_ntop is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_INET_NTOP - -/* Define to 1 if inet_pton is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_INET_PTON - -/* Define to 1 if initstate is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_INITSTATE - -/* Define to 1 if initstate_r is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_INITSTATE_R - -/* Define to 1 if ioctl is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_IOCTL - -/* Define to 1 if isatty is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_ISATTY - -/* Define to 1 if iswctype is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_ISWCTYPE - -/* Define to 1 if lchmod is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_LCHMOD - -/* Define to 1 if lchown is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_LCHOWN - -/* Define to 1 if link is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_LINK - -/* Define to 1 if linkat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_LINKAT - -/* Define to 1 if listen is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_LISTEN - -/* Define to 1 if lseek is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_LSEEK - -/* Define to 1 if lstat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_LSTAT - -/* Define to 1 if mbrlen is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MBRLEN - -/* Define to 1 if mbrtowc is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MBRTOWC - -/* Define to 1 if mbsinit is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MBSINIT - -/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MBSNRTOWCS - -/* Define to 1 if mbsrtowcs is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MBSRTOWCS - -/* Define to 1 if memmem is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MEMMEM - -/* Define to 1 if mempcpy is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MEMPCPY - -/* Define to 1 if memrchr is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MEMRCHR - -/* Define to 1 if mkdirat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MKDIRAT - -/* Define to 1 if mkdtemp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MKDTEMP - -/* Define to 1 if mkfifo is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MKFIFO - -/* Define to 1 if mkfifoat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MKFIFOAT - -/* Define to 1 if mknod is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MKNOD - -/* Define to 1 if mknodat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MKNODAT - -/* Define to 1 if mkostemp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MKOSTEMP - -/* Define to 1 if mkostemps is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MKOSTEMPS - -/* Define to 1 if mkstemp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MKSTEMP - -/* Define to 1 if mkstemps is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_MKSTEMPS - -/* Define to 1 if nl_langinfo is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_NL_LANGINFO - -/* Define to 1 if openat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_OPENAT - -/* Define to 1 if pclose is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_PCLOSE - -/* Define to 1 if pipe is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_PIPE - -/* Define to 1 if pipe2 is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_PIPE2 - -/* Define to 1 if popen is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_POPEN - -/* Define to 1 if posix_openpt is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_OPENPT - -/* Define to 1 if posix_spawn is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWN - -/* Define to 1 if posix_spawnattr_destroy is declared even after undefining - macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_DESTROY - -/* Define to 1 if posix_spawnattr_getflags is declared even after undefining - macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_GETFLAGS - -/* Define to 1 if posix_spawnattr_getpgroup is declared even after undefining - macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_GETPGROUP - -/* Define to 1 if posix_spawnattr_getschedparam is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSCHEDPARAM - -/* Define to 1 if posix_spawnattr_getschedpolicy is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSCHEDPOLICY - -/* Define to 1 if posix_spawnattr_getsigdefault is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSIGDEFAULT - -/* Define to 1 if posix_spawnattr_getsigmask is declared even after undefining - macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSIGMASK - -/* Define to 1 if posix_spawnattr_init is declared even after undefining - macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_INIT - -/* Define to 1 if posix_spawnattr_setflags is declared even after undefining - macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_SETFLAGS - -/* Define to 1 if posix_spawnattr_setpgroup is declared even after undefining - macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_SETPGROUP - -/* Define to 1 if posix_spawnattr_setschedparam is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSCHEDPARAM - -/* Define to 1 if posix_spawnattr_setschedpolicy is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSCHEDPOLICY - -/* Define to 1 if posix_spawnattr_setsigdefault is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSIGDEFAULT - -/* Define to 1 if posix_spawnattr_setsigmask is declared even after undefining - macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSIGMASK - -/* Define to 1 if posix_spawnp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWNP - -/* Define to 1 if posix_spawn_file_actions_addclose is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE - -/* Define to 1 if posix_spawn_file_actions_adddup2 is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 - -/* Define to 1 if posix_spawn_file_actions_addopen is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN - -/* Define to 1 if posix_spawn_file_actions_destroy is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_DESTROY - -/* Define to 1 if posix_spawn_file_actions_init is declared even after - undefining macros. */ -#undef HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_INIT - -/* Define to 1 if pread is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_PREAD - -/* Define to 1 if pselect is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_PSELECT - -/* Define to 1 if pthread_sigmask is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_PTHREAD_SIGMASK - -/* Define to 1 if ptsname is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_PTSNAME - -/* Define to 1 if ptsname_r is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_PTSNAME_R - -/* Define to 1 if pwrite is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_PWRITE - -/* Define to 1 if qsort_r is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_QSORT_R - -/* Define to 1 if random is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_RANDOM - -/* Define to 1 if random_r is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_RANDOM_R - -/* Define to 1 if rawmemchr is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_RAWMEMCHR - -/* Define to 1 if readlink is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_READLINK - -/* 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 - -/* Define to 1 if recv is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_RECV - -/* Define to 1 if recvfrom is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_RECVFROM - -/* Define to 1 if renameat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_RENAMEAT - -/* Define to 1 if rmdir is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_RMDIR - -/* Define to 1 if rpmatch is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_RPMATCH - -/* Define to 1 if secure_getenv is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SECURE_GETENV - -/* Define to 1 if select is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SELECT - -/* Define to 1 if send is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SEND - -/* Define to 1 if sendto is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SENDTO - -/* Define to 1 if setenv is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SETENV - -/* Define to 1 if sethostname is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SETHOSTNAME - -/* Define to 1 if setlocale is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SETLOCALE - -/* Define to 1 if setsockopt is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SETSOCKOPT - -/* Define to 1 if setstate is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SETSTATE - -/* Define to 1 if setstate_r is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SETSTATE_R - -/* Define to 1 if setusershell is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SETUSERSHELL - -/* Define to 1 if shutdown is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SHUTDOWN - -/* Define to 1 if sigaction is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SIGACTION - -/* Define to 1 if sigaddset is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SIGADDSET - -/* Define to 1 if sigdelset is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SIGDELSET - -/* Define to 1 if sigemptyset is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SIGEMPTYSET - -/* Define to 1 if sigfillset is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SIGFILLSET - -/* Define to 1 if sigismember is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SIGISMEMBER - -/* Define to 1 if sigpending is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SIGPENDING - -/* Define to 1 if sigprocmask is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SIGPROCMASK - -/* Define to 1 if sleep is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SLEEP - -/* Define to 1 if snprintf is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SNPRINTF - -/* Define to 1 if socket is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SOCKET - -/* Define to 1 if srandom is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SRANDOM - -/* Define to 1 if srandom_r is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SRANDOM_R - -/* Define to 1 if stat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STAT - -/* Define to 1 if stpcpy is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STPCPY - -/* Define to 1 if stpncpy is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STPNCPY - -/* Define to 1 if strcasecmp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRCASECMP - -/* Define to 1 if strcasestr is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRCASESTR - -/* Define to 1 if strchrnul is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRCHRNUL - -/* Define to 1 if strdup is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRDUP - -/* Define to 1 if strerror_r is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRERROR_R - -/* Define to 1 if strncasecmp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRNCASECMP - -/* Define to 1 if strncat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRNCAT - -/* Define to 1 if strndup is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRNDUP - -/* Define to 1 if strnlen is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRNLEN - -/* Define to 1 if strpbrk is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRPBRK - -/* Define to 1 if strsep is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRSEP - -/* Define to 1 if strsignal is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRSIGNAL - -/* Define to 1 if strtod is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRTOD - -/* Define to 1 if strtoimax is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRTOIMAX - -/* Define to 1 if strtok_r is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRTOK_R - -/* Define to 1 if strtoll is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRTOLL - -/* Define to 1 if strtoull is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRTOULL - -/* Define to 1 if strtoumax is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRTOUMAX - -/* Define to 1 if strverscmp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_STRVERSCMP - -/* Define to 1 if symlink is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SYMLINK - -/* Define to 1 if symlinkat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_SYMLINKAT - -/* Define to 1 if tmpfile is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_TMPFILE - -/* 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 - -/* Define to 1 if unlink is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_UNLINK - -/* Define to 1 if unlinkat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_UNLINKAT - -/* Define to 1 if unlockpt is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_UNLOCKPT - -/* Define to 1 if unsetenv is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_UNSETENV - -/* 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 - -/* Define to 1 if vdprintf is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_VDPRINTF - -/* Define to 1 if vsnprintf is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_VSNPRINTF - -/* Define to 1 if waitpid is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WAITPID - -/* Define to 1 if wcpcpy is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCPCPY - -/* Define to 1 if wcpncpy is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCPNCPY - -/* Define to 1 if wcrtomb is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCRTOMB - -/* Define to 1 if wcscasecmp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSCASECMP - -/* Define to 1 if wcscat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSCAT - -/* Define to 1 if wcschr is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSCHR - -/* Define to 1 if wcscmp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSCMP - -/* Define to 1 if wcscoll is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSCOLL - -/* Define to 1 if wcscpy is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSCPY - -/* Define to 1 if wcscspn is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSCSPN - -/* 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 - -/* Define to 1 if wcsncasecmp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSNCASECMP - -/* Define to 1 if wcsncat is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSNCAT - -/* Define to 1 if wcsncmp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSNCMP - -/* Define to 1 if wcsncpy is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSNCPY - -/* Define to 1 if wcsnlen is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSNLEN - -/* Define to 1 if wcsnrtombs is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSNRTOMBS - -/* Define to 1 if wcspbrk is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSPBRK - -/* Define to 1 if wcsrchr is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSRCHR - -/* Define to 1 if wcsrtombs is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSRTOMBS - -/* Define to 1 if wcsspn is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSSPN - -/* Define to 1 if wcsstr is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSSTR - -/* Define to 1 if wcstok is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSTOK - -/* Define to 1 if wcswidth is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSWIDTH - -/* Define to 1 if wcsxfrm is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCSXFRM - -/* Define to 1 if wctob is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCTOB - -/* Define to 1 if wctrans is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCTRANS - -/* Define to 1 if wctype is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCTYPE - -/* Define to 1 if wcwidth is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WCWIDTH - -/* Define to 1 if wmemchr is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WMEMCHR - -/* Define to 1 if wmemcmp is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WMEMCMP - -/* Define to 1 if wmemcpy is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WMEMCPY - -/* Define to 1 if wmemmove is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WMEMMOVE - -/* Define to 1 if wmemset is declared even after undefining macros. */ -#undef HAVE_RAW_DECL_WMEMSET - -/* Define to 1 if _Exit is declared even after undefining macros. */ -#undef HAVE_RAW_DECL__EXIT - /* Define to 1 if the system has the type `sa_family_t'. */ #undef HAVE_SA_FAMILY_T @@ -2110,10 +1340,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_WAIT_H -/* Define to 1 if you have the `tcgetattr' function. */ +/* Define to 1 if the system has the 'tcgetattr' function. */ #undef HAVE_TCGETATTR -/* Define to 1 if you have the `tcsetattr' function. */ +/* Define to 1 if the system has the 'tcsetattr' function. */ #undef HAVE_TCSETATTR /* Define to 1 if you have the header file. */ @@ -2218,10 +1448,6 @@ /* Define to 1 if O_NOFOLLOW works. */ #undef HAVE_WORKING_O_NOFOLLOW -/* Define if you have the posix_spawn and posix_spawnp functions and they - work. */ -#undef HAVE_WORKING_POSIX_SPAWN - /* Define if utimes works properly. */ #undef HAVE_WORKING_UTIMES @@ -2253,9 +1479,18 @@ #endif +/* Define to 1 if you have the `__fpurge' function. */ +#undef HAVE___FPURGE + +/* Define to 1 if you have the `__freading' function. */ +#undef HAVE___FREADING + /* Define to 1 if you have the `__fsetlocking' function. */ #undef HAVE___FSETLOCKING +/* Define to 1 if the compiler supports the keyword '__inline'. */ +#undef HAVE___INLINE + /* Define to 1 if you have the `__secure_getenv' function. */ #undef HAVE___SECURE_GETENV @@ -2359,12 +1594,24 @@ /* Define if nl_langinfo exists but is overridden by gnulib. */ #undef REPLACE_NL_LANGINFO +/* Define if gnulib uses its own posix_spawn and posix_spawnp functions. */ +#undef REPLACE_POSIX_SPAWN + /* Define to 1 if strerror(0) does not return a message implying success. */ #undef REPLACE_STRERROR_0 /* Define if vasnprintf exists but is overridden by gnulib. */ #undef REPLACE_VASNPRINTF +/* File name of the Bourne shell. */ +#if defined __CYGWIN__ +/* Omit the directory part because for 32-bit Cygwin programs in a + 64-bit Cygwin environment, the Cygwin mounts are not visible. */ +# define BOURNE_SHELL "sh" +#else +# define BOURNE_SHELL "/bin/sh" +#endif + /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'sig_atomic_t'. */ #undef SIG_ATOMIC_T_SUFFIX @@ -2428,6 +1675,9 @@ an underscore or empty. */ #undef USER_LABEL_PREFIX +/* Define to 1 if you want to use the Linux kernel cryptographic API. */ +#undef USE_LINUX_CRYPTO_API + /* Define if the POSIX multithreading library can be used. */ #undef USE_POSIX_THREADS @@ -2511,6 +1761,11 @@ #ifndef _XOPEN_SOURCE # undef _XOPEN_SOURCE #endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif /* Enable general extensions on Solaris. */ #ifndef __EXTENSIONS__ # undef __EXTENSIONS__ @@ -2577,12 +1832,15 @@ #undef _NETBSD_SOURCE /* The _Noreturn keyword of C11. */ -#if ! (defined _Noreturn \ - || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) -# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ - || 0x5110 <= __SUNPRO_C) +#ifndef _Noreturn +# if 201103 <= (defined __cplusplus ? __cplusplus : 0) +# define _Noreturn [[noreturn]] +# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ + || 4 < __GNUC__ + (7 <= __GNUC_MINOR__)) + /* _Noreturn works as-is. */ +# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C # define _Noreturn __attribute__ ((__noreturn__)) -# elif defined _MSC_VER && 1200 <= _MSC_VER +# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) # define _Noreturn __declspec (noreturn) # else # define _Noreturn @@ -2641,7 +1899,8 @@ if isdigit is mistakenly implemented via a static inline function, a program containing an extern inline function that calls isdigit may not work since the C standard prohibits extern inline functions - from calling static functions. This bug is known to occur on: + from calling static functions (ISO C 99 section 6.7.4.(3). + This bug is known to occur on: OS X 10.8 and earlier; see: https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html @@ -2654,7 +1913,18 @@ OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and for clang but remains for g++; see . - Assume DragonFly and FreeBSD will be similar. */ + Assume DragonFly and FreeBSD will be similar. + + GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 + inline semantics, unless -fgnu89-inline is used. It defines a macro + __GNUC_STDC_INLINE__ to indicate this situation or a macro + __GNUC_GNU_INLINE__ to indicate the opposite situation. + GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline + semantics but warns, unless -fgnu89-inline is used: + warning: C99 inline functions are not supported; using GNU89 + warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute + It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. + */ #if (((defined __APPLE__ && defined __MACH__) \ || defined __DragonFly__ || defined __FreeBSD__) \ && (defined __header_inline \ @@ -2716,12 +1986,6 @@ # define _GL_INLINE_HEADER_END #endif -/* Define to a replacement function name for fnmatch(). */ -#undef fnmatch - -/* Define to a replacement function name for getpass(). */ -#undef getpass - /* Define to `int' if doesn't define. */ #undef gid_t @@ -2874,6 +2138,13 @@ # define _GL_ATTRIBUTE_CONST /* empty */ #endif +/* The __malloc__ attribute was added in gcc 3. */ +#if 3 <= __GNUC__ +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +#else +# define _GL_ATTRIBUTE_MALLOC /* empty */ +#endif + /* Define to empty if the keyword `volatile' does not work. Warning: valid code using `volatile' can become incorrect without. Disable with care. */ diff -Nru wget-1.19.5/src/convert.c wget-1.20.1/src/convert.c --- wget-1.19.5/src/convert.c 2018-01-19 21:18:23.000000000 +0000 +++ wget-1.20.1/src/convert.c 2018-12-26 19:58:39.000000000 +0000 @@ -303,7 +303,7 @@ { case CO_CONVERT_TO_RELATIVE: /* Convert absolute URL to relative. */ - { + if (link->local_name) { char *newname = construct_relative (file, link->local_name); char *quoted_newname = local_quote_string (newname, link->link_css_p); @@ -322,8 +322,8 @@ xfree (newname); xfree (quoted_newname); ++to_file_count; - break; } + break; case CO_CONVERT_BASENAME_ONLY: { char *newname = convert_basename (p, link); diff -Nru wget-1.19.5/src/ftp.c wget-1.20.1/src/ftp.c --- wget-1.19.5/src/ftp.c 2018-05-05 20:46:22.000000000 +0000 +++ wget-1.20.1/src/ftp.c 2018-12-26 19:58:39.000000000 +0000 @@ -1580,7 +1580,7 @@ #ifdef ENABLE_XATTR if (opt.enable_xattr) - set_file_metadata (u->url, NULL, fp); + set_file_metadata (u, NULL, fp); #endif fd_close (local_sock); @@ -1806,7 +1806,7 @@ exit_error: /* If fp is a regular file, close and try to remove it */ - if (fp && !output_stream) + if (fp && (!output_stream || con->cmd & DO_LIST)) fclose (fp); return err; } @@ -2578,96 +2578,98 @@ res = ftp_get_listing (u, original_url, con, &start); if (res != RETROK) return res; - /* First: weed out that do not conform the global rules given in - opt.accepts and opt.rejects. */ - if (opt.accepts || opt.rejects) - { - f = start; - while (f) - { - if (f->type != FT_DIRECTORY && !acceptable (f->name)) - { - logprintf (LOG_VERBOSE, _("Rejecting %s.\n"), - quote (f->name)); - f = delelement (f, &start); - } - else - f = f->next; - } - } - /* Remove all files with possible harmful names or invalid entries. */ + + // Set the function used for glob matching. + int (*matcher) (const char *, const char *, int) + = opt.ignore_case ? fnmatch_nocase : fnmatch; + + // Set the function used to compare strings +#ifdef __VMS + /* 2009-09-09 SMS. + * Odd-ball compiler ("HP C V7.3-009 on OpenVMS Alpha V7.3-2") + * bug causes spurious %CC-E-BADCONDIT complaint with this + * "?:" statement. (Different linkage attributes for strcmp() + * and strcasecmp().) Converting to "if" changes the + * complaint to %CC-W-PTRMISMATCH on "cmp = strcmp;". Adding + * the senseless type cast clears the complaint, and looks + * harmless. + */ + int (*cmp) (const char *, const char *) + = opt.ignore_case ? strcasecmp : (int (*)())strcmp; +#else /* def __VMS */ + int (*cmp) (const char *, const char *) + = opt.ignore_case ? strcasecmp : strcmp; +#endif /* def __VMS [else] */ + f = start; while (f) { - if (has_insecure_name_p (f->name) || is_invalid_entry (f)) + + // Weed out files that do not confirm to the global rules given in + // opt.accepts and opt.rejects + if ((opt.accepts || opt.rejects) && + f->type != FT_DIRECTORY && !acceptable (f->name)) { logprintf (LOG_VERBOSE, _("Rejecting %s.\n"), quote (f->name)); f = delelement (f, &start); + continue; } - else - f = f->next; - } - /* Now weed out the files that do not match our globbing pattern. - If we are dealing with a globbing pattern, that is. */ - if (*u->file) - { - if (action == GLOB_GLOBALL) + + + // Identify and eliminate possibly harmful names or invalid entries. + if (has_insecure_name_p (f->name) || is_invalid_entry (f)) { - int (*matcher) (const char *, const char *, int) - = opt.ignore_case ? fnmatch_nocase : fnmatch; - int matchres = 0; + logprintf (LOG_VERBOSE, _("Rejecting %s (Invalid Entry).\n"), + quote (f->name)); + f = delelement (f, &start); + continue; + } + + if (!accept_url (f->name)) + { + logprintf (LOG_VERBOSE, _("%s is excluded/not-included through regex.\n"), f->name); + f = delelement (f, &start); + continue; + } - f = start; - while (f) + /* Now weed out the files that do not match our globbing pattern. + If we are dealing with a globbing pattern, that is. */ + if (*u->file) + { + if (action == GLOB_GLOBALL) { - matchres = matcher (u->file, f->name, 0); + int matchres = matcher (u->file, f->name, 0); if (matchres == -1) { logprintf (LOG_NOTQUIET, _("Error matching %s against %s: %s\n"), u->file, quotearg_style (escape_quoting_style, f->name), strerror (errno)); - break; + freefileinfo (start); + return RETRBADPATTERN; } if (matchres == FNM_NOMATCH) - f = delelement (f, &start); /* delete the element from the list */ - else - f = f->next; /* leave the element in the list */ - } - if (matchres == -1) - { - freefileinfo (start); - return RETRBADPATTERN; + { + f = delelement (f, &start); /* delete the element from the list */ + continue; + } } - } - else if (action == GLOB_GETONE) - { -#ifdef __VMS - /* 2009-09-09 SMS. - * Odd-ball compiler ("HP C V7.3-009 on OpenVMS Alpha V7.3-2") - * bug causes spurious %CC-E-BADCONDIT complaint with this - * "?:" statement. (Different linkage attributes for strcmp() - * and strcasecmp().) Converting to "if" changes the - * complaint to %CC-W-PTRMISMATCH on "cmp = strcmp;". Adding - * the senseless type cast clears the complaint, and looks - * harmless. - */ - int (*cmp) (const char *, const char *) - = opt.ignore_case ? strcasecmp : (int (*)())strcmp; -#else /* def __VMS */ - int (*cmp) (const char *, const char *) - = opt.ignore_case ? strcasecmp : strcmp; -#endif /* def __VMS [else] */ - f = start; - while (f) + else if (action == GLOB_GETONE) { if (0 != cmp(u->file, f->name)) - f = delelement (f, &start); - else - f = f->next; + { + f = delelement (f, &start); + continue; + } } } + f = f->next; } + + /* + * Now that preprocessing of the file listing is over, let's try to download + * all the remaining files in our listing. + */ if (start) { /* Just get everything. */ diff -Nru wget-1.19.5/src/gnutls.c wget-1.20.1/src/gnutls.c --- wget-1.19.5/src/gnutls.c 2018-05-05 20:49:06.000000000 +0000 +++ wget-1.20.1/src/gnutls.c 2018-12-26 19:58:39.000000000 +0000 @@ -60,6 +60,11 @@ static int _do_handshake (gnutls_session_t session, int fd, double timeout); +#if GNUTLS_VERSION_NUMBER >= 0x030604 +static int +_do_reauth (gnutls_session_t session, int fd, double timeout); +#endif + static int key_type_to_gnutls_type (enum keyfile_type type) { @@ -287,6 +292,14 @@ if ((ret = _do_handshake (ctx->session, fd, timeout)) == 0) ret = GNUTLS_E_AGAIN; /* restart reading */ } +#if GNUTLS_VERSION_NUMBER >= 0x030604 + if (!timed_out && ret == GNUTLS_E_REAUTH_REQUEST) + { + DEBUGP (("GnuTLS: *** re-authentication while reading\n")); + if ((ret = _do_reauth (ctx->session, fd, timeout)) == 0) + ret = GNUTLS_E_AGAIN; /* restart reading */ + } +#endif } } while (ret == GNUTLS_E_INTERRUPTED || (ret == GNUTLS_E_AGAIN && !timed_out)); @@ -519,6 +532,84 @@ return err; } +#if GNUTLS_VERSION_NUMBER >= 0x030604 +static int +_do_reauth (gnutls_session_t session, int fd, double timeout) +{ +#ifdef F_GETFL + int flags = 0; +#endif + int err; + + if (timeout) + { +#ifdef F_GETFL + flags = fcntl (fd, F_GETFL, 0); + if (flags < 0) + return flags; + if (fcntl (fd, F_SETFL, flags | O_NONBLOCK)) + return -1; +#else + /* XXX: Assume it was blocking before. */ + const int one = 1; + if (ioctl (fd, FIONBIO, &one) < 0) + return -1; +#endif + } + + /* We don't stop the handshake process for non-fatal errors */ + do + { + err = gnutls_reauth (session, 0); + + if (timeout && err == GNUTLS_E_AGAIN) + { + if (gnutls_record_get_direction (session)) + { + /* wait for writeability */ + err = select_fd (fd, timeout, WAIT_FOR_WRITE); + } + else + { + /* wait for readability */ + err = select_fd (fd, timeout, WAIT_FOR_READ); + } + + if (err <= 0) + { + if (err == 0) + { + errno = ETIMEDOUT; + err = -1; + } + break; + } + + err = GNUTLS_E_AGAIN; + } + else if (err < 0) + { + logprintf (LOG_NOTQUIET, "GnuTLS: %s\n", gnutls_strerror (err)); + } + } + while (err && gnutls_error_is_fatal (err) == 0); + + if (timeout) + { +#ifdef F_GETFL + if (fcntl (fd, F_SETFL, flags) < 0) + return -1; +#else + const int zero = 0; + if (ioctl (fd, FIONBIO, &zero) < 0) + return -1; +#endif + } + + return err; +} +#endif + static const char * _sni_hostname(const char *hostname) { @@ -565,6 +656,15 @@ err = gnutls_priority_set_direct (session, "NORMAL:-VERS-SSL3.0:-VERS-TLS1.0:-VERS-TLS1.1", NULL); break; + case secure_protocol_tlsv1_3: +#if GNUTLS_VERSION_NUMBER >= 0x030603 + err = gnutls_priority_set_direct (session, "NORMAL:-VERS-SSL3.0:+VERS-TLS1.3:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-TLS1.2", NULL); + break; +#else + logprintf (LOG_NOTQUIET, _("Your GnuTLS version is too old to support TLS 1.3\n")); + return -1; +#endif + case secure_protocol_pfs: err = gnutls_priority_set_direct (session, "PFS:-VERS-SSL3.0", NULL); if (err != GNUTLS_E_SUCCESS) @@ -596,19 +696,38 @@ allowed_protocols[0] = GNUTLS_TLS1_0; allowed_protocols[1] = GNUTLS_TLS1_1; allowed_protocols[2] = GNUTLS_TLS1_2; +#if GNUTLS_VERSION_NUMBER >= 0x030603 + allowed_protocols[3] = GNUTLS_TLS1_3; +#endif err = gnutls_protocol_set_priority (session, allowed_protocols); break; case secure_protocol_tlsv1_1: allowed_protocols[0] = GNUTLS_TLS1_1; allowed_protocols[1] = GNUTLS_TLS1_2; +#if GNUTLS_VERSION_NUMBER >= 0x030603 + allowed_protocols[2] = GNUTLS_TLS1_3; +#endif err = gnutls_protocol_set_priority (session, allowed_protocols); break; case secure_protocol_tlsv1_2: allowed_protocols[0] = GNUTLS_TLS1_2; +#if GNUTLS_VERSION_NUMBER >= 0x030603 + allowed_protocols[1] = GNUTLS_TLS1_3; +#endif + err = gnutls_protocol_set_priority (session, allowed_protocols); + break; + + case secure_protocol_tlsv1_3: +#if GNUTLS_VERSION_NUMBER >= 0x030603 + allowed_protocols[0] = GNUTLS_TLS1_3; err = gnutls_protocol_set_priority (session, allowed_protocols); break; +#else + logprintf (LOG_NOTQUIET, _("Your GnuTLS version is too old to support TLS 1.3\n")); + return -1; +#endif default: logprintf (LOG_NOTQUIET, _("GnuTLS: unimplemented 'secure-protocol' option value %d\n"), opt.secure_protocol); @@ -627,7 +746,12 @@ gnutls_session_t session; int err; +#if GNUTLS_VERSION_NUMBER >= 0x030604 + // enable support of TLS1.3 post-handshake authentication + gnutls_init (&session, GNUTLS_CLIENT | GNUTLS_POST_HANDSHAKE_AUTH); +#else gnutls_init (&session, GNUTLS_CLIENT); +#endif /* We set the server name but only if it's not an IP address. */ if (! is_valid_ip_address (hostname)) @@ -805,7 +929,7 @@ } _CHECK_CERT (GNUTLS_CERT_INVALID, _("%s: The certificate of %s is not trusted.\n")); - _CHECK_CERT (GNUTLS_CERT_SIGNER_NOT_FOUND, _("%s: The certificate of %s hasn't got a known issuer.\n")); + _CHECK_CERT (GNUTLS_CERT_SIGNER_NOT_FOUND, _("%s: The certificate of %s doesn't have a known issuer.\n")); _CHECK_CERT (GNUTLS_CERT_REVOKED, _("%s: The certificate of %s has been revoked.\n")); _CHECK_CERT (GNUTLS_CERT_SIGNER_NOT_CA, _("%s: The certificate signer of %s was not a CA.\n")); _CHECK_CERT (GNUTLS_CERT_INSECURE_ALGORITHM, _("%s: The certificate of %s was signed using an insecure algorithm.\n")); diff -Nru wget-1.19.5/src/hash.c wget-1.20.1/src/hash.c --- wget-1.19.5/src/hash.c 2018-01-19 21:18:23.000000000 +0000 +++ wget-1.20.1/src/hash.c 2018-12-26 19:58:39.000000000 +0000 @@ -634,6 +634,9 @@ this one seems to perform much better, both by being faster and by generating less collisions. */ +#ifdef __clang__ +__attribute__((no_sanitize("integer"))) +#endif static unsigned long hash_string (const void *key) { @@ -672,6 +675,9 @@ /* Like hash_string, but produce the same hash regardless of the case. */ +#ifdef __clang__ +__attribute__((no_sanitize("integer"))) +#endif static unsigned long hash_string_nocase (const void *key) { @@ -710,6 +716,9 @@ Knuth's multiplication hash, this function doesn't need to know the hash table size to work. */ +#ifdef __clang__ +__attribute__((no_sanitize("integer"))) +#endif unsigned long hash_pointer (const void *ptr) { diff -Nru wget-1.19.5/src/host.c wget-1.20.1/src/host.c --- wget-1.19.5/src/host.c 2018-05-05 20:46:22.000000000 +0000 +++ wget-1.20.1/src/host.c 2018-12-26 19:58:39.000000000 +0000 @@ -732,7 +732,7 @@ ares_process (channel, &read_fds, &write_fds); } if (timer) - timer = ptimer_destroy (timer); + ptimer_destroy (timer); } static void @@ -1033,8 +1033,9 @@ /* Domain or subdomain match * k == -1: exact match * k >= 0 && what[k] == '.': subdomain match + * k >= 0 && list[i][0] == '.': dot-prefixed subdomain match */ - if (j == -1 && (k == -1 || what[k] == '.')) + if (j == -1 && (k == -1 || what[k] == '.' || list[i][0] == '.')) return true; } diff -Nru wget-1.19.5/src/hsts.c wget-1.20.1/src/hsts.c --- wget-1.19.5/src/hsts.c 2018-05-05 20:46:22.000000000 +0000 +++ wget-1.20.1/src/hsts.c 2018-12-26 19:58:39.000000000 +0000 @@ -654,11 +654,13 @@ static void close_hsts_test_store (hsts_store_t store) { - char *filename = NULL; + char *filename; - filename = get_hsts_store_filename (); - unlink (filename); - xfree (filename); + if ((filename = get_hsts_store_filename ())) + { + unlink (filename); + xfree (filename); + } xfree (store); } diff -Nru wget-1.19.5/src/hsts.h wget-1.20.1/src/hsts.h --- wget-1.19.5/src/hsts.h 2018-01-19 21:18:23.000000000 +0000 +++ wget-1.20.1/src/hsts.h 2018-12-26 19:58:39.000000000 +0000 @@ -26,13 +26,13 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#include "wget.h" -#ifdef HAVE_HSTS +#ifndef WGET_HSTS_H +#define WGET_HSTS_H -#ifndef HSTS_H -#define HSTS_H +#ifdef HAVE_HSTS +#include "wget.h" #include "url.h" typedef struct hsts_store *hsts_store_t; @@ -48,5 +48,5 @@ time_t, bool); bool hsts_match (hsts_store_t, struct url *); -#endif /* HSTS_H */ #endif /* HAVE_HSTS */ +#endif /* WGET_HSTS_H */ diff -Nru wget-1.19.5/src/http.c wget-1.20.1/src/http.c --- wget-1.19.5/src/http.c 2018-05-06 16:22:11.000000000 +0000 +++ wget-1.20.1/src/http.c 2018-12-26 19:58:39.000000000 +0000 @@ -648,10 +648,13 @@ { char *end = strchr (hdr, '\n'); - if (end) - hdr = end + 1; - else - hdr += strlen (hdr); + if (!end) + { + hdr += strlen (hdr); + break; + } + + hdr = end + 1; if (*hdr != ' ' && *hdr != '\t') break; @@ -2451,6 +2454,8 @@ auth_stat); auth_err = *auth_stat; + xfree (auth_stat); + xfree (pth); if (auth_err == RETROK) { request_set_header (req, "Authorization", value, rel_value); @@ -2464,8 +2469,6 @@ register_basic_auth_host (u->host); } - xfree (pth); - xfree (auth_stat); *retry = true; goto cleanup; } @@ -3963,16 +3966,6 @@ } if (statcode == HTTP_STATUS_RANGE_NOT_SATISFIABLE - && hs->restval < (contlen + contrange)) - { - /* The file was not completely downloaded, - yet the server claims the range is invalid. - Bail out. */ - CLOSE_INVALIDATE (sock); - retval = RANGEERR; - goto cleanup; - } - if (statcode == HTTP_STATUS_RANGE_NOT_SATISFIABLE || (!opt.timestamping && hs->restval > 0 && statcode == HTTP_STATUS_OK && contrange == 0 && contlen >= 0 && hs->restval >= contlen)) { @@ -4120,9 +4113,9 @@ if (opt.enable_xattr) { if (original_url != u) - set_file_metadata (u->url, original_url->url, fp); + set_file_metadata (u, original_url, fp); else - set_file_metadata (u->url, NULL, fp); + set_file_metadata (u, NULL, fp); } #endif @@ -4386,7 +4379,20 @@ logputs (LOG_VERBOSE, "\n"); logprintf (LOG_NOTQUIET, _("Cannot write to %s (%s).\n"), quote (hstat.local_file), strerror (errno)); - case HOSTERR: case CONIMPOSSIBLE: case PROXERR: case SSLINITFAILED: + ret = err; + goto exit; + case HOSTERR: + /* Fatal unless option set otherwise. */ + if ( opt.retry_on_host_error ) + { + printwhat (count, opt.ntry); + xfree (hstat.message); + xfree (hstat.error); + continue; + } + ret = err; + goto exit; + case CONIMPOSSIBLE: case PROXERR: case SSLINITFAILED: case CONTNOTSUPPORTED: case VERIFCERTERR: case FILEBADFILE: case UNKNOWNATTR: /* Fatal errors just return from the function. */ @@ -4492,6 +4498,7 @@ && (hstat.statcode == 500 || hstat.statcode == 501)) { got_head = true; + xfree (hurl); continue; } /* Maybe we should always keep track of broken links, not just in @@ -4510,6 +4517,7 @@ else if (check_retry_on_http_error (hstat.statcode)) { printwhat (count, opt.ntry); + xfree (hurl); continue; } else diff -Nru wget-1.19.5/src/init.c wget-1.20.1/src/init.c --- wget-1.19.5/src/init.c 2018-05-06 10:36:29.000000000 +0000 +++ wget-1.20.1/src/init.c 2018-12-26 19:58:39.000000000 +0000 @@ -47,9 +47,6 @@ #endif #include -#ifdef HAVE_LIBPCRE -# include -#endif #ifdef HAVE_PWD_H # include @@ -313,6 +310,7 @@ { "restrictfilenames", NULL, cmd_spec_restrict_file_names }, { "retrsymlinks", &opt.retr_symlinks, cmd_boolean }, { "retryconnrefused", &opt.retry_connrefused, cmd_boolean }, + { "retryonhosterror", &opt.retry_on_host_error, cmd_boolean }, { "retryonhttperror", &opt.retry_on_http_error, cmd_string }, { "robots", &opt.use_robots, cmd_boolean }, { "savecookies", &opt.cookies_output, cmd_file }, @@ -509,11 +507,7 @@ opt.hsts = true; #endif -#ifdef ENABLE_XATTR - opt.enable_xattr = true; -#else opt.enable_xattr = false; -#endif } /* Return the user's home directory (strdup-ed), or NULL if none is @@ -639,7 +633,7 @@ SYSTEM_WGETRC should not be defined under WINDOWS. */ if (!file) { - char *home = ws_mypath (); + const char *home = ws_mypath (); if (home) { file = aprintf ("%s/wget.ini", home); @@ -647,7 +641,6 @@ { xfree (file); } - xfree (home); } } #endif /* WINDOWS */ @@ -887,8 +880,10 @@ #if defined(WINDOWS) || defined(MSDOS) # define ISSEP(c) ((c) == '/' || (c) == '\\') +# define SEPSTRING "/\\" #else # define ISSEP(c) ((c) == '/') +# define SEPSTRING "/" #endif /* Run commands[comind].action. */ @@ -929,8 +924,7 @@ xfree (*pstring); /* Skip the leading "~/". */ - for (++val; ISSEP (*val); val++) - ; + val += strspn(val + 1, SEPSTRING) + 1; *pstring = concat_strings (home, "/", val, (char *)0); xfree (home); } @@ -1635,7 +1629,7 @@ { static const struct decode_item choices[] = { { "posix", regex_type_posix }, -#ifdef HAVE_LIBPCRE +#if defined HAVE_LIBPCRE || defined HAVE_LIBPCRE2 { "pcre", regex_type_pcre }, #endif }; diff -Nru wget-1.19.5/src/log.c wget-1.20.1/src/log.c --- wget-1.19.5/src/log.c 2018-05-05 20:46:22.000000000 +0000 +++ wget-1.20.1/src/log.c 2018-12-26 19:58:39.000000000 +0000 @@ -974,7 +974,7 @@ { pid_t foreground_pgrp = tcgetpgrp (STDIN_FILENO); - if (foreground_pgrp != -1 && foreground_pgrp != getpgrp ()) + if (foreground_pgrp != -1 && foreground_pgrp != getpgrp () && !opt.quiet) { /* Process backgrounded */ redirect_output (true,NULL); diff -Nru wget-1.19.5/src/main.c wget-1.20.1/src/main.c --- wget-1.19.5/src/main.c 2018-05-05 20:49:06.000000000 +0000 +++ wget-1.20.1/src/main.c 2018-12-26 19:58:39.000000000 +0000 @@ -420,6 +420,7 @@ { "restrict-file-names", 0, OPT_BOOLEAN, "restrictfilenames", -1 }, { "retr-symlinks", 0, OPT_BOOLEAN, "retrsymlinks", -1 }, { "retry-connrefused", 0, OPT_BOOLEAN, "retryconnrefused", -1 }, + { "retry-on-host-error", 0, OPT_BOOLEAN, "retryonhosterror", -1 }, { "retry-on-http-error", 0, OPT_VALUE, "retryonhttperror", -1 }, { "save-cookies", 0, OPT_VALUE, "savecookies", -1 }, { "save-headers", 0, OPT_BOOLEAN, "saveheaders", -1 }, @@ -754,7 +755,7 @@ #endif #ifdef ENABLE_XATTR N_("\ - --no-xattr turn off storage of metadata in extended file attributes\n"), + --xattr turn on storage of metadata in extended file attributes\n"), #endif "\n", @@ -994,7 +995,7 @@ --accept-regex=REGEX regex matching accepted URLs\n"), N_("\ --reject-regex=REGEX regex matching rejected URLs\n"), -#ifdef HAVE_LIBPCRE +#if defined HAVE_LIBPCRE || defined HAVE_LIBPCRE2 N_("\ --regex-type=TYPE regex type (posix|pcre)\n"), #else @@ -1263,7 +1264,7 @@ { if (printf ("%s ", compiled_features[i]) < 0) exit (WGET_EXIT_IO_FAIL); - line_length -= strlen (compiled_features[i]) + 2; + line_length -= (int) strlen (compiled_features[i]) + 2; i++; } if (printf ("\n") < 0) @@ -1783,6 +1784,12 @@ /* Compile the regular expressions. */ switch (opt.regex_type) { +#ifdef HAVE_LIBPCRE2 + case regex_type_pcre: + opt.regex_compile_fun = compile_pcre2_regex; + opt.regex_match_fun = match_pcre2_regex; + break; +#endif #ifdef HAVE_LIBPCRE case regex_type_pcre: opt.regex_compile_fun = compile_pcre_regex; diff -Nru wget-1.19.5/src/Makefile.in wget-1.20.1/src/Makefile.in --- wget-1.19.5/src/Makefile.in 2018-05-06 16:47:51.000000000 +0000 +++ wget-1.20.1/src/Makefile.in 2018-12-26 20:09:02.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -104,6 +104,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -122,12 +123,13 @@ subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/arpa_inet_h.m4 \ + $(top_srcdir)/m4/__inline.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/af_alg.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 $(top_srcdir)/m4/base32.m4 \ $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ - $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \ + $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/clock_time.m4 \ + $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ @@ -136,9 +138,11 @@ $(top_srcdir)/m4/extern-inline.m4 \ $(top_srcdir)/m4/fatal-signal.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ - $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \ - $(top_srcdir)/m4/flock.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fseek.m4 \ + $(top_srcdir)/m4/fflush.m4 $(top_srcdir)/m4/flexmember.m4 \ + $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/flock.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fnmatch_h.m4 \ + $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fpurge.m4 \ + $(top_srcdir)/m4/freading.m4 $(top_srcdir)/m4/fseek.m4 \ $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/fstat.m4 \ $(top_srcdir)/m4/ftell.m4 $(top_srcdir)/m4/ftello.m4 \ $(top_srcdir)/m4/futimens.m4 $(top_srcdir)/m4/getaddrinfo.m4 \ @@ -151,7 +155,6 @@ $(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/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 \ @@ -196,29 +199,29 @@ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/sched_h.m4 \ $(top_srcdir)/m4/secure_getenv.m4 $(top_srcdir)/m4/select.m4 \ - $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sha1.m4 \ - $(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \ - $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sh-filename.m4 \ + $(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sha256.m4 \ + $(top_srcdir)/m4/sha512.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sigpipe.m4 \ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/snprintf.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/spawn-pipe.m4 $(top_srcdir)/m4/spawn_h.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \ - $(top_srcdir)/m4/strptime.m4 $(top_srcdir)/m4/strtok_r.m4 \ - $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_file_h.m4 \ - $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/std-gnu11.m4 \ + $(top_srcdir)/m4/stdalign.m4 $(top_srcdir)/m4/stdbool.m4 \ + $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strptime.m4 \ + $(top_srcdir)/m4/strtok_r.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_file_h.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ @@ -248,6 +251,8 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +PROGRAMS = $(bin_PROGRAMS) AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) am__v_AR_0 = @echo " AR " $@; @@ -293,8 +298,6 @@ nodist_libunittest_a_OBJECTS = libunittest_a-version.$(OBJEXT) libunittest_a_OBJECTS = $(am_libunittest_a_OBJECTS) \ $(nodist_libunittest_a_OBJECTS) -am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) am__wget_SOURCES_DIST = connect.c convert.c cookies.c ftp.c css_.c \ css-url.c ftp-basic.c ftp-ls.c hash.c host.c hsts.c \ html-parse.c html-url.c http.c init.c log.c main.c netrc.c \ @@ -346,7 +349,57 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = $(DEPDIR)/ftp-opie.Po $(DEPDIR)/gnutls.Po \ + $(DEPDIR)/http-ntlm.Po $(DEPDIR)/mswindows.Po \ + $(DEPDIR)/openssl.Po ./$(DEPDIR)/build_info.Po \ + ./$(DEPDIR)/connect.Po ./$(DEPDIR)/convert.Po \ + ./$(DEPDIR)/cookies.Po ./$(DEPDIR)/css-url.Po \ + ./$(DEPDIR)/css_.Po ./$(DEPDIR)/exits.Po \ + ./$(DEPDIR)/ftp-basic.Po ./$(DEPDIR)/ftp-ls.Po \ + ./$(DEPDIR)/ftp.Po ./$(DEPDIR)/hash.Po ./$(DEPDIR)/host.Po \ + ./$(DEPDIR)/hsts.Po ./$(DEPDIR)/html-parse.Po \ + ./$(DEPDIR)/html-url.Po ./$(DEPDIR)/http.Po \ + ./$(DEPDIR)/init.Po ./$(DEPDIR)/iri.Po \ + ./$(DEPDIR)/libunittest_a-build_info.Po \ + ./$(DEPDIR)/libunittest_a-connect.Po \ + ./$(DEPDIR)/libunittest_a-convert.Po \ + ./$(DEPDIR)/libunittest_a-cookies.Po \ + ./$(DEPDIR)/libunittest_a-css-url.Po \ + ./$(DEPDIR)/libunittest_a-css_.Po \ + ./$(DEPDIR)/libunittest_a-exits.Po \ + ./$(DEPDIR)/libunittest_a-ftp-basic.Po \ + ./$(DEPDIR)/libunittest_a-ftp-ls.Po \ + ./$(DEPDIR)/libunittest_a-ftp.Po \ + ./$(DEPDIR)/libunittest_a-hash.Po \ + ./$(DEPDIR)/libunittest_a-host.Po \ + ./$(DEPDIR)/libunittest_a-hsts.Po \ + ./$(DEPDIR)/libunittest_a-html-parse.Po \ + ./$(DEPDIR)/libunittest_a-html-url.Po \ + ./$(DEPDIR)/libunittest_a-http.Po \ + ./$(DEPDIR)/libunittest_a-init.Po \ + ./$(DEPDIR)/libunittest_a-iri.Po \ + ./$(DEPDIR)/libunittest_a-log.Po \ + ./$(DEPDIR)/libunittest_a-main.Po \ + ./$(DEPDIR)/libunittest_a-metalink.Po \ + ./$(DEPDIR)/libunittest_a-netrc.Po \ + ./$(DEPDIR)/libunittest_a-progress.Po \ + ./$(DEPDIR)/libunittest_a-ptimer.Po \ + ./$(DEPDIR)/libunittest_a-recur.Po \ + ./$(DEPDIR)/libunittest_a-res.Po \ + ./$(DEPDIR)/libunittest_a-retr.Po \ + ./$(DEPDIR)/libunittest_a-spider.Po \ + ./$(DEPDIR)/libunittest_a-url.Po \ + ./$(DEPDIR)/libunittest_a-utils.Po \ + ./$(DEPDIR)/libunittest_a-version.Po \ + ./$(DEPDIR)/libunittest_a-warc.Po \ + ./$(DEPDIR)/libunittest_a-xattr.Po ./$(DEPDIR)/log.Po \ + ./$(DEPDIR)/main.Po ./$(DEPDIR)/metalink.Po \ + ./$(DEPDIR)/netrc.Po ./$(DEPDIR)/progress.Po \ + ./$(DEPDIR)/ptimer.Po ./$(DEPDIR)/recur.Po ./$(DEPDIR)/res.Po \ + ./$(DEPDIR)/retr.Po ./$(DEPDIR)/spider.Po ./$(DEPDIR)/url.Po \ + ./$(DEPDIR)/utils.Po ./$(DEPDIR)/version.Po \ + ./$(DEPDIR)/warc.Po ./$(DEPDIR)/xattr.Po am__mv = mv -f AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -397,7 +450,6 @@ $(top_srcdir)/build-aux/depcomp ftp-opie.c gnutls.c \ http-ntlm.c mswindows.c openssl.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ @@ -416,6 +468,7 @@ BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +BYTESWAP_H = @BYTESWAP_H@ CARES_CFLAGS = @CARES_CFLAGS@ CARES_LIBS = @CARES_LIBS@ CC = @CC@ @@ -486,6 +539,7 @@ GNULIB_FGETC = @GNULIB_FGETC@ GNULIB_FGETS = @GNULIB_FGETS@ GNULIB_FLOCK = @GNULIB_FLOCK@ +GNULIB_FNMATCH = @GNULIB_FNMATCH@ GNULIB_FOPEN = @GNULIB_FOPEN@ GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ @@ -519,6 +573,7 @@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ +GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ @@ -543,6 +598,7 @@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALENAME = @GNULIB_LOCALENAME@ GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ @@ -613,6 +669,7 @@ GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT@ GNULIB_POSIX_SPAWNATTR_SETSIGMASK = @GNULIB_POSIX_SPAWNATTR_SETSIGMASK@ GNULIB_POSIX_SPAWNP = @GNULIB_POSIX_SPAWNP@ +GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -815,6 +872,7 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ @@ -837,6 +895,9 @@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FLOCK = @HAVE_FLOCK@ +HAVE_FNMATCH = @HAVE_FNMATCH@ +HAVE_FNMATCH_H = @HAVE_FNMATCH_H@ +HAVE_FREELOCALE = @HAVE_FREELOCALE@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ @@ -849,13 +910,16 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ +HAVE_GETPASS = @HAVE_GETPASS@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@ HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ @@ -893,6 +957,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NETDB_H = @HAVE_NETDB_H@ HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ +HAVE_NEWLOCALE = @HAVE_NEWLOCALE@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ @@ -904,6 +969,7 @@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@ HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@ +HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PSELECT = @HAVE_PSELECT@ @@ -974,7 +1040,6 @@ 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@ @@ -1032,8 +1097,6 @@ 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@ @@ -1068,7 +1131,6 @@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1113,6 +1175,7 @@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ +NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1147,6 +1210,7 @@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ +NEXT_FNMATCH_H = @NEXT_FNMATCH_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1189,6 +1253,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCRE2_CFLAGS = @PCRE2_CFLAGS@ +PCRE2_LIBS = @PCRE2_LIBS@ PCRE_CFLAGS = @PCRE_CFLAGS@ PCRE_LIBS = @PCRE_LIBS@ PERL = @PERL@ @@ -1225,9 +1291,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ +REPLACE_FNMATCH = @REPLACE_FNMATCH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ REPLACE_FPURGE = @REPLACE_FPURGE@ +REPLACE_FREELOCALE = @REPLACE_FREELOCALE@ REPLACE_FREOPEN = @REPLACE_FREOPEN@ REPLACE_FSEEK = @REPLACE_FSEEK@ REPLACE_FSEEKO = @REPLACE_FSEEKO@ @@ -1246,6 +1314,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ +REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ @@ -1282,6 +1351,7 @@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@ REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ @@ -1290,6 +1360,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@ +REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -1446,7 +1517,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -1523,8 +1593,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1550,14 +1620,6 @@ distclean-hdr: -rm -f config.h stamp-h1 - -clean-checkLIBRARIES: - -test -z "$(check_LIBRARIES)" || rm -f $(check_LIBRARIES) - -libunittest.a: $(libunittest_a_OBJECTS) $(libunittest_a_DEPENDENCIES) $(EXTRA_libunittest_a_DEPENDENCIES) - $(AM_V_at)-rm -f libunittest.a - $(AM_V_AR)$(libunittest_a_AR) libunittest.a $(libunittest_a_OBJECTS) $(libunittest_a_LIBADD) - $(AM_V_at)$(RANLIB) libunittest.a install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -1601,6 +1663,14 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +clean-checkLIBRARIES: + -test -z "$(check_LIBRARIES)" || rm -f $(check_LIBRARIES) + +libunittest.a: $(libunittest_a_OBJECTS) $(libunittest_a_DEPENDENCIES) $(EXTRA_libunittest_a_DEPENDENCIES) + $(AM_V_at)-rm -f libunittest.a + $(AM_V_AR)$(libunittest_a_AR) libunittest.a $(libunittest_a_OBJECTS) $(libunittest_a_LIBADD) + $(AM_V_at)$(RANLIB) libunittest.a + wget$(EXEEXT): $(wget_OBJECTS) $(wget_DEPENDENCIES) $(EXTRA_wget_DEPENDENCIES) @rm -f wget$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wget_OBJECTS) $(wget_LDADD) $(LIBS) @@ -1611,77 +1681,83 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftp-opie.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gnutls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/http-ntlm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mswindows.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/openssl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/build_info.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connect.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cookies.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/css-url.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/css_.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exits.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftp-basic.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftp-ls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/host.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hsts.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html-parse.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html-url.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iri.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-build_info.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-connect.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-convert.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-cookies.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-css-url.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-css_.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-exits.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-ftp-basic.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-ftp-ls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-ftp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-hash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-host.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-hsts.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-html-parse.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-html-url.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-http.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-iri.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-log.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-metalink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-netrc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-progress.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-ptimer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-recur.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-res.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-retr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-spider.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-url.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-warc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-xattr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metalink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netrc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progress.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptimer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recur.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/res.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/retr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spider.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/warc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xattr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftp-opie.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gnutls.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/http-ntlm.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mswindows.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/openssl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/build_info.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connect.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cookies.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/css-url.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/css_.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exits.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftp-basic.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftp-ls.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/host.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hsts.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html-parse.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html-url.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iri.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-build_info.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-connect.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-convert.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-cookies.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-css-url.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-css_.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-exits.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-ftp-basic.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-ftp-ls.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-ftp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-hash.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-host.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-hsts.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-html-parse.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-html-url.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-http.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-init.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-iri.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-log.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-metalink.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-netrc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-progress.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-ptimer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-recur.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-res.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-retr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-spider.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-url.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-utils.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-version.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-warc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunittest_a-xattr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metalink.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netrc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progress.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptimer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recur.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/res.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/retr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spider.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/warc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xattr.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -2211,7 +2287,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -2286,7 +2365,77 @@ mostlyclean-am distclean: distclean-am - -rm -rf $(DEPDIR) ./$(DEPDIR) + -rm -f $(DEPDIR)/ftp-opie.Po + -rm -f $(DEPDIR)/gnutls.Po + -rm -f $(DEPDIR)/http-ntlm.Po + -rm -f $(DEPDIR)/mswindows.Po + -rm -f $(DEPDIR)/openssl.Po + -rm -f ./$(DEPDIR)/build_info.Po + -rm -f ./$(DEPDIR)/connect.Po + -rm -f ./$(DEPDIR)/convert.Po + -rm -f ./$(DEPDIR)/cookies.Po + -rm -f ./$(DEPDIR)/css-url.Po + -rm -f ./$(DEPDIR)/css_.Po + -rm -f ./$(DEPDIR)/exits.Po + -rm -f ./$(DEPDIR)/ftp-basic.Po + -rm -f ./$(DEPDIR)/ftp-ls.Po + -rm -f ./$(DEPDIR)/ftp.Po + -rm -f ./$(DEPDIR)/hash.Po + -rm -f ./$(DEPDIR)/host.Po + -rm -f ./$(DEPDIR)/hsts.Po + -rm -f ./$(DEPDIR)/html-parse.Po + -rm -f ./$(DEPDIR)/html-url.Po + -rm -f ./$(DEPDIR)/http.Po + -rm -f ./$(DEPDIR)/init.Po + -rm -f ./$(DEPDIR)/iri.Po + -rm -f ./$(DEPDIR)/libunittest_a-build_info.Po + -rm -f ./$(DEPDIR)/libunittest_a-connect.Po + -rm -f ./$(DEPDIR)/libunittest_a-convert.Po + -rm -f ./$(DEPDIR)/libunittest_a-cookies.Po + -rm -f ./$(DEPDIR)/libunittest_a-css-url.Po + -rm -f ./$(DEPDIR)/libunittest_a-css_.Po + -rm -f ./$(DEPDIR)/libunittest_a-exits.Po + -rm -f ./$(DEPDIR)/libunittest_a-ftp-basic.Po + -rm -f ./$(DEPDIR)/libunittest_a-ftp-ls.Po + -rm -f ./$(DEPDIR)/libunittest_a-ftp.Po + -rm -f ./$(DEPDIR)/libunittest_a-hash.Po + -rm -f ./$(DEPDIR)/libunittest_a-host.Po + -rm -f ./$(DEPDIR)/libunittest_a-hsts.Po + -rm -f ./$(DEPDIR)/libunittest_a-html-parse.Po + -rm -f ./$(DEPDIR)/libunittest_a-html-url.Po + -rm -f ./$(DEPDIR)/libunittest_a-http.Po + -rm -f ./$(DEPDIR)/libunittest_a-init.Po + -rm -f ./$(DEPDIR)/libunittest_a-iri.Po + -rm -f ./$(DEPDIR)/libunittest_a-log.Po + -rm -f ./$(DEPDIR)/libunittest_a-main.Po + -rm -f ./$(DEPDIR)/libunittest_a-metalink.Po + -rm -f ./$(DEPDIR)/libunittest_a-netrc.Po + -rm -f ./$(DEPDIR)/libunittest_a-progress.Po + -rm -f ./$(DEPDIR)/libunittest_a-ptimer.Po + -rm -f ./$(DEPDIR)/libunittest_a-recur.Po + -rm -f ./$(DEPDIR)/libunittest_a-res.Po + -rm -f ./$(DEPDIR)/libunittest_a-retr.Po + -rm -f ./$(DEPDIR)/libunittest_a-spider.Po + -rm -f ./$(DEPDIR)/libunittest_a-url.Po + -rm -f ./$(DEPDIR)/libunittest_a-utils.Po + -rm -f ./$(DEPDIR)/libunittest_a-version.Po + -rm -f ./$(DEPDIR)/libunittest_a-warc.Po + -rm -f ./$(DEPDIR)/libunittest_a-xattr.Po + -rm -f ./$(DEPDIR)/log.Po + -rm -f ./$(DEPDIR)/main.Po + -rm -f ./$(DEPDIR)/metalink.Po + -rm -f ./$(DEPDIR)/netrc.Po + -rm -f ./$(DEPDIR)/progress.Po + -rm -f ./$(DEPDIR)/ptimer.Po + -rm -f ./$(DEPDIR)/recur.Po + -rm -f ./$(DEPDIR)/res.Po + -rm -f ./$(DEPDIR)/retr.Po + -rm -f ./$(DEPDIR)/spider.Po + -rm -f ./$(DEPDIR)/url.Po + -rm -f ./$(DEPDIR)/utils.Po + -rm -f ./$(DEPDIR)/version.Po + -rm -f ./$(DEPDIR)/warc.Po + -rm -f ./$(DEPDIR)/xattr.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-local distclean-tags @@ -2332,7 +2481,77 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf $(DEPDIR) ./$(DEPDIR) + -rm -f $(DEPDIR)/ftp-opie.Po + -rm -f $(DEPDIR)/gnutls.Po + -rm -f $(DEPDIR)/http-ntlm.Po + -rm -f $(DEPDIR)/mswindows.Po + -rm -f $(DEPDIR)/openssl.Po + -rm -f ./$(DEPDIR)/build_info.Po + -rm -f ./$(DEPDIR)/connect.Po + -rm -f ./$(DEPDIR)/convert.Po + -rm -f ./$(DEPDIR)/cookies.Po + -rm -f ./$(DEPDIR)/css-url.Po + -rm -f ./$(DEPDIR)/css_.Po + -rm -f ./$(DEPDIR)/exits.Po + -rm -f ./$(DEPDIR)/ftp-basic.Po + -rm -f ./$(DEPDIR)/ftp-ls.Po + -rm -f ./$(DEPDIR)/ftp.Po + -rm -f ./$(DEPDIR)/hash.Po + -rm -f ./$(DEPDIR)/host.Po + -rm -f ./$(DEPDIR)/hsts.Po + -rm -f ./$(DEPDIR)/html-parse.Po + -rm -f ./$(DEPDIR)/html-url.Po + -rm -f ./$(DEPDIR)/http.Po + -rm -f ./$(DEPDIR)/init.Po + -rm -f ./$(DEPDIR)/iri.Po + -rm -f ./$(DEPDIR)/libunittest_a-build_info.Po + -rm -f ./$(DEPDIR)/libunittest_a-connect.Po + -rm -f ./$(DEPDIR)/libunittest_a-convert.Po + -rm -f ./$(DEPDIR)/libunittest_a-cookies.Po + -rm -f ./$(DEPDIR)/libunittest_a-css-url.Po + -rm -f ./$(DEPDIR)/libunittest_a-css_.Po + -rm -f ./$(DEPDIR)/libunittest_a-exits.Po + -rm -f ./$(DEPDIR)/libunittest_a-ftp-basic.Po + -rm -f ./$(DEPDIR)/libunittest_a-ftp-ls.Po + -rm -f ./$(DEPDIR)/libunittest_a-ftp.Po + -rm -f ./$(DEPDIR)/libunittest_a-hash.Po + -rm -f ./$(DEPDIR)/libunittest_a-host.Po + -rm -f ./$(DEPDIR)/libunittest_a-hsts.Po + -rm -f ./$(DEPDIR)/libunittest_a-html-parse.Po + -rm -f ./$(DEPDIR)/libunittest_a-html-url.Po + -rm -f ./$(DEPDIR)/libunittest_a-http.Po + -rm -f ./$(DEPDIR)/libunittest_a-init.Po + -rm -f ./$(DEPDIR)/libunittest_a-iri.Po + -rm -f ./$(DEPDIR)/libunittest_a-log.Po + -rm -f ./$(DEPDIR)/libunittest_a-main.Po + -rm -f ./$(DEPDIR)/libunittest_a-metalink.Po + -rm -f ./$(DEPDIR)/libunittest_a-netrc.Po + -rm -f ./$(DEPDIR)/libunittest_a-progress.Po + -rm -f ./$(DEPDIR)/libunittest_a-ptimer.Po + -rm -f ./$(DEPDIR)/libunittest_a-recur.Po + -rm -f ./$(DEPDIR)/libunittest_a-res.Po + -rm -f ./$(DEPDIR)/libunittest_a-retr.Po + -rm -f ./$(DEPDIR)/libunittest_a-spider.Po + -rm -f ./$(DEPDIR)/libunittest_a-url.Po + -rm -f ./$(DEPDIR)/libunittest_a-utils.Po + -rm -f ./$(DEPDIR)/libunittest_a-version.Po + -rm -f ./$(DEPDIR)/libunittest_a-warc.Po + -rm -f ./$(DEPDIR)/libunittest_a-xattr.Po + -rm -f ./$(DEPDIR)/log.Po + -rm -f ./$(DEPDIR)/main.Po + -rm -f ./$(DEPDIR)/metalink.Po + -rm -f ./$(DEPDIR)/netrc.Po + -rm -f ./$(DEPDIR)/progress.Po + -rm -f ./$(DEPDIR)/ptimer.Po + -rm -f ./$(DEPDIR)/recur.Po + -rm -f ./$(DEPDIR)/res.Po + -rm -f ./$(DEPDIR)/retr.Po + -rm -f ./$(DEPDIR)/spider.Po + -rm -f ./$(DEPDIR)/url.Po + -rm -f ./$(DEPDIR)/utils.Po + -rm -f ./$(DEPDIR)/version.Po + -rm -f ./$(DEPDIR)/warc.Po + -rm -f ./$(DEPDIR)/xattr.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2352,7 +2571,7 @@ .MAKE: all check-am install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-checkLIBRARIES clean-generic \ cscopelist-am ctags ctags-am distclean distclean-compile \ distclean-generic distclean-hdr distclean-local distclean-tags \ diff -Nru wget-1.19.5/src/openssl.c wget-1.20.1/src/openssl.c --- wget-1.19.5/src/openssl.c 2018-05-05 20:49:06.000000000 +0000 +++ wget-1.20.1/src/openssl.c 2018-12-26 19:58:39.000000000 +0000 @@ -43,8 +43,10 @@ #include #if OPENSSL_VERSION_NUMBER >= 0x00907000 #include +#ifndef OPENSSL_NO_ENGINE #include #endif +#endif #include "utils.h" #include "connect.h" @@ -193,7 +195,9 @@ #if OPENSSL_VERSION_NUMBER >= 0x00907000 OPENSSL_load_builtin_modules(); +#ifndef OPENSSL_NO_ENGINE ENGINE_load_builtin_engines(); +#endif CONF_modules_load_file(NULL, NULL, CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE); #endif diff -Nru wget-1.19.5/src/options.h wget-1.20.1/src/options.h --- wget-1.19.5/src/options.h 2018-05-05 20:49:06.000000000 +0000 +++ wget-1.20.1/src/options.h 2018-12-26 19:58:39.000000000 +0000 @@ -41,6 +41,7 @@ bool quiet; /* Are we quiet? */ int ntry; /* Number of tries per URL */ bool retry_connrefused; /* Treat CONNREFUSED as non-fatal. */ + bool retry_on_host_error; /* Treat host errors as non-fatal. */ char *retry_on_http_error; /* Treat given HTTP errors as non-fatal. */ bool background; /* Whether we should work in background. */ bool ignore_length; /* Do we heed content-length at all? */ @@ -91,7 +92,7 @@ void *acceptregex; /* Patterns to accept (a regex struct). */ void *rejectregex; /* Patterns to reject (a regex struct). */ enum { -#ifdef HAVE_LIBPCRE +#if defined HAVE_LIBPCRE || HAVE_LIBPCRE2 regex_type_pcre, #endif regex_type_posix diff -Nru wget-1.19.5/src/retr.c wget-1.20.1/src/retr.c --- wget-1.19.5/src/retr.c 2018-01-19 21:18:23.000000000 +0000 +++ wget-1.20.1/src/retr.c 2018-12-26 19:58:39.000000000 +0000 @@ -159,8 +159,8 @@ /* Write data in BUF to OUT. However, if *SKIP is non-zero, skip that amount of data and decrease SKIP. Increment *TOTAL by the amount of data written. If OUT2 is not NULL, also write BUF to OUT2. - In case of error writing to OUT, -1 is returned. In case of error - writing to OUT2, -2 is returned. Return 1 if the whole BUF was + In case of error writing to OUT, -2 is returned. In case of error + writing to OUT2, -3 is returned. Return 1 if the whole BUF was skipped. */ static int @@ -169,25 +169,31 @@ { if (out == NULL && out2 == NULL) return 1; - if (*skip > bufsize) - { - *skip -= bufsize; - return 1; - } - if (*skip) + + if (skip) { - buf += *skip; - bufsize -= *skip; - *skip = 0; - if (bufsize == 0) - return 1; + if (*skip > bufsize) + { + *skip -= bufsize; + return 1; + } + if (*skip) + { + buf += *skip; + bufsize -= *skip; + *skip = 0; + if (bufsize == 0) + return 1; + } } - if (out != NULL) + if (out) fwrite (buf, 1, bufsize, out); - if (out2 != NULL) + if (out2) fwrite (buf, 1, bufsize, out2); - *written += bufsize; + + if (written) + *written += bufsize; /* Immediately flush the downloaded data. This should not hinder performance: fast downloads will arrive in large 16K chunks @@ -203,17 +209,18 @@ actual justification. (Also, why 16K? Anyone test other values?) */ #ifndef __VMS - if (out != NULL) + if (out) fflush (out); - if (out2 != NULL) + if (out2) fflush (out2); #endif /* ndef __VMS */ - if (out != NULL && ferror (out)) - return -1; - else if (out2 != NULL && ferror (out2)) + + if (out && ferror (out)) return -2; - else - return 0; + else if (out2 && ferror (out2)) + return -3; + + return 0; } /* Read the contents of file descriptor FD until it the connection @@ -452,6 +459,15 @@ { int err; int towrite; + + /* Write original data to WARC file */ + write_res = write_data (NULL, out2, dlbuf, ret, NULL, NULL); + if (write_res < 0) + { + ret = write_res; + goto out; + } + gzstream.avail_in = ret; gzstream.next_in = (unsigned char *) dlbuf; @@ -482,11 +498,11 @@ } towrite = gzbufsize - gzstream.avail_out; - write_res = write_data (out, out2, gzbuf, towrite, &skip, + write_res = write_data (out, NULL, gzbuf, towrite, &skip, &sum_written); if (write_res < 0) { - ret = (write_res == -3) ? -3 : -2; + ret = write_res; goto out; } } @@ -499,7 +515,7 @@ &sum_written); if (write_res < 0) { - ret = (write_res == -3) ? -3 : -2; + ret = write_res; goto out; } } diff -Nru wget-1.19.5/src/url.c wget-1.20.1/src/url.c --- wget-1.19.5/src/url.c 2018-05-05 20:46:22.000000000 +0000 +++ wget-1.20.1/src/url.c 2018-12-26 19:58:39.000000000 +0000 @@ -1248,9 +1248,8 @@ struct stat st; int res; - p = path + strlen (path); - for (; *p != '/' && p != path; p--) - ; + p = strrchr(path, '/'); + p = p == NULL ? path : p; /* Don't create if it's just a file. */ if ((p == path) && (*p != '/')) diff -Nru wget-1.19.5/src/utils.c wget-1.20.1/src/utils.c --- wget-1.19.5/src/utils.c 2018-05-05 20:46:22.000000000 +0000 +++ wget-1.20.1/src/utils.c 2018-12-26 19:58:39.000000000 +0000 @@ -68,7 +68,10 @@ #include #include -#ifdef HAVE_LIBPCRE +#ifdef HAVE_LIBPCRE2 +# define PCRE2_CODE_UNIT_WIDTH 8 +# include +#elif defined HAVE_LIBPCRE # include #endif @@ -563,6 +566,9 @@ { struct stat buf; + if (!filename) + return false; + #if defined(WINDOWS) || defined(__VMS) int ret = stat (filename, &buf); if (ret >= 0) @@ -921,6 +927,7 @@ if (fstat (fd, &fdstats) == -1) { logprintf (LOG_NOTQUIET, _("Failed to stat file %s, error: %s\n"), fname, strerror(errno)); + close (fd); return -1; } #if !(defined(WINDOWS) || defined(__VMS)) @@ -2425,6 +2432,23 @@ return n; } +#ifdef HAVE_LIBPCRE2 +/* Compiles the PCRE2 regex. */ +void * +compile_pcre2_regex (const char *str) +{ + int errornumber; + PCRE2_SIZE erroroffset; + pcre2_code *regex = pcre2_compile((PCRE2_SPTR) str, PCRE2_ZERO_TERMINATED, 0, &errornumber, &erroroffset, NULL); + if (! regex) + { + fprintf (stderr, _("Invalid regular expression %s, PCRE2 error %d\n"), + quote (str), errornumber); + } + return regex; +} +#endif + #ifdef HAVE_LIBPCRE /* Compiles the PCRE regex. */ void * @@ -2437,7 +2461,6 @@ { fprintf (stderr, _("Invalid regular expression %s, %s\n"), quote (str), errbuf); - return false; } return regex; } @@ -2469,6 +2492,34 @@ return regex; } +#ifdef HAVE_LIBPCRE2 +/* Matches a PCRE2 regex. */ +bool +match_pcre2_regex (const void *regex, const char *str) +{ + int rc; + pcre2_match_data *match_data; + + match_data = pcre2_match_data_create_from_pattern(regex, NULL); + + if (match_data) + { + rc = pcre2_match(regex, (PCRE2_SPTR) str, strlen(str), 0, 0, match_data, NULL); + pcre2_match_data_free(match_data); + } + else + rc = PCRE2_ERROR_NOMEMORY; + + if (rc < 0 && rc != PCRE2_ERROR_NOMATCH) + { + logprintf (LOG_VERBOSE, _("Error while matching %s: %d\n"), + quote (str), rc); + } + + return rc >= 0; +} +#endif + #ifdef HAVE_LIBPCRE #define OVECCOUNT 30 /* Matches a PCRE regex. */ diff -Nru wget-1.19.5/src/utils.h wget-1.20.1/src/utils.h --- wget-1.19.5/src/utils.h 2018-05-05 20:46:22.000000000 +0000 +++ wget-1.20.1/src/utils.h 2018-12-26 19:58:39.000000000 +0000 @@ -150,6 +150,11 @@ size_t wget_base64_encode (const void *, size_t, char *); ssize_t wget_base64_decode (const char *, void *, size_t); +#ifdef HAVE_LIBPCRE2 +void *compile_pcre2_regex (const char *); +bool match_pcre2_regex (const void *, const char *); +#endif + #ifdef HAVE_LIBPCRE void *compile_pcre_regex (const char *); bool match_pcre_regex (const void *, const char *); diff -Nru wget-1.19.5/src/version.h wget-1.20.1/src/version.h --- wget-1.19.5/src/version.h 2018-01-19 21:18:23.000000000 +0000 +++ wget-1.20.1/src/version.h 2018-12-26 19:58:39.000000000 +0000 @@ -27,6 +27,9 @@ shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ +#ifndef WGET_VERSION_H +#define WGET_VERSION_H + /* Extern declarations for strings in version.c */ extern const char *version_string; extern const char *compilation_string; @@ -34,3 +37,5 @@ /* Extern declaration for string in build_info.c */ extern const char *compiled_features[]; + +#endif /* WGET_VERSION_H */ diff -Nru wget-1.19.5/src/warc.c wget-1.20.1/src/warc.c --- wget-1.19.5/src/warc.c 2018-05-05 20:46:22.000000000 +0000 +++ wget-1.20.1/src/warc.c 2018-12-26 19:58:39.000000000 +0000 @@ -203,6 +203,7 @@ /* Start a GZIP stream, if required. */ if (opt.warc_compression_enabled) { + int dup_fd; /* Record the starting offset of the new record. */ warc_current_gzfile_offset = ftello (warc_current_file); @@ -214,13 +215,23 @@ fflush (warc_current_file); /* Start a new GZIP stream. */ - warc_current_gzfile = gzdopen (dup (fileno (warc_current_file)), "wb9"); + dup_fd = dup (fileno (warc_current_file)); + if (dup_fd < 0) + { + logprintf (LOG_NOTQUIET, +_("Error duplicating WARC file file descriptor.\n")); + warc_write_ok = false; + return false; + } + + warc_current_gzfile = gzdopen (dup_fd, "wb9"); warc_current_gzfile_uncompressed_size = 0; if (warc_current_gzfile == NULL) { logprintf (LOG_NOTQUIET, _("Error opening GZIP stream to WARC file.\n")); + close (dup_fd); warc_write_ok = false; return false; } @@ -1353,6 +1364,7 @@ char timestamp_str_cdx[15]; char offset_string[MAX_INT_TO_STRING_LEN(off_t)]; const char *checksum; + char *tmp_location = NULL; memcpy (timestamp_str_cdx , timestamp_str , 4); /* "YYYY" "-" */ memcpy (timestamp_str_cdx + 4, timestamp_str + 5, 2); /* "mm" "-" */ @@ -1371,18 +1383,19 @@ if (mime_type == NULL || strlen(mime_type) == 0) mime_type = "-"; if (redirect_location == NULL || strlen(redirect_location) == 0) - redirect_location = "-"; + tmp_location = strdup ("-"); else - redirect_location = url_escape(redirect_location); + tmp_location = url_escape(redirect_location); number_to_string (offset_string, offset); /* Print the CDX line. */ fprintf (warc_current_cdx_file, "%s %s %s %s %d %s %s - %s %s %s\n", url, timestamp_str_cdx, url, mime_type, response_code, checksum, - redirect_location, offset_string, warc_current_filename, + tmp_location, offset_string, warc_current_filename, response_uuid); fflush (warc_current_cdx_file); + free (tmp_location); return true; } diff -Nru wget-1.19.5/src/xattr.c wget-1.20.1/src/xattr.c --- wget-1.19.5/src/xattr.c 2018-01-19 21:18:23.000000000 +0000 +++ wget-1.20.1/src/xattr.c 2018-12-26 19:58:39.000000000 +0000 @@ -21,6 +21,7 @@ #include #include "log.h" +#include "utils.h" #include "xattr.h" #ifdef USE_XATTR @@ -57,7 +58,7 @@ #endif /* USE_XATTR */ int -set_file_metadata (const char *origin_url, const char *referrer_url, FILE *fp) +set_file_metadata (const struct url *origin_url, const struct url *referrer_url, FILE *fp) { /* Save metadata about where the file came from (requested, final URLs) to * user POSIX Extended Attributes of retrieved file. @@ -67,13 +68,28 @@ * [http://0pointer.de/lennart/projects/mod_mime_xattr/]. */ int retval = -1; + char *value; if (!origin_url || !fp) return retval; - retval = write_xattr_metadata ("user.xdg.origin.url", escnonprint_uri (origin_url), fp); - if ((!retval) && referrer_url) - retval = write_xattr_metadata ("user.xdg.referrer.url", escnonprint_uri (referrer_url), fp); + value = url_string (origin_url, URL_AUTH_HIDE); + retval = write_xattr_metadata ("user.xdg.origin.url", escnonprint_uri (value), fp); + xfree (value); + + if (!retval && referrer_url) + { + struct url u; + + memset(&u, 0, sizeof(u)); + u.scheme = referrer_url->scheme; + u.host = referrer_url->host; + u.port = referrer_url->port; + + value = url_string (&u, 0); + retval = write_xattr_metadata ("user.xdg.referrer.url", escnonprint_uri (value), fp); + xfree (value); + } return retval; } diff -Nru wget-1.19.5/src/xattr.h wget-1.20.1/src/xattr.h --- wget-1.19.5/src/xattr.h 2018-01-19 21:18:23.000000000 +0000 +++ wget-1.20.1/src/xattr.h 2018-12-26 19:58:39.000000000 +0000 @@ -16,12 +16,13 @@ along with this program; if not, see . */ #include +#include #ifndef _XATTR_H #define _XATTR_H /* Store metadata name/value attributes against fp. */ -int set_file_metadata (const char *origin_url, const char *referrer_url, FILE *fp); +int set_file_metadata (const struct url *origin_url, const struct url *referrer_url, FILE *fp); #if defined(__linux) /* libc on Linux has fsetxattr (5 arguments). */ diff -Nru wget-1.19.5/.tarball-version wget-1.20.1/.tarball-version --- wget-1.19.5/.tarball-version 2018-05-06 16:50:33.000000000 +0000 +++ wget-1.20.1/.tarball-version 2018-12-26 20:12:23.000000000 +0000 @@ -1 +1 @@ -1.19.5 +1.20.1 Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/authentication.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/authentication.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/authentication.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/authentication.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/authentication.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/authentication.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/authentication.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/authentication.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/authentication.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/authentication.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/domains.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/domains.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/domains.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/domains.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/domains.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/domains.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/domains.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/domains.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/domains.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/domains.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expected_files.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expected_files.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expected_files.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expected_files.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expected_files.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expected_files.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expected_files.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expected_files.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expected_files.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expected_files.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expected_ret_code.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expected_ret_code.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expected_ret_code.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expected_ret_code.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expected_ret_code.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expected_ret_code.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expected_ret_code.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expected_ret_code.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expected_ret_code.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expected_ret_code.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expect_header.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expect_header.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expect_header.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expect_header.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expect_header.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expect_header.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expect_header.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expect_header.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/expect_header.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/expect_header.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/files_crawled.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/files_crawled.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/files_crawled.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/files_crawled.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/files_crawled.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/files_crawled.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/files_crawled.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/files_crawled.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/files_crawled.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/files_crawled.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/hook_sample.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/hook_sample.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/hook_sample.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/hook_sample.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/hook_sample.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/hook_sample.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/hook_sample.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/hook_sample.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/hook_sample.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/hook_sample.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/__init__.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/__init__.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/__init__.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/__init__.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/__init__.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/__init__.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/__init__.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/__init__.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/__init__.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/__init__.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/local_files.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/local_files.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/local_files.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/local_files.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/local_files.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/local_files.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/local_files.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/local_files.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/local_files.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/local_files.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/reject_header.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/reject_header.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/reject_header.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/reject_header.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/reject_header.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/reject_header.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/reject_header.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/reject_header.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/reject_header.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/reject_header.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/response.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/response.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/response.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/response.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/response.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/response.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/response.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/response.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/response.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/response.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/rule_sample.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/rule_sample.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/rule_sample.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/rule_sample.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/rule_sample.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/rule_sample.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/rule_sample.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/rule_sample.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/rule_sample.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/rule_sample.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/send_header.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/send_header.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/send_header.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/send_header.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/send_header.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/send_header.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/send_header.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/send_header.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/send_header.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/send_header.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/server_conf.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/server_conf.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/server_files.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/server_files.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/server_files.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/server_files.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/server_files.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/server_files.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/server_files.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/server_files.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/server_files.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/server_files.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/urls.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/urls.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/urls.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/urls.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/urls.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/urls.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/urls.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/urls.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/urls.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/urls.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/wget_commands.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/wget_commands.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/wget_commands.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/wget_commands.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/wget_commands.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/wget_commands.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/wget_commands.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/wget_commands.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/conf/__pycache__/wget_commands.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/conf/__pycache__/wget_commands.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/__init__.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/__init__.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/__init__.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/__init__.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/__init__.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/__init__.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/__init__.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/__init__.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/__init__.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/__init__.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/server_error.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/server_error.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/server_error.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/server_error.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/server_error.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/server_error.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/server_error.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/server_error.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/server_error.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/server_error.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/test_failed.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/test_failed.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/test_failed.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/test_failed.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/test_failed.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/test_failed.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/test_failed.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/test_failed.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/exc/__pycache__/test_failed.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/exc/__pycache__/test_failed.cpython-36.opt-1.pyc differ diff -Nru wget-1.19.5/testenv/Makefile.in wget-1.20.1/testenv/Makefile.in --- wget-1.19.5/testenv/Makefile.in 2018-05-06 16:47:51.000000000 +0000 +++ wget-1.20.1/testenv/Makefile.in 2018-12-26 20:09:02.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -99,6 +99,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -151,12 +152,13 @@ subdir = testenv ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/arpa_inet_h.m4 \ + $(top_srcdir)/m4/__inline.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/af_alg.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 $(top_srcdir)/m4/base32.m4 \ $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ - $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \ + $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/clock_time.m4 \ + $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ @@ -165,9 +167,11 @@ $(top_srcdir)/m4/extern-inline.m4 \ $(top_srcdir)/m4/fatal-signal.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ - $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \ - $(top_srcdir)/m4/flock.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fseek.m4 \ + $(top_srcdir)/m4/fflush.m4 $(top_srcdir)/m4/flexmember.m4 \ + $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/flock.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fnmatch_h.m4 \ + $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fpurge.m4 \ + $(top_srcdir)/m4/freading.m4 $(top_srcdir)/m4/fseek.m4 \ $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/fstat.m4 \ $(top_srcdir)/m4/ftell.m4 $(top_srcdir)/m4/ftello.m4 \ $(top_srcdir)/m4/futimens.m4 $(top_srcdir)/m4/getaddrinfo.m4 \ @@ -180,7 +184,6 @@ $(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/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 \ @@ -225,29 +228,29 @@ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/sched_h.m4 \ $(top_srcdir)/m4/secure_getenv.m4 $(top_srcdir)/m4/select.m4 \ - $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sha1.m4 \ - $(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \ - $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sh-filename.m4 \ + $(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sha256.m4 \ + $(top_srcdir)/m4/sha512.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sigpipe.m4 \ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/snprintf.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/spawn-pipe.m4 $(top_srcdir)/m4/spawn_h.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \ - $(top_srcdir)/m4/strptime.m4 $(top_srcdir)/m4/strtok_r.m4 \ - $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_file_h.m4 \ - $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/std-gnu11.m4 \ + $(top_srcdir)/m4/stdalign.m4 $(top_srcdir)/m4/stdbool.m4 \ + $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strptime.m4 \ + $(top_srcdir)/m4/strtok_r.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_file_h.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ @@ -532,7 +535,6 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/test-driver README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ @@ -551,6 +553,7 @@ BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +BYTESWAP_H = @BYTESWAP_H@ CARES_CFLAGS = @CARES_CFLAGS@ CARES_LIBS = @CARES_LIBS@ CC = @CC@ @@ -619,6 +622,7 @@ GNULIB_FGETC = @GNULIB_FGETC@ GNULIB_FGETS = @GNULIB_FGETS@ GNULIB_FLOCK = @GNULIB_FLOCK@ +GNULIB_FNMATCH = @GNULIB_FNMATCH@ GNULIB_FOPEN = @GNULIB_FOPEN@ GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ @@ -652,6 +656,7 @@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ +GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ @@ -676,6 +681,7 @@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALENAME = @GNULIB_LOCALENAME@ GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ @@ -746,6 +752,7 @@ GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT@ GNULIB_POSIX_SPAWNATTR_SETSIGMASK = @GNULIB_POSIX_SPAWNATTR_SETSIGMASK@ GNULIB_POSIX_SPAWNP = @GNULIB_POSIX_SPAWNP@ +GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -948,6 +955,7 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ @@ -970,6 +978,9 @@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FLOCK = @HAVE_FLOCK@ +HAVE_FNMATCH = @HAVE_FNMATCH@ +HAVE_FNMATCH_H = @HAVE_FNMATCH_H@ +HAVE_FREELOCALE = @HAVE_FREELOCALE@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ @@ -982,13 +993,16 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ +HAVE_GETPASS = @HAVE_GETPASS@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@ HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ @@ -1026,6 +1040,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NETDB_H = @HAVE_NETDB_H@ HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ +HAVE_NEWLOCALE = @HAVE_NEWLOCALE@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ @@ -1037,6 +1052,7 @@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@ HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@ +HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PSELECT = @HAVE_PSELECT@ @@ -1107,7 +1123,6 @@ 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@ @@ -1165,8 +1180,6 @@ 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@ @@ -1201,7 +1214,6 @@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1246,6 +1258,7 @@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ +NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1280,6 +1293,7 @@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ +NEXT_FNMATCH_H = @NEXT_FNMATCH_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1322,6 +1336,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCRE2_CFLAGS = @PCRE2_CFLAGS@ +PCRE2_LIBS = @PCRE2_LIBS@ PCRE_CFLAGS = @PCRE_CFLAGS@ PCRE_LIBS = @PCRE_LIBS@ PERL = @PERL@ @@ -1358,9 +1374,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ +REPLACE_FNMATCH = @REPLACE_FNMATCH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ REPLACE_FPURGE = @REPLACE_FPURGE@ +REPLACE_FREELOCALE = @REPLACE_FREELOCALE@ REPLACE_FREOPEN = @REPLACE_FREOPEN@ REPLACE_FSEEK = @REPLACE_FSEEK@ REPLACE_FSEEKO = @REPLACE_FSEEKO@ @@ -1379,6 +1397,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ +REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ @@ -1415,6 +1434,7 @@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@ REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ @@ -1423,6 +1443,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@ +REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -1579,7 +1600,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -1665,8 +1685,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1804,7 +1824,7 @@ fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1840,7 +1860,10 @@ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_PY_LOG_DRIVER_FLAGS) $(PY_LOG_DRIVER_FLAGS) -- $(PY_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/colour_terminal.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/colour_terminal.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__init__.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__init__.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/colour_terminal.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/colour_terminal.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/colour_terminal.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/colour_terminal.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/colour_terminal.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/colour_terminal.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/colour_terminal.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/colour_terminal.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/colour_terminal.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/colour_terminal.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/colour_terminal.pypy-26.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/colour_terminal.pypy-26.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/__init__.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/__init__.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/__init__.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/__init__.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/__init__.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/__init__.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/__init__.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/__init__.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/__init__.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/__init__.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/__init__.pypy-26.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/__init__.pypy-26.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/metalinkv3_xml.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/metalinkv3_xml.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/metalinkv3_xml.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/metalinkv3_xml.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/wget_file.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/wget_file.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/wget_file.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/wget_file.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/wget_file.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/wget_file.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/wget_file.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/wget_file.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/misc/__pycache__/wget_file.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/misc/__pycache__/wget_file.cpython-36.opt-1.pyc differ diff -Nru wget-1.19.5/testenv/server/http/http_server.py wget-1.20.1/testenv/server/http/http_server.py --- wget-1.19.5/testenv/server/http/http_server.py 2017-12-31 11:56:45.000000000 +0000 +++ wget-1.20.1/testenv/server/http/http_server.py 2018-12-26 19:58:39.000000000 +0000 @@ -49,7 +49,6 @@ 'server-key.pem')) self.socket = ssl.wrap_socket( sock=socket.socket(self.address_family, self.socket_type), - ssl_version=ssl.PROTOCOL_TLSv1, certfile=CERTFILE, keyfile=KEYFILE, server_side=True Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/http_server.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/http_server.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__init__.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__init__.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/http_server.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/http_server.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/http_server.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/http_server.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/http_server.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/http_server.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/http_server.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/http_server.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/http_server.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/http_server.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/http_server.pypy-26.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/http_server.pypy-26.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/__init__.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/__init__.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/__init__.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/__init__.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/__init__.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/__init__.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/__init__.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/__init__.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/__init__.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/__init__.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/http/__pycache__/__init__.pypy-26.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/http/__pycache__/__init__.pypy-26.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/__init__.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/__init__.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/__pycache__/__init__.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/__pycache__/__init__.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/__pycache__/__init__.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/__pycache__/__init__.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/__pycache__/__init__.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/__pycache__/__init__.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/__pycache__/__init__.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/__pycache__/__init__.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/__pycache__/__init__.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/__pycache__/__init__.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/server/__pycache__/__init__.pypy-26.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/server/__pycache__/__init__.pypy-26.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/http_test.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/http_test.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__init__.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__init__.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/base_test.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/base_test.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/base_test.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/base_test.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/base_test.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/base_test.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/base_test.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/base_test.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/base_test.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/base_test.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/http_test.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/http_test.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/http_test.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/http_test.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/http_test.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/http_test.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/http_test.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/http_test.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/http_test.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/http_test.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/http_test.pypy-26.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/http_test.pypy-26.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/__init__.cpython-34.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/__init__.cpython-34.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/__init__.cpython-34.pyo and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/__init__.cpython-34.pyo differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/__init__.cpython-35.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/__init__.cpython-35.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/__init__.cpython-35.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/__init__.cpython-35.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/__init__.cpython-36.opt-1.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/__init__.cpython-36.opt-1.pyc differ Binary files /tmp/tmpi5nR6B/M41CZizIRB/wget-1.19.5/testenv/test/__pycache__/__init__.pypy-26.pyc and /tmp/tmpi5nR6B/vE0cu3E1RX/wget-1.20.1/testenv/test/__pycache__/__init__.pypy-26.pyc differ diff -Nru wget-1.19.5/tests/certs/1122.pem wget-1.20.1/tests/certs/1122.pem --- wget-1.19.5/tests/certs/1122.pem 2017-05-03 19:22:58.000000000 +0000 +++ wget-1.20.1/tests/certs/1122.pem 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHOTCCBSGgAwIBAgICESIwDQYJKoZIhvcNAQEFBQAwgZkxCzAJBgNVBAYTAlVT -MQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxIDAeBgNVBAoMF1dnZXQg -VGVzdGluZyBEZXBhcnRtZW50MRAwDgYDVQQLDAdUZXN0aW5nMRQwEgYDVQQDDAtX -Z2V0VGVzdGluZzEgMB4GCSqGSIb3DQEJARYRYnVncy13Z2V0QGdudS5vcmcwHhcN -MTcwNTAzMTkyMjU4WhcNMTkwNTAzMTkyMjU4WjBiMRowGAYDVQQDDBFXZ2V0VGVz -dGluZ1NlcnZlcjELMAkGA1UECAwCQ0ExCzAJBgNVBAYTAlVTMRswGQYJKoZIhvcN -AQkBFgxzZXJ2ZXJ0ZXN0ZXIxDTALBgNVBAoMBFNlcnYwggIiMA0GCSqGSIb3DQEB -AQUAA4ICDwAwggIKAoICAQCV0MqVGbB7ddCux1Oukmrf37UFXWXUt9mkk43xVBfj -H2W1UyuwwVw4vxHbryPfCBEJosBhAwaWFrUgr8Eu3ygTjHP/APyU38tHBWLRntlJ -h6sDDWl0WrpnJganTiqDXAOm/14UOkTiNcROZL5VxuOaydOAYJr6Lhs1a6R+Mmjg -6XvH+UbBzGctV+ypRsYjBJtIdIZ2n7i4QK9OQEb3v6amG4gbQXU3UM0yHcrUgRlQ -wJksOcUynWn5uAUaXIwWFak5BhgPRKx5e95MyLBn4M5auk5+5+q4yjY9JllczDsN -oYgNilt4OgNBBTgsjDnMeqEQJyE9zxUWeyVAs+HTaiT0S/8IXQ3YzxBk4sY8JtCU -6/qZv4YTkYoTuHW7Q2zWhAX4Mokq4Rmn3ehZkxKw2xr0FQojJHZ9ELKah+jrwcSB -+kjZ5gldRO5vH2qYO2WMpmNaEsWiW+tOTLeD/1kcMaMi6G2XmUOeMifLAg7qu5f9 -FYs0L42fTHk052YPS+0Ut2SvBo9PFqk/KDrnsocTKWRj7acIl6VkRdm0RlFeAc7b -bGp/VhwXiM4Frv+5zNdL/c3Il2/wNhvOwgwETlqGjfoJidm3r/SeH9ewLrYfHwyk -ts1QAemrvll/ndozRJgbDds/byE6E9g6Bv9sed85Kzjk0Cc/4XaGqunBY9qIlGDE -0QIDAQABo4IBvzCCAbswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUBFqV/dPL -v7D0jfTtmkyR5CHH7uIwHwYDVR0jBBgwFoAUF+2TQ4+npgB11Oi2gg2IN37AbQgw -CwYDVR0PBAQDAgGmMBMGA1UdJQQMMAoGCCsGAQUFBwMBMF0GA1UdHwRWMFQwKKAm -oCSGImh0dHA6Ly90ZXN0LndnZXR0ZXN0Lm9yZy9Cb2d1cy5jcmwwKKAmoCSGImh0 -dHA6Ly90ZXN0LndnZXR0ZXN0Lm9yZy9Cb2d1cy5jcmwwHAYDVR0RBBUwE4IRV2dl -dFRlc3RpbmdTZXJ2ZXIwgcgGCCsGAQUFBwEBBIG7MIG4MC4GCCsGAQUFBzAChiJo -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vQm9ndXMuY3J0MC4GCCsGAQUFBzAChiJo -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vQm9ndXMuY3J0MCoGCCsGAQUFBzABhh5o -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vb2NzcC8wKgYIKwYBBQUHMAGGHmh0dHA6 -Ly90ZXN0LndnZXR0ZXN0LmNvbS9vY3NwLzANBgkqhkiG9w0BAQUFAAOCAgEAi2se -m+oCEBYHQ6CdmB6afz1MLjbHUm33//Oh0+Jb3RMILA9+S8t4lCozfvMUYjJaB0Kb -3WW6D6xJ5lZ1qDx1PDVNoQdLkdxCOL85rXyCdGNDejbo35FOhRe3YUmaznNZqhLh -xu6fKAgHmeb8PCIBtpgfV9qIRRc/x1UMRaQqtJg97QjIMKUpp9/FsrXde+09QK7s -0wmUTGC4HxsP1pQjRlvtHzFW6Wa/sB5/gBWj/8avh47HSALlb6HwoiyPNz8pm9NX -dDgOjVT4It4uJ3NWgQZ7NdY0L7RLF2Hrw1XogR110vOYU/dPrs4UY3GXoP1w+aOY -3Ie5Y7d81OG4ZtEhgjqsK76Vjnuobn4lVOHx9voYbV8ke9Q/av90Eyxgmph0oKwV -2uyMqIwR7+TsOJD2uHyyPD1M6dOJ4ywQULGzLN5k/5Oq4LtUrxRZQ3xaXDAUanmF -MPo17o0sPw7/ruAnWMLp423OePSMyTjb6cRSQzw22sMUIR3Ch+EqiOFX8LPGKcOk -tZOxUmBAaxbSWFcd8t1L9sVbeYHU8sU6RCPC8roQs64M+zyDgwYP6rADjwOrNPfF -JFTlU/MkO5qt69zvrmrShaLQ7DCMMreAlILdCAQ8l6jpj+kpEcO3fKi7YS1h8zfe -70OXwGoCIgLv2OOw9vak+yYAWl833tqc5DirZoY= ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/1123.pem wget-1.20.1/tests/certs/1123.pem --- wget-1.19.5/tests/certs/1123.pem 2017-05-03 19:22:58.000000000 +0000 +++ wget-1.20.1/tests/certs/1123.pem 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHPTCCBSWgAwIBAgICESMwDQYJKoZIhvcNAQEFBQAwgZkxCzAJBgNVBAYTAlVT -MQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxIDAeBgNVBAoMF1dnZXQg -VGVzdGluZyBEZXBhcnRtZW50MRAwDgYDVQQLDAdUZXN0aW5nMRQwEgYDVQQDDAtX -Z2V0VGVzdGluZzEgMB4GCSqGSIb3DQEJARYRYnVncy13Z2V0QGdudS5vcmcwIhcN -MTcwNTAzMTkyMjU4WhcRMTcwNTAyMjEyMjU3KzAyMDAwYjEaMBgGA1UEAwwRV2dl -dFRlc3RpbmdTZXJ2ZXIxCzAJBgNVBAgMAkNBMQswCQYDVQQGEwJVUzEbMBkGCSqG -SIb3DQEJARYMc2VydmVydGVzdGVyMQ0wCwYDVQQKDARTZXJ2MIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAt94dAJMv4/RlbPh+UZrBr5hrKz2xpNB8Bx8N -MSVMaAUF38SH3KPIgXmn4TCmbsRpL7c8R3rk8fLriDxWC9LM8aBKQf9S8lnKEpLZ -KfR19hvykDGoJANsNGy7wWAOIZL/XebTIPJBv/BTEbU+EnHmcJeYvGT6Kuq7iJEd -ekY/fel2bVLk9ar9XInzRjiDWmpyRNsOWxUohqRLBxgpwb9fkP0NrG43wE9JColY -CqSrcrmZGMDxnvgW6IjqnIs2YnJwZXZLnOeVesd6RnAwSBqJroS8OMHULCwQ3PPj -c/gBY3zqhxCN6SRkqczVdqwMmxitpVNf38koUiQtmr19ICpvsz6PBdDOBeTQ9xsu -dYUGch/8fPbyp6FQMZGHY3MQjiFjONTdsqDJtZVh6e+O74AS7ugWJseTMBAk8w8H -kDwuyuYGTcvGhMVlPGT67BvknYhePsXwJhzj5Bh/4W5SS8qOOfnHhugHIHJE5RTy -VOWVwNuwE1H1gieBng0zMjxlKo2lgnGWIOkv289ldTWJajFoW0iCYqhNbnqJsdpq -SXbKW9xJXQFHSZkQfNgU/LZR2WC3sbkSu/6qZW0fjRtDhDraiRWqLw05kRKxf4fp -dEcw+D+f5I+pk+RvRKQYe1wwCIg/WsrcbyTKg8RJ8TgX2rNA44FtO3/FYWI00BkC -wEphUMcCAwEAAaOCAb8wggG7MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKdj -qsmSi/JPCOqMVzz1K2Sj1+FLMB8GA1UdIwQYMBaAFBftk0OPp6YAddTotoINiDd+ -wG0IMAsGA1UdDwQEAwIBpjATBgNVHSUEDDAKBggrBgEFBQcDATBdBgNVHR8EVjBU -MCigJqAkhiJodHRwOi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMCigJqAk -hiJodHRwOi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMBwGA1UdEQQVMBOC -EVdnZXRUZXN0aW5nU2VydmVyMIHIBggrBgEFBQcBAQSBuzCBuDAuBggrBgEFBQcw -AoYiaHR0cDovL3Rlc3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAuBggrBgEFBQcw -AoYiaHR0cDovL3Rlc3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAqBggrBgEFBQcw -AYYeaHR0cDovL3Rlc3Qud2dldHRlc3QuY29tL29jc3AvMCoGCCsGAQUFBzABhh5o -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vb2NzcC8wDQYJKoZIhvcNAQEFBQADggIB -AI1MXhZF7UgDSb6Wr2WOS/pKZneymk/wbfM4fIkiRVbftAhP6Ze4latiF+2TyC0q -a+8GlpikLZaYZPW5K7JYeFD/6mj5Hm7hstYjkgncT50TSW87isi0HkLQrBJJGLyq -kSxRBft64AIfHX0VCY8bc/V+zN51pPZiBod45gjrc3Xr9PQyM0FffM9q9ShJPlP4 -S7y2bUfEseyN6dsezNnUtwi3YrDNm8sQz0moOTrHjOCDsiuuuvDrIZiotwDU9wba -GT6nZBeoQkt8S5gugKKmBfwbfCWykQ5AtWJ/03oFHlFQnQq3nVqwmx1RAI6ZTvKU -KwCV8TlwXNPfoGgYhs0zEupIcErm4O1j3IKYGnCPjnR1PDyb82CRAqnTUj4SOnxD -9YKpD5OfuMAYl0PSx2qAfOYK4bRcmo/VbNM+GUVMyQ5eMBsN3+82iGdIXaWCo4MJ -0cAhx2cX+Oo30Q1VLTJPBSdCaEe3Mer7uYTd5/T7JrKIsOD88uTfPktHHBpPAo0V -w7DbSf3yfL6kDgRFLlHkvh9tdiT/RJEAQWjZe2hLuMdCxNZAHKS7S0RN1w/UEhqa -C4lNU/TFmyOfnI0abpu4G3PwMlHXC3JFhv+K226MMklFONIKh0sXrd+wyPx6vA5S -lfxbF3zx9C3HIg1XLCGholV0xcTwf8jz+GtCdsrGPKat ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/1124.pem wget-1.20.1/tests/certs/1124.pem --- wget-1.19.5/tests/certs/1124.pem 2017-05-03 19:22:59.000000000 +0000 +++ wget-1.20.1/tests/certs/1124.pem 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHPTCCBSWgAwIBAgICESQwDQYJKoZIhvcNAQEFBQAwgZkxCzAJBgNVBAYTAlVT -MQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxIDAeBgNVBAoMF1dnZXQg -VGVzdGluZyBEZXBhcnRtZW50MRAwDgYDVQQLDAdUZXN0aW5nMRQwEgYDVQQDDAtX -Z2V0VGVzdGluZzEgMB4GCSqGSIb3DQEJARYRYnVncy13Z2V0QGdudS5vcmcwIhcR -MTcwNTA0MjEyMjU3KzAyMDAXDTE5MDUwMzE5MjI1OVowYjEaMBgGA1UEAwwRV2dl -dFRlc3RpbmdTZXJ2ZXIxCzAJBgNVBAgMAkNBMQswCQYDVQQGEwJVUzEbMBkGCSqG -SIb3DQEJARYMc2VydmVydGVzdGVyMQ0wCwYDVQQKDARTZXJ2MIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAuFsLoizEGC1W49LPotfOwz/MZIS5YKdwy82j -StW4r00qmKcS6oEu5qNNIyIQWMA8A1pdpkYHE0lc0JG5POq+HK4FhI/rCVHwnVQB -Uu7hETqMd1GI1U7u2vt4d+Pl4IqE0cjwqc03BrG3HnuGgr4Qm/hf/msubZR1I/HO -0LbvLKoMHd6PMywaZ466YXF8Bw4f09l3Mb4NBDvepyY32itet9XUwSQZb2xhAnbt -knFDOdVHrqB8tQFCcz592Vmhj211RRWulLfqOHEsUMl/LSj3O3gS4ryG3P1zuTq6 -rCoWEIs6EmJfGymGElyHK1W3r6rNu3OrmAMMTlUmHMAEWItn0Ka90Jgsf4llkKV/ -1QNBmZLYRhSZL/jN+nWLE1kMHPNgRcTT1FF4FClOVoVJ0E9HntNG/iSOVvURJas4 -yUDtxAIK5kDEu7erdb9TVfr8sTMrAnv5cVuMROZtzfS9SLHrzIj10wg6JQCRYllu -U74NFCki/FgtjYA/rhnTeLb7LKhL+RAgFvIa4Grwt9A3As8zSZ7D5L/eWJZf57BB -caeJ0Da5/mK4KDRs7kJafDcVw/N97i0ui2x9oczr2eMdhgNz7QvKoDanOyUe9atm -XgwjyxHAPtFQ1yermhQMvxQPj4N+mUBKKCuu6sw/sJqS+XSo0sZSHArvDudMtYun -+Euny1kCAwEAAaOCAb8wggG7MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFB6+ -afdPSR8T7qosYRrCq5LG+8thMB8GA1UdIwQYMBaAFBftk0OPp6YAddTotoINiDd+ -wG0IMAsGA1UdDwQEAwIBpjATBgNVHSUEDDAKBggrBgEFBQcDATBdBgNVHR8EVjBU -MCigJqAkhiJodHRwOi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMCigJqAk -hiJodHRwOi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMBwGA1UdEQQVMBOC -EVdnZXRUZXN0aW5nU2VydmVyMIHIBggrBgEFBQcBAQSBuzCBuDAuBggrBgEFBQcw -AoYiaHR0cDovL3Rlc3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAuBggrBgEFBQcw -AoYiaHR0cDovL3Rlc3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAqBggrBgEFBQcw -AYYeaHR0cDovL3Rlc3Qud2dldHRlc3QuY29tL29jc3AvMCoGCCsGAQUFBzABhh5o -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vb2NzcC8wDQYJKoZIhvcNAQEFBQADggIB -AElsbN+NybTrwN6gWz7BcICxi27XkajRIuNcxA1S3Enc+9eVtfoWoS//x4LEEfLO -c6zNAUWJ8pMKzDGFc8z2KXiareTjuVfKFxk8F6RYv3nnpFmIHUS+jJlaVloTl3P/ -fqO7xNWKPQh9aHn8j2CNxlCoCBxgB0nI7TGX51XTlWjzyHDd6roGPm4PnpsyEsCv -p9AAXDE1CUUXZvG7UjuleBuOji1wphsR4q1zMtaDjVJ+VRX7RpWU+q/BnMDxQWeu -1TxJAROzyrAFgLkiiy25FUdhHmtHECRIZ4w5OrPjblyobAkgO32LwIYjG/2bOWbS -wVI1YWTS1gBvOf3EEopVKEWx27ehfaLqyLg7JuSSYtypd2GjCkeuEuvV8zsQpKBU -gh5AocK9FMzKEsN6A1MNm/fhGNEtjme8B8UtCn4qjVkcTVjooQgThmRoXTevSP0o -v+IB36m6hLMe2X5IJdJGDaLHCQIid31/ykpblSeMuPxoIq9fPQY2wLierzQpzCgI -rVeCVUbrx5ssvCZr3nPUNAPJLwwbGww9vec7Gor4tXmpS8HwsplAcNClomZ+y3MH -mxOzCPhkmd/3UgQSIJHXXNOH5Sz7aXPKAA0iORAcjbjp6NkJrCSybsbAy9zVRZQ6 -i2VFhFOmQ3kNhcPvLSxKqLYn7kSy0sJlUIhfPqWmEsxt ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/1125.pem wget-1.20.1/tests/certs/1125.pem --- wget-1.19.5/tests/certs/1125.pem 2017-05-03 19:22:57.000000000 +0000 +++ wget-1.20.1/tests/certs/1125.pem 1970-01-01 00:00:00.000000000 +0000 @@ -1,149 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 4389 (0x1125) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=CA, L=San Jose, O=Wget Testing Department, OU=Testing, CN=WgetTesting/emailAddress=bugs-wget@gnu.org - Validity - Not Before: May 3 19:22:57 2017 GMT - Not After : May 3 19:22:57 2019 GMT - Subject: CN=Client Tester, ST=CA, C=US/emailAddress=clienttester, O=Client - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (4096 bit) - Modulus: - 00:bb:d4:e6:23:9b:a8:fe:d4:23:c1:da:c9:1c:47: - 99:a7:5a:79:87:db:a1:1c:90:fd:7e:af:d6:57:d0: - 73:ec:b7:1d:1f:d7:58:ca:7c:f5:f8:30:e4:bf:a2: - ad:e7:70:1b:87:82:6a:46:1e:53:11:0d:50:06:4b: - 2d:eb:69:2d:6c:e2:1b:81:22:10:6c:52:64:f1:c4: - b8:62:1c:1c:10:d0:99:fe:6b:15:9f:54:2b:88:97: - 55:90:6e:eb:10:6a:b7:ab:5f:2c:52:9f:86:c4:76: - a8:a7:ec:f4:49:f8:3e:c2:39:9a:a4:5f:4d:a7:a9: - 6a:30:0d:62:eb:e5:3f:be:b4:65:0a:36:98:af:53: - fb:57:9d:02:b2:f8:5d:74:50:30:5d:bb:15:82:e5: - 62:51:f7:38:48:d5:27:25:19:60:1d:de:bd:2f:41: - b3:c0:4d:49:0f:40:9a:e5:7f:f6:f7:79:e5:65:df: - de:f0:c1:3a:09:29:de:04:a0:ba:52:ec:a5:a2:ac: - 88:2c:d1:3e:6f:b3:41:3e:25:8b:0d:22:25:d6:e7: - 3c:24:5a:61:20:71:bb:1d:c2:4c:05:42:62:f9:d6: - 30:7d:4d:94:9b:64:ce:ee:be:ba:87:4e:9b:de:9a: - 0c:79:4b:a4:02:03:8e:0b:9c:70:df:a2:1e:5a:d7: - 81:5f:90:41:2f:33:31:93:69:f0:f2:c9:43:a5:b4: - 33:e0:52:03:f2:12:67:b2:b8:5b:0e:7b:29:74:c7: - 85:d4:48:16:ff:1d:42:7a:d6:6e:df:f0:e0:78:2f: - f8:e0:47:cd:c8:61:e5:e6:d1:40:27:0a:23:fd:ad: - 3a:72:82:23:92:0c:7e:7c:5e:7f:23:f8:8b:9e:33: - cd:cc:69:89:8a:a3:ac:54:ed:4f:8e:58:19:ad:5f: - 1f:66:b0:f2:27:85:c7:72:20:a9:87:51:a5:8a:c5: - 0f:87:39:59:58:59:11:25:8f:af:41:94:27:f3:4a: - 4b:37:2f:a9:f6:5c:30:3f:f2:13:d1:fa:5a:b5:d1: - 71:f1:93:b7:23:cc:ba:bc:ec:27:2d:e6:1c:4b:49: - 35:db:4a:f6:b1:30:f1:fc:38:e5:4f:81:5f:9a:fa: - 23:da:81:4d:44:83:e4:16:55:3a:2c:01:b8:24:f4: - 12:78:33:a9:c8:a9:f6:6c:1b:63:02:14:c1:52:8d: - ed:d2:58:85:29:33:4a:00:2f:f8:df:9b:c3:ee:ad: - a5:17:5e:ad:38:f3:71:b7:3f:a0:7b:71:44:8a:8c: - fa:ec:a8:09:a3:a7:32:f0:2d:31:38:98:b9:b6:7f: - 7e:31:f5:33:aa:3f:3a:31:65:63:ff:32:a9:32:84: - 10:08:c1 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Subject Key Identifier: - 2F:CA:66:1A:AB:84:CE:A5:F0:B5:93:C2:D3:F9:C7:B5:F6:04:25:B0 - X509v3 Authority Key Identifier: - keyid:17:ED:93:43:8F:A7:A6:00:75:D4:E8:B6:82:0D:88:37:7E:C0:6D:08 - - X509v3 Key Usage: - Digital Signature, Key Encipherment, Certificate Sign, CRL Sign - X509v3 Extended Key Usage: - TLS Web Server Authentication - X509v3 CRL Distribution Points: - - Full Name: - URI:http://test.wgettest.org/Bogus.crl - - Full Name: - URI:http://test.wgettest.org/Bogus.crl - - X509v3 Subject Alternative Name: - DNS:WgetTestingServer - Authority Information Access: - CA Issuers - URI:http://test.wgettest.com/Bogus.crt - CA Issuers - URI:http://test.wgettest.com/Bogus.crt - OCSP - URI:http://test.wgettest.com/ocsp/ - OCSP - URI:http://test.wgettest.com/ocsp/ - - Signature Algorithm: sha1WithRSAEncryption - 59:13:e3:35:61:da:54:f6:80:57:47:6d:87:ed:74:54:75:f7: - 8a:31:b8:6e:ce:cc:b7:c0:e3:5f:88:05:d3:06:4b:1a:9a:58: - d7:f8:2b:c0:ad:42:cb:4d:e0:01:79:15:68:a0:8e:54:f2:28: - c4:88:7c:55:e2:b0:d7:e9:3a:2e:28:f3:6a:34:08:42:89:0f: - b7:b5:ee:25:27:0e:b0:c6:86:1d:d0:fc:5e:dc:96:a5:e1:98: - 1d:91:14:5b:29:c9:17:e7:f6:4e:fb:73:69:31:83:56:ec:fc: - c4:3b:a8:f7:29:23:2c:1e:5a:81:91:89:fc:92:c3:a8:a6:fb: - 1f:b0:50:60:36:0a:3b:28:57:05:d1:28:b9:de:91:d9:62:0c: - 56:b3:df:af:3a:30:1f:26:bd:3a:1b:cf:92:c4:a9:ec:ee:88: - d5:fc:8b:42:d6:f1:9b:01:81:a2:3a:ae:43:69:89:9b:98:09: - 86:2f:a0:6f:5d:46:08:fd:57:71:39:26:a4:97:7f:7e:98:44: - 00:af:32:ca:99:a1:e7:f8:bc:a0:84:f6:1b:3c:f3:b8:56:2f: - 3c:a4:18:c3:7e:c0:a8:b6:43:d2:ab:e8:58:11:4d:ca:a0:da: - 2b:21:fd:e5:a7:c8:1c:b8:de:08:93:83:2b:37:b6:0c:bc:a0: - eb:3d:af:e1:f3:9d:aa:2c:12:f7:47:71:c2:f6:55:ab:0c:b1: - f3:ab:2e:98:b1:02:d9:ef:e1:33:f1:19:4b:3f:6b:c0:c5:fc: - d1:cc:4e:69:bc:42:2e:b4:50:7a:82:df:47:c7:56:52:fd:16: - a8:37:6b:1e:22:bc:05:f9:87:84:39:0b:cc:00:aa:6a:42:dc: - f0:6d:97:78:5c:05:c9:06:d0:5f:dd:fb:c7:95:39:c3:25:a7: - 2c:84:ac:4c:84:ab:4c:5f:2a:35:12:a3:94:cb:30:8b:25:e0: - e9:06:de:60:05:49:9c:d7:89:e9:e8:03:88:3d:3c:98:db:f7: - 5f:84:8c:20:2c:9f:ef:21:0c:23:38:40:23:38:a9:06:83:65: - 48:56:69:e0:c7:1f:e3:5a:05:7c:3f:cc:25:9e:fb:8b:ee:78: - 27:34:c0:bc:9f:e9:e4:ae:aa:88:a8:18:6d:81:ce:70:82:1e: - b4:4e:9b:c6:a4:50:bb:62:46:0a:02:17:f5:94:10:8c:78:94: - 75:60:54:1c:cf:4f:b8:46:42:94:b9:5e:7d:72:14:dd:89:d2: - 7f:0d:42:92:41:b4:bc:ea:f9:2c:ba:26:81:a1:17:46:ce:4f: - 00:85:a9:76:68:82:6f:a2:74:01:0d:39:0e:18:4a:d9:a3:e9: - 48:44:7e:7d:8e:00:b5:02 ------BEGIN CERTIFICATE----- -MIIHNzCCBR+gAwIBAgICESUwDQYJKoZIhvcNAQEFBQAwgZkxCzAJBgNVBAYTAlVT -MQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxIDAeBgNVBAoMF1dnZXQg -VGVzdGluZyBEZXBhcnRtZW50MRAwDgYDVQQLDAdUZXN0aW5nMRQwEgYDVQQDDAtX -Z2V0VGVzdGluZzEgMB4GCSqGSIb3DQEJARYRYnVncy13Z2V0QGdudS5vcmcwHhcN -MTcwNTAzMTkyMjU3WhcNMTkwNTAzMTkyMjU3WjBgMRYwFAYDVQQDDA1DbGllbnQg -VGVzdGVyMQswCQYDVQQIDAJDQTELMAkGA1UEBhMCVVMxGzAZBgkqhkiG9w0BCQEW -DGNsaWVudHRlc3RlcjEPMA0GA1UECgwGQ2xpZW50MIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAu9TmI5uo/tQjwdrJHEeZp1p5h9uhHJD9fq/WV9Bz7Lcd -H9dYynz1+DDkv6Kt53Abh4JqRh5TEQ1QBkst62ktbOIbgSIQbFJk8cS4YhwcENCZ -/msVn1QriJdVkG7rEGq3q18sUp+GxHaop+z0Sfg+wjmapF9Np6lqMA1i6+U/vrRl -CjaYr1P7V50CsvhddFAwXbsVguViUfc4SNUnJRlgHd69L0GzwE1JD0Ca5X/293nl -Zd/e8ME6CSneBKC6UuyloqyILNE+b7NBPiWLDSIl1uc8JFphIHG7HcJMBUJi+dYw -fU2Um2TO7r66h06b3poMeUukAgOOC5xw36IeWteBX5BBLzMxk2nw8slDpbQz4FID -8hJnsrhbDnspdMeF1EgW/x1CetZu3/DgeC/44EfNyGHl5tFAJwoj/a06coIjkgx+ -fF5/I/iLnjPNzGmJiqOsVO1PjlgZrV8fZrDyJ4XHciCph1GlisUPhzlZWFkRJY+v -QZQn80pLNy+p9lwwP/IT0fpatdFx8ZO3I8y6vOwnLeYcS0k120r2sTDx/DjlT4Ff -mvoj2oFNRIPkFlU6LAG4JPQSeDOpyKn2bBtjAhTBUo3t0liFKTNKAC/435vD7q2l -F16tOPNxtz+ge3FEioz67KgJo6cy8C0xOJi5tn9+MfUzqj86MWVj/zKpMoQQCMEC -AwEAAaOCAb8wggG7MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFC/KZhqrhM6l -8LWTwtP5x7X2BCWwMB8GA1UdIwQYMBaAFBftk0OPp6YAddTotoINiDd+wG0IMAsG -A1UdDwQEAwIBpjATBgNVHSUEDDAKBggrBgEFBQcDATBdBgNVHR8EVjBUMCigJqAk -hiJodHRwOi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMCigJqAkhiJodHRw -Oi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMBwGA1UdEQQVMBOCEVdnZXRU -ZXN0aW5nU2VydmVyMIHIBggrBgEFBQcBAQSBuzCBuDAuBggrBgEFBQcwAoYiaHR0 -cDovL3Rlc3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAuBggrBgEFBQcwAoYiaHR0 -cDovL3Rlc3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAqBggrBgEFBQcwAYYeaHR0 -cDovL3Rlc3Qud2dldHRlc3QuY29tL29jc3AvMCoGCCsGAQUFBzABhh5odHRwOi8v -dGVzdC53Z2V0dGVzdC5jb20vb2NzcC8wDQYJKoZIhvcNAQEFBQADggIBAFkT4zVh -2lT2gFdHbYftdFR194oxuG7OzLfA41+IBdMGSxqaWNf4K8CtQstN4AF5FWigjlTy -KMSIfFXisNfpOi4o82o0CEKJD7e17iUnDrDGhh3Q/F7clqXhmB2RFFspyRfn9k77 -c2kxg1bs/MQ7qPcpIyweWoGRifySw6im+x+wUGA2CjsoVwXRKLnekdliDFaz3686 -MB8mvTobz5LEqezuiNX8i0LW8ZsBgaI6rkNpiZuYCYYvoG9dRgj9V3E5JqSXf36Y -RACvMsqZoef4vKCE9hs887hWLzykGMN+wKi2Q9Kr6FgRTcqg2ish/eWnyBy43giT -gys3tgy8oOs9r+HznaosEvdHccL2VasMsfOrLpixAtnv4TPxGUs/a8DF/NHMTmm8 -Qi60UHqC30fHVlL9Fqg3ax4ivAX5h4Q5C8wAqmpC3PBtl3hcBckG0F/d+8eVOcMl -pyyErEyEq0xfKjUSo5TLMIsl4OkG3mAFSZzXienoA4g9PJjb91+EjCAsn+8hDCM4 -QCM4qQaDZUhWaeDHH+NaBXw/zCWe+4vueCc0wLyf6eSuqoioGG2BznCCHrROm8ak -ULtiRgoCF/WUEIx4lHVgVBzPT7hGQpS5Xn1yFN2J0n8NQpJBtLzq+Sy6JoGhF0bO -TwCFqXZogm+idAENOQ4YStmj6UhEfn2OALUC ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/certindex wget-1.20.1/tests/certs/certindex --- wget-1.19.5/tests/certs/certindex 2017-05-03 19:22:59.000000000 +0000 +++ wget-1.20.1/tests/certs/certindex 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -V 190503192258Z 1122 unknown /CN=WgetTestingServer/ST=CA/C=US/emailAddress=servertester/O=Serv -V 170502212257+0200 1123 unknown /CN=WgetTestingServer/ST=CA/C=US/emailAddress=servertester/O=Serv -V 190503192259Z 1124 unknown /CN=WgetTestingServer/ST=CA/C=US/emailAddress=servertester/O=Serv diff -Nru wget-1.19.5/tests/certs/certindex.attr wget-1.20.1/tests/certs/certindex.attr --- wget-1.19.5/tests/certs/certindex.attr 2017-05-03 19:22:59.000000000 +0000 +++ wget-1.20.1/tests/certs/certindex.attr 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -unique_subject = no diff -Nru wget-1.19.5/tests/certs/certindex.attr.old wget-1.20.1/tests/certs/certindex.attr.old --- wget-1.19.5/tests/certs/certindex.attr.old 2017-05-03 19:22:58.000000000 +0000 +++ wget-1.20.1/tests/certs/certindex.attr.old 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -unique_subject = no diff -Nru wget-1.19.5/tests/certs/certindex.old wget-1.20.1/tests/certs/certindex.old --- wget-1.19.5/tests/certs/certindex.old 2017-05-03 19:22:58.000000000 +0000 +++ wget-1.20.1/tests/certs/certindex.old 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -V 190503192258Z 1122 unknown /CN=WgetTestingServer/ST=CA/C=US/emailAddress=servertester/O=Serv -V 170502212257+0200 1123 unknown /CN=WgetTestingServer/ST=CA/C=US/emailAddress=servertester/O=Serv diff -Nru wget-1.19.5/tests/certs/certserial wget-1.20.1/tests/certs/certserial --- wget-1.19.5/tests/certs/certserial 2017-05-03 19:22:59.000000000 +0000 +++ wget-1.20.1/tests/certs/certserial 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -1125 diff -Nru wget-1.19.5/tests/certs/certserial.old wget-1.20.1/tests/certs/certserial.old --- wget-1.19.5/tests/certs/certserial.old 2017-05-03 19:22:58.000000000 +0000 +++ wget-1.20.1/tests/certs/certserial.old 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -1124 diff -Nru wget-1.19.5/tests/certs/client-cert.pem wget-1.20.1/tests/certs/client-cert.pem --- wget-1.19.5/tests/certs/client-cert.pem 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/client-cert.pem 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEojCCAwqgAwIBAgIMW+WWpC75FINCVgviMA0GCSqGSIb3DQEBCwUAMFIxDTAL +BgNVBAMTBFdnZXQxDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTERMA8GA1UE +CBMIU3Vuc2hpbmUxETAPBgNVBAYTCEZyZWVsYW5kMCAXDTE4MTEwOTE0MTYwNFoY +Dzk5OTkxMjMxMjM1OTU5WjBSMQ0wCwYDVQQDEwRXZ2V0MQ0wCwYDVQQLEwRXZ2V0 +MQwwCgYDVQQKEwNHTlUxETAPBgNVBAgTCFN1bnNoaW5lMREwDwYDVQQGEwhGcmVl +bGFuZDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAM9Y7Xzh1QnHbO1q +7kc/4mK0xhsldkMMD4Zg15dXUww6w1wso4gUv7F3IbJywyd6nTK+5rt+mMPiQaGI +3pFGS3o2/AvFemrbyw9unifeAWEvioHH0Hsfxk2+M1sToWAgHwSCzEkYt9Vs/LIe +efQxFTJPsEw4B3Sk+iySZPujsOP6he5kHKSw4QHHJqM4sbaOE3XejFb/IX/eOkH6 ++VvW5o0fILIyw0eTFs5sGf6dBj0DMdSyHzo8v3svjSLil5ryE97CYlSHQJLCGKUm +BVMBhyhBGCzCmL2TdfMy7JY6t+9nvpmpPJ4QEyHMIvnebKFGTpDn+9niJDj6ZWcb +P2m0yRMB7a6kWAFP8Fk9dCLP0FZQz+qJH/JkKRt7+Kjs5ZMtLJor1UlSJpBVouyz +Ig0nf1qy92Uv3QoOCqCU3yIxsa3MsV32RSO0S6Ii3MlpF/3Wufgmdd7vRRgsHnq5 +WD9fdNPRxUPin7SmJMJQg4SY4XBPBHNEKVp8d2OlpTw3miZZAQIDAQABo3YwdDAM +BgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA8GA1UdDwEB/wQFAwMH +oAAwHQYDVR0OBBYEFG1jBA//1vnWiPseRPqA50QHSGbpMB8GA1UdIwQYMBaAFJ4O +WyKM+9KPJ1PV1goMyw1ZD2SYMA0GCSqGSIb3DQEBCwUAA4IBgQBovKzuJjbQD7Mk +GOKj9HQhJeGEvn6MEi1c0o3KWgOm8D2PA78Uq++JJKBxowD7WSCmSNVDltJzDWQO +FFpIiWkvaOH11JeXhmf4kYsRsSRVlgUEj5SEqZn5lMxX7sIHHr9QmNdFqQgKVM2V +4qIg233MiOA3RUV6IsP0XgGdhFjqZ61bDyEZ48pdiRhg/iuI0yIiFRnJsthUl3LU +D0fVgP2/4gTWvUTvVNrR8yH6Ou4bcOovWp+8y5J2KKwMD+6QKKP5DVhZOighdKI+ +v5F3aS1/DbazHs8NFcuuHntDq/gEdjn7IHGcyIhe5NWzExOejTx0yOGX8Q6dTqLw +UUltfqZk1QsgsBilR9Dk9A7AGy5VonknFvwS+HqUSruR6OwKTsqq6KIlfbpgpkj3 +YiO8BlhhfwG2K9rpdToywZDNS2RKAY1rjjFw3lwiK+qcE6KanJbMKZO9kpstMYlS +z4E2sTUOL5pfVRPngJrOJwQSUe+JWS55zFpv6bt80VGWNcPkJLY= +-----END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/client.crt wget-1.20.1/tests/certs/client.crt --- wget-1.19.5/tests/certs/client.crt 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/certs/client.crt 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 4386 (0x1122) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=CA, L=San Jose, O=Wget Testing Department, OU=Testing, CN=WgetTesting/emailAddress=bugs-wget@gnu.org - Validity - Not Before: May 9 21:08:52 2017 GMT - Not After : May 9 21:08:52 2019 GMT - Subject: CN=., ST=CA, C=US, O=Client - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (4096 bit) - Modulus: - 00:c8:e0:0f:fd:d5:96:99:1d:f5:8e:4a:d7:84:85: - fc:48:8b:e4:cf:78:27:22:ea:1b:b4:4e:f0:a2:05: - 29:78:37:43:42:17:fe:8d:98:4b:4b:8a:f6:b2:92: - 23:2c:f2:af:c8:9d:36:57:03:90:82:00:02:0c:f8: - 33:14:f2:5c:5f:cc:8f:f8:14:b5:df:a8:e3:0d:d1: - bf:5a:f2:8d:24:37:66:1a:31:99:7e:f7:8d:8e:86: - fd:ea:a6:73:60:84:dc:1c:d9:28:87:92:9f:cf:c4: - 8e:9f:2b:ce:c3:8a:20:ce:8d:5b:66:fe:78:f1:bd: - 7b:57:b1:ad:bc:db:8c:0a:a8:92:c1:92:5d:6f:b9: - 5f:7f:c7:62:4d:59:60:48:8e:1f:a3:02:2f:79:26: - 68:6f:ed:0a:95:07:c8:e5:9a:93:ba:cb:af:c7:a9: - 06:a7:99:b4:ce:1f:26:b7:d5:f6:bd:b4:b2:ad:14: - fe:df:8c:41:94:d4:d2:41:18:43:fe:19:0e:43:67: - 10:8a:ac:f1:47:1c:5a:71:ed:d7:76:aa:67:81:67: - 1d:6f:77:db:c1:93:ee:36:ec:34:6f:c8:97:73:57: - 09:dc:9a:b8:54:35:ae:a3:91:2a:5d:f3:e4:70:77: - 7c:bc:0d:d8:f5:a2:f0:2d:b2:ba:3e:b6:ce:8a:30: - 16:ea:6d:20:b8:ac:dd:eb:3c:a5:62:c5:7d:3a:ef: - df:64:83:a7:ab:a1:c3:65:7a:54:fc:a4:26:0f:64: - a5:83:ed:29:8f:05:ef:aa:2f:98:af:87:98:87:34: - a7:31:55:09:75:37:7d:70:c3:44:14:c4:05:b2:f8: - 6b:6b:25:b4:55:d5:fe:29:3f:ab:f0:d1:e6:3f:dc: - e9:c6:83:5d:f5:4a:ca:34:e0:3d:52:a4:dd:86:09: - e5:3e:b3:9e:f3:79:99:af:b1:6b:7e:6e:c8:0d:04: - 28:fa:38:59:94:71:3c:d2:39:84:a5:56:41:ae:8c: - 63:2d:5c:9b:79:ce:f0:a6:69:6c:74:b7:36:e9:87: - 67:ad:5b:61:6f:d2:53:d4:7a:94:e1:26:29:d0:56: - 02:f5:6e:15:dc:a9:0b:e6:37:2a:32:9c:35:f3:72: - 2d:3d:e2:d4:25:48:a9:d0:c9:7b:cb:1a:4d:c1:44: - 5c:57:ab:75:65:ae:06:b2:40:b6:55:a8:2e:fb:fa: - 6e:0b:75:eb:86:02:ea:63:fe:9a:74:9d:02:4b:60: - 95:ef:53:04:13:87:07:6a:52:64:ba:e6:40:09:ab: - a9:50:a3:12:ce:75:51:35:af:37:34:60:6a:e9:d7: - 3c:00:2b:4a:92:75:48:f3:4a:26:13:08:04:d0:47: - 05:a1:07 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Subject Key Identifier: - 41:CD:E0:FB:C1:87:D6:77:38:B5:A3:94:8A:D0:5B:5C:87:70:32:E9 - X509v3 Authority Key Identifier: - keyid:17:ED:93:43:8F:A7:A6:00:75:D4:E8:B6:82:0D:88:37:7E:C0:6D:08 - - X509v3 Key Usage: - Digital Signature, Key Encipherment, Certificate Sign, CRL Sign - X509v3 Extended Key Usage: - TLS Web Server Authentication - X509v3 CRL Distribution Points: - - Full Name: - URI:http://test.wgettest.org/Bogus.crl - - Full Name: - URI:http://test.wgettest.org/Bogus.crl - - X509v3 Subject Alternative Name: - DNS:WgetTestingServer - Authority Information Access: - CA Issuers - URI:http://test.wgettest.com/Bogus.crt - CA Issuers - URI:http://test.wgettest.com/Bogus.crt - OCSP - URI:http://test.wgettest.com/ocsp/ - OCSP - URI:http://test.wgettest.com/ocsp/ - - Signature Algorithm: sha1WithRSAEncryption - 46:a4:f3:c2:63:cf:c3:76:84:aa:a3:ba:27:32:25:15:54:e6: - 69:d2:2f:7c:c9:68:88:01:10:8c:0d:4e:f7:3c:cc:e5:7f:e6: - 87:55:e9:80:69:e0:05:cb:40:84:65:cc:4d:35:f3:a0:6a:95: - 28:08:cb:95:16:9c:2b:d2:15:5b:d7:43:81:e1:ff:7e:e0:0f: - d7:25:01:f5:3d:d5:0f:88:15:1b:59:5f:6f:31:75:03:19:2b: - 24:5a:d4:b4:e8:1a:19:81:c9:c6:b9:e2:b2:cb:dc:fd:b3:fc: - 18:ec:76:68:2d:9e:78:41:31:0b:c0:f2:ca:70:93:66:6b:97: - cf:b8:8e:69:3e:86:63:7b:12:40:8f:1b:de:25:2a:a7:97:83: - 4f:a1:7e:0b:07:15:bb:42:e9:a0:a8:80:17:c2:75:a9:35:e6: - 57:bf:09:83:71:b5:51:3b:95:37:79:d6:8b:4e:96:86:22:d3: - 54:53:ac:af:ea:ec:0c:58:4c:18:11:4d:77:35:ae:40:7c:6d: - 5d:c5:36:46:19:fa:d9:83:76:cf:e6:70:69:3a:32:a3:0c:4f: - 6f:28:18:0d:6a:d3:47:b4:e8:e3:77:a8:90:0d:74:08:f1:4e: - 68:45:27:fc:22:57:ad:63:92:7c:fd:bf:44:ad:ec:be:12:42: - 49:b9:e0:23:2c:95:98:f2:d3:07:a3:00:6a:4f:eb:3d:8b:6d: - c6:0a:ef:1e:c8:71:1b:d2:3b:2e:81:86:5b:36:05:6a:f4:3f: - 25:cc:4a:d1:a4:d9:f6:8e:6d:a2:db:54:1e:c5:1b:dd:44:e3: - fc:0b:8b:8c:84:7d:e0:bf:1b:d4:53:3e:ab:31:fd:f4:25:1f: - 29:b9:55:f0:92:0e:fe:ab:46:cc:a1:50:96:10:6a:d9:c0:cd: - 6d:c1:e9:86:77:7e:ef:93:bf:be:03:21:87:d9:dc:36:53:41: - f6:a6:6c:f2:23:ee:be:34:4a:2e:95:29:09:7d:8f:1a:10:d2: - ff:a5:6b:26:93:e1:83:da:be:22:fd:7f:14:f2:1c:03:f5:64: - f8:75:00:f0:da:5e:78:e3:07:90:a0:4a:16:1c:31:70:09:b5: - 46:4d:71:42:64:19:b0:53:ce:27:f7:9a:34:5d:c4:df:7d:06: - bf:af:8e:c2:9a:19:c1:f9:90:36:eb:41:0c:2c:3d:51:22:bb: - 18:eb:ed:0b:5c:92:15:60:79:42:be:c1:f6:f1:46:29:c9:6c: - 0a:ba:f9:4c:46:44:1e:32:7d:83:df:55:b1:31:1f:c2:db:22: - a4:bd:2d:79:d1:ca:a1:80:12:ce:5a:26:68:54:8b:d3:f4:8b: - cf:45:d3:57:92:70:b6:7c ------BEGIN CERTIFICATE----- -MIIHDjCCBPagAwIBAgICESIwDQYJKoZIhvcNAQEFBQAwgZkxCzAJBgNVBAYTAlVT -MQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxIDAeBgNVBAoMF1dnZXQg -VGVzdGluZyBEZXBhcnRtZW50MRAwDgYDVQQLDAdUZXN0aW5nMRQwEgYDVQQDDAtX -Z2V0VGVzdGluZzEgMB4GCSqGSIb3DQEJARYRYnVncy13Z2V0QGdudS5vcmcwHhcN -MTcwNTA5MjEwODUyWhcNMTkwNTA5MjEwODUyWjA3MQowCAYDVQQDDAEuMQswCQYD -VQQIDAJDQTELMAkGA1UEBhMCVVMxDzANBgNVBAoMBkNsaWVudDCCAiIwDQYJKoZI -hvcNAQEBBQADggIPADCCAgoCggIBAMjgD/3Vlpkd9Y5K14SF/EiL5M94JyLqG7RO -8KIFKXg3Q0IX/o2YS0uK9rKSIyzyr8idNlcDkIIAAgz4MxTyXF/Mj/gUtd+o4w3R -v1ryjSQ3ZhoxmX73jY6G/eqmc2CE3BzZKIeSn8/Ejp8rzsOKIM6NW2b+ePG9e1ex -rbzbjAqoksGSXW+5X3/HYk1ZYEiOH6MCL3kmaG/tCpUHyOWak7rLr8epBqeZtM4f -JrfV9r20sq0U/t+MQZTU0kEYQ/4ZDkNnEIqs8UccWnHt13aqZ4FnHW9328GT7jbs -NG/Il3NXCdyauFQ1rqORKl3z5HB3fLwN2PWi8C2yuj62zoowFuptILis3es8pWLF -fTrv32SDp6uhw2V6VPykJg9kpYPtKY8F76ovmK+HmIc0pzFVCXU3fXDDRBTEBbL4 -a2sltFXV/ik/q/DR5j/c6caDXfVKyjTgPVKk3YYJ5T6znvN5ma+xa35uyA0EKPo4 -WZRxPNI5hKVWQa6MYy1cm3nO8KZpbHS3NumHZ61bYW/SU9R6lOEmKdBWAvVuFdyp -C+Y3KjKcNfNyLT3i1CVIqdDJe8saTcFEXFerdWWuBrJAtlWoLvv6bgt164YC6mP+ -mnSdAktgle9TBBOHB2pSZLrmQAmrqVCjEs51UTWvNzRgaunXPAArSpJ1SPNKJhMI -BNBHBaEHAgMBAAGjggG/MIIBuzAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRB -zeD7wYfWdzi1o5SK0Ftch3Ay6TAfBgNVHSMEGDAWgBQX7ZNDj6emAHXU6LaCDYg3 -fsBtCDALBgNVHQ8EBAMCAaYwEwYDVR0lBAwwCgYIKwYBBQUHAwEwXQYDVR0fBFYw -VDAooCagJIYiaHR0cDovL3Rlc3Qud2dldHRlc3Qub3JnL0JvZ3VzLmNybDAooCag -JIYiaHR0cDovL3Rlc3Qud2dldHRlc3Qub3JnL0JvZ3VzLmNybDAcBgNVHREEFTAT -ghFXZ2V0VGVzdGluZ1NlcnZlcjCByAYIKwYBBQUHAQEEgbswgbgwLgYIKwYBBQUH -MAKGImh0dHA6Ly90ZXN0LndnZXR0ZXN0LmNvbS9Cb2d1cy5jcnQwLgYIKwYBBQUH -MAKGImh0dHA6Ly90ZXN0LndnZXR0ZXN0LmNvbS9Cb2d1cy5jcnQwKgYIKwYBBQUH -MAGGHmh0dHA6Ly90ZXN0LndnZXR0ZXN0LmNvbS9vY3NwLzAqBggrBgEFBQcwAYYe -aHR0cDovL3Rlc3Qud2dldHRlc3QuY29tL29jc3AvMA0GCSqGSIb3DQEBBQUAA4IC -AQBGpPPCY8/DdoSqo7onMiUVVOZp0i98yWiIARCMDU73PMzlf+aHVemAaeAFy0CE -ZcxNNfOgapUoCMuVFpwr0hVb10OB4f9+4A/XJQH1PdUPiBUbWV9vMXUDGSskWtS0 -6BoZgcnGueKyy9z9s/wY7HZoLZ54QTELwPLKcJNma5fPuI5pPoZjexJAjxveJSqn -l4NPoX4LBxW7QumgqIAXwnWpNeZXvwmDcbVRO5U3edaLTpaGItNUU6yv6uwMWEwY -EU13Na5AfG1dxTZGGfrZg3bP5nBpOjKjDE9vKBgNatNHtOjjd6iQDXQI8U5oRSf8 -IletY5J8/b9Erey+EkJJueAjLJWY8tMHowBqT+s9i23GCu8eyHEb0jsugYZbNgVq -9D8lzErRpNn2jm2i21QexRvdROP8C4uMhH3gvxvUUz6rMf30JR8puVXwkg7+q0bM -oVCWEGrZwM1twemGd37vk7++AyGH2dw2U0H2pmzyI+6+NEoulSkJfY8aENL/pWsm -k+GD2r4i/X8U8hwD9WT4dQDw2l544weQoEoWHDFwCbVGTXFCZBmwU84n95o0XcTf -fQa/r47CmhnB+ZA260EMLD1RIrsY6+0LXJIVYHlCvsH28UYpyWwKuvlMRkQeMn2D -31WxMR/C2yKkvS150cqhgBLOWiZoVIvT9IvPRdNXknC2fA== ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/client.key wget-1.20.1/tests/certs/client.key --- wget-1.19.5/tests/certs/client.key 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/certs/client.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKQIBAAKCAgEAyOAP/dWWmR31jkrXhIX8SIvkz3gnIuobtE7wogUpeDdDQhf+ -jZhLS4r2spIjLPKvyJ02VwOQggACDPgzFPJcX8yP+BS136jjDdG/WvKNJDdmGjGZ -fveNjob96qZzYITcHNkoh5Kfz8SOnyvOw4ogzo1bZv548b17V7GtvNuMCqiSwZJd -b7lff8diTVlgSI4fowIveSZob+0KlQfI5ZqTusuvx6kGp5m0zh8mt9X2vbSyrRT+ -34xBlNTSQRhD/hkOQ2cQiqzxRxxace3XdqpngWcdb3fbwZPuNuw0b8iXc1cJ3Jq4 -VDWuo5EqXfPkcHd8vA3Y9aLwLbK6PrbOijAW6m0guKzd6zylYsV9Ou/fZIOnq6HD -ZXpU/KQmD2Slg+0pjwXvqi+Yr4eYhzSnMVUJdTd9cMNEFMQFsvhrayW0VdX+KT+r -8NHmP9zpxoNd9UrKNOA9UqTdhgnlPrOe83mZr7Frfm7IDQQo+jhZlHE80jmEpVZB -roxjLVybec7wpmlsdLc26YdnrVthb9JT1HqU4SYp0FYC9W4V3KkL5jcqMpw183It -PeLUJUip0Ml7yxpNwURcV6t1Za4GskC2Vagu+/puC3XrhgLqY/6adJ0CS2CV71ME -E4cHalJkuuZACaupUKMSznVRNa83NGBq6dc8ACtKknVI80omEwgE0EcFoQcCAwEA -AQKCAgADk7HVNEt1OIpZ2U1TJ8uhQxR0+U/BGGgb4tf4Gp1tbZZ+A81dmhulIblY -3q9PqpakvN/t1rtpBTUEJBtMwTAR6KObqErAy9IXOeftZ6pJvc7Mopt4HlJf+lll -J0egrVz6CoflOiAsY/SiMvaAluIUq4G4KMngjB45JonQdhxdSDksxz1wst1XeiZu -+Ct1v0oi7fQIdT2g2Ji6pKPYKtN8nQnpRUJAE8WbcgSPe3jkUeZonJoZQvcb/los -HJGBYdLWMmyh+4hkWsXlh3WxwEENldd5V6oLHWY9hiE86FaCEEe1rO+hWD9e3EPj -3mbv9cC73IdDgH5EYg1c9oZhAZA23lvH1u8yFpfPAOdvl0X2T6rSmd0zWrrWpKem -yoghSaW9rpWsM6rwI/B+gZlgwQQHLcRVrNJuXW7kTqRQnD+y9EM8HNddkNjmI6Op -z135xRR4JNX15b1CCgiVWoHO/o/U/ivMRo4zjaoASxUB50TX9C+HTVY75Sr7tSAb -v9/+8TWrCWJVXrCg/SddPF1DfBrpSPR77wa/zoD9IY7MHwnrmgdDt5I59Faa0KDF -F1E0RLsVUUS8byLNcb26KpWUJQRi6ILr8KDQ+iVbk6QE/TqVQ5oxwmaa7dRdAL5s -ao8gKU8XiGezbXFtN22adTEGIUPBAxGBcuEr8CYqlX1Gz0YvmQKCAQEA6wpdT6OZ -s4bYuuMJiXxSwSSmXuqslP6JDSWliqznsJJnfn2Dy4+d945DRAE24IDgzJdrPtWv -MfgRFJOG7Gri+7eVlLR7H+zfKnge/lOsdmVdBCrTiqTNt0XhAKZAEAq9j+4/5GMF -bj9Mt9LUN12YgmVnWIfLgGDfQA0B5sTUjQwaSImAv4s24MLXW+sE8Jzq+k3C5u44 -oWqmU1LEBGqXVamtlM8xIRKghWVofeAVKjkGdUBrPptIEwYMAWub40Q2I9G7w5cF -PGSFn51R8ahLOGICE42n3Aus0N6iDsNvDc2EdlR0NIKT0sbkya/sy9jgDLg1UhkG -LJblXa5OXCDmWwKCAQEA2snBNmRuiczN43VzRgTVS840Ri46Hhx1BGaKRwNmGiTK -4p/TLSnL1MgjdBLs/M678srxTSCzQX1YuV6G3p708ez+Q1IwHAuWiwBc7bmHHgxj -v4gimIrPux+cMtOEmyxUL8s9leqZflGqoc3UILNNq9QcrVITcEkwCNqdpDk9vmii -l54bjwuyad7IyFe7txIzLzNib5bbrK+t/R10RuvHKPaAeLDa1kDvwyOQa5ImRHWt -yg1Kj63lVBwXJv+K6d+Z/NFMgT7fVJk70j6WcKfEcufyYdKzhkj+ai1wJzeQplu4 -+x2YFS9ygonISPge+55LJ3PCLj0g0MIhPK+BI32nxQKCAQEA4HUDa1x3GeT68G6E -2xEpDl3rq9U8fwUc6Ls8/dPlZtBJmZhP1oQOfS0Uu8rVF0y8YWVw+46hQnz+AsJo -JTpmDbDiXiKFOpXBARO5tXM+zco7LBGh91MvSYioOTCLGUbIhL0nsvmFZCV7JElo -dH8jd9NTAE6eXrkkOkyxtineOdyG9SKrG0DdZYNsmtEz5HxWQjckm9h/qFbrA8OU -ggsw/pONuwCqkETzmrCfOyZVz/6pVivwvtcX22L48BpNwpmPgmF2iHCehXAR074v -VTI8s1mVVgr/dLqJjOYvqR2l3m6Xw1EfsE3K0Y0zTBB/eKRiQoNgGEjhho+L9wzQ -tFaO5QKCAQEAmYvCh5PQZ/FOBXYmIlu9/eeHlEFZFEzQavgzz0a5X1u273lPUYDl -xj13dDzcCUhlay22T3TFmQ6JN/75FD/mk+rJPyHtFaGkU4U7srLj+tijIIZAEWJK -C39RtfHwPJ7NroUqgY4VjyttXwT+/LwZpJ/GSHUzozgZ9/zFab2qcXkpstKJcMi6 -u8ZYjxHTcdXaCiQ7zyjGntjkeKE1O5i5OyxUWV91FayZGBBbiMMXDDCyePz++PsH -2RGlxf7N1PjSLzYMRSCEx/CKpTC7j/CN1D6oQrMGvxV3R7j/3uYGJFp25fWNCEE2 -Uhq0b1GDHP+oqtV4z86iux+jB937+ZZ0KQKCAQBetr8pywp3jftYVhGU9+VZxYc/ -2vM5+WEdOqJAoHwXed5AMHReycKUmbDilWbswXyiBDGmIokoMKP09JMXfCbHMTkX -LZCsxFGUpzAGg7sHI1NLTqWGU+fOmtzg7SJ77tZqJj1zzmgLX54oQ9qx53V6StWV -Zw7YxkRbnLQ+LZU0HyYb11v5oh1CnWUoGINMkV6Bhv+jPCzUP/vs4/JgOFqhwjlN -GVX0ewFGykinTK34ia9TI1Updgb3FWt3i9+twwAis1nnnuHt19tdi22BPwAuyFPx -hsf5t4Kcm8xibjeHzQMLqP4v2arW09zsg5kDTQHoQDcUajJ+cdbpY2PeosfN ------END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/client-key.pem wget-1.20.1/tests/certs/client-key.pem --- wget-1.19.5/tests/certs/client-key.pem 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/client-key.pem 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,182 @@ +Public Key Info: + Public Key Algorithm: RSA + Key Security Level: High (3072 bits) + +modulus: + 00:cf:58:ed:7c:e1:d5:09:c7:6c:ed:6a:ee:47:3f:e2 + 62:b4:c6:1b:25:76:43:0c:0f:86:60:d7:97:57:53:0c + 3a:c3:5c:2c:a3:88:14:bf:b1:77:21:b2:72:c3:27:7a + 9d:32:be:e6:bb:7e:98:c3:e2:41:a1:88:de:91:46:4b + 7a:36:fc:0b:c5:7a:6a:db:cb:0f:6e:9e:27:de:01:61 + 2f:8a:81:c7:d0:7b:1f:c6:4d:be:33:5b:13:a1:60:20 + 1f:04:82:cc:49:18:b7:d5:6c:fc:b2:1e:79:f4:31:15 + 32:4f:b0:4c:38:07:74:a4:fa:2c:92:64:fb:a3:b0:e3 + fa:85:ee:64:1c:a4:b0:e1:01:c7:26:a3:38:b1:b6:8e + 13:75:de:8c:56:ff:21:7f:de:3a:41:fa:f9:5b:d6:e6 + 8d:1f:20:b2:32:c3:47:93:16:ce:6c:19:fe:9d:06:3d + 03:31:d4:b2:1f:3a:3c:bf:7b:2f:8d:22:e2:97:9a:f2 + 13:de:c2:62:54:87:40:92:c2:18:a5:26:05:53:01:87 + 28:41:18:2c:c2:98:bd:93:75:f3:32:ec:96:3a:b7:ef + 67:be:99:a9:3c:9e:10:13:21:cc:22:f9:de:6c:a1:46 + 4e:90:e7:fb:d9:e2:24:38:fa:65:67:1b:3f:69:b4:c9 + 13:01:ed:ae:a4:58:01:4f:f0:59:3d:74:22:cf:d0:56 + 50:cf:ea:89:1f:f2:64:29:1b:7b:f8:a8:ec:e5:93:2d + 2c:9a:2b:d5:49:52:26:90:55:a2:ec:b3:22:0d:27:7f + 5a:b2:f7:65:2f:dd:0a:0e:0a:a0:94:df:22:31:b1:ad + cc:b1:5d:f6:45:23:b4:4b:a2:22:dc:c9:69:17:fd:d6 + b9:f8:26:75:de:ef:45:18:2c:1e:7a:b9:58:3f:5f:74 + d3:d1:c5:43:e2:9f:b4:a6:24:c2:50:83:84:98:e1:70 + 4f:04:73:44:29:5a:7c:77:63:a5:a5:3c:37:9a:26:59 + 01: + +public exponent: + 01:00:01: + +private exponent: + 15:5e:52:cb:45:f2:d0:99:2e:ce:a0:f0:81:83:41:ef + 6e:35:e4:62:4d:f7:c6:ec:6a:aa:dc:4d:0a:80:d2:87 + d3:ce:52:03:60:68:d3:00:95:08:71:fd:85:c3:31:cd + b5:87:1a:fc:43:a5:b6:ba:40:8d:47:2f:b8:c5:07:ce + 46:90:5f:1e:30:e9:86:51:3c:fb:e7:6c:b0:62:70:03 + 98:40:9b:b9:0e:97:4d:b6:81:5d:85:8b:56:5c:33:b3 + 3e:a1:c4:2f:dc:4e:45:be:7f:a4:53:a3:b9:d8:bd:18 + 7c:41:ec:f8:f1:3b:c2:2c:ce:1f:20:2d:16:c7:8a:17 + 2d:6a:4e:02:ed:ae:14:e2:3c:05:ed:58:50:68:41:e8 + 1b:83:9d:ee:f1:48:20:87:64:75:9c:49:ca:7f:31:2f + 65:ff:d6:9d:88:a6:7d:b0:22:01:de:03:f1:66:cd:2e + e1:19:cc:69:8f:74:e7:3e:e8:bd:a0:d4:bd:4f:08:97 + 77:f8:13:76:1c:c6:2e:2b:3d:93:f0:78:1b:f6:ff:c7 + 2f:59:8c:57:46:63:93:00:6f:c8:6e:5d:61:7e:f2:78 + 1a:de:42:2b:61:0c:77:33:a9:ca:57:1b:fa:57:fb:a1 + 11:fc:62:d1:6d:0b:b4:88:17:4b:b6:df:22:72:52:f0 + 29:fe:57:07:ed:ab:b3:b1:ce:94:aa:ed:7e:55:56:e2 + 1c:5b:cd:ce:bd:92:30:a0:29:af:45:13:28:1d:4d:0e + 6b:2e:8c:30:04:55:70:d0:af:a0:69:63:38:1b:24:7a + 02:e7:7e:a9:05:ee:82:01:23:7c:9d:4a:ef:16:8f:82 + e5:e3:c8:0e:4e:9b:d0:58:66:9d:3a:e7:f3:68:68:0d + 57:f4:a0:26:b0:84:fa:61:60:3b:3c:a7:aa:15:67:7a + 5c:dc:ca:9a:18:fc:c3:a9:be:ff:f5:a5:58:9f:75:d4 + 93:08:f8:23:fd:6e:25:05:23:b6:e2:29:f5:74:d7:81 + + +prime1: + 00:d3:13:55:70:ff:9d:91:c0:9f:6e:0b:2b:dc:b7:87 + 94:30:56:4d:01:0d:dc:48:db:39:7d:ec:45:b8:e8:65 + 76:1c:6c:04:25:f4:42:d0:9b:98:a9:ea:c4:45:05:e9 + 6f:7e:14:91:76:d5:3a:23:50:e6:77:d3:78:7d:0d:eb + b8:f2:bf:b8:14:61:e1:94:f2:1b:f7:cc:67:9b:7b:2c + ea:c6:06:fc:b6:9c:ac:c0:4f:be:2e:49:d7:eb:6a:58 + 4b:16:b5:36:d2:68:06:40:69:6d:3a:71:3e:ec:0d:ac + 40:b2:14:ce:09:3e:64:a8:8e:dc:77:ad:c6:b4:6f:7c + 69:ab:22:5a:06:fa:8c:b7:37:c2:ed:bd:40:14:98:83 + 23:50:cd:0d:49:4b:48:70:c5:57:7f:0f:01:ae:5c:6a + 98:08:19:56:cc:02:87:d8:d5:17:77:00:67:9e:4d:8d + a5:a5:84:d7:31:78:a7:ca:3d:82:0d:d2:c5:48:33:b6 + d9: + +prime2: + 00:fb:7a:76:40:d6:d8:08:74:ef:e2:59:d7:da:8a:24 + 08:d7:57:fb:c5:fc:c9:21:d1:e2:14:48:f1:d4:5a:1d + 80:06:27:63:ae:4e:89:40:65:91:04:bc:b0:1f:1e:34 + e1:96:fa:59:90:9d:96:42:17:b9:c4:ab:a8:8d:3b:3d + fc:b4:a5:9f:9a:04:63:c0:d9:4f:99:70:c3:df:da:28 + 21:76:4b:c6:d6:85:36:4d:7d:f3:a2:8b:42:df:00:d6 + 41:8d:48:18:f2:75:c8:7b:f6:33:13:c8:4e:91:21:3b + 4a:d8:b9:e6:0b:d6:61:c7:70:7d:78:a9:87:4a:90:19 + 87:34:fa:df:8e:56:dc:92:0e:b0:13:60:90:7a:52:c6 + 37:d1:a6:93:71:00:1a:dd:e4:ab:5d:b9:d8:2b:16:3c + 59:cb:5f:14:04:f7:6d:ab:06:f1:83:4b:92:b2:61:00 + 73:d1:7e:2f:d4:e0:28:6d:0b:1f:b9:74:2d:e1:7e:ea + 69: + +coefficient: + 00:c0:04:52:12:3b:e6:a3:0a:1a:95:d7:ad:7b:97:af + 68:4e:ee:38:4e:88:c3:45:05:d5:bd:5d:69:70:d3:20 + 90:cd:d3:d9:c3:49:ff:84:dd:36:c0:a0:6b:73:11:f0 + cb:55:6b:e2:11:76:7c:a3:4a:7e:9c:ac:0f:c9:aa:85 + 2e:95:f0:cc:07:20:b2:1f:54:2c:e8:20:a6:98:ac:e1 + 44:ec:e0:00:eb:aa:21:48:bb:45:45:39:6e:66:0c:91 + 29:32:25:83:f9:c6:34:d1:1b:b2:ac:49:ef:00:c6:19 + e2:d6:72:50:f8:ac:ff:2c:90:35:0f:1c:ec:35:fe:de + 3a:65:12:a0:3e:bd:94:c5:29:95:dd:0d:0e:4d:94:61 + ff:c3:68:01:6a:89:3c:03:fe:3e:31:80:3a:30:31:9b + 01:0f:30:30:97:48:fe:e7:fa:b2:da:02:e1:37:ca:18 + 34:a3:f8:4d:e8:ac:1b:a0:bb:e2:5d:73:3f:7d:81:79 + d6: + +exp1: + 00:98:4f:7c:39:25:0a:d3:d1:16:7a:76:ef:38:be:ea + c3:a1:39:b5:29:4c:92:27:b4:a1:c0:df:0c:d4:c8:45 + e6:bb:cd:aa:14:a5:34:cd:89:69:d9:3b:02:53:f8:57 + 21:4f:ee:91:a5:19:6a:71:6f:80:4e:f9:37:19:ae:40 + e9:dd:a9:40:b0:dc:8c:c6:49:0a:ab:7e:41:49:2d:d2 + 14:bb:be:f0:fe:e9:01:b3:68:17:89:19:5a:08:93:5d + 91:19:9a:bc:2b:8a:4a:f0:91:e2:f2:e8:23:0a:7d:37 + 4e:1b:f2:ed:56:38:42:b4:6b:1a:65:f5:ec:cb:e9:22 + f2:b1:3e:01:8e:c5:9f:62:da:86:fb:bc:b3:8f:e9:19 + c0:13:1f:54:36:0e:70:00:88:36:82:06:17:25:75:a4 + a9:7e:36:a2:ae:66:29:16:eb:75:9a:36:9d:8e:da:d1 + 9a:b5:5c:ad:58:12:83:a9:69:46:fe:a8:98:19:68:cf + c9: + +exp2: + 00:cd:0f:4e:de:10:52:98:92:c2:09:10:b9:b2:ba:72 + 27:c3:71:3b:1c:76:c4:8b:8f:59:8a:b0:f0:80:f7:fa + 96:2a:6e:74:19:ee:70:7c:d2:55:2e:47:ae:55:b1:8b + ed:67:ef:3c:99:6f:e6:d6:7e:02:3d:1c:bc:94:6d:7a + 5e:55:ef:b7:f5:1f:1f:38:61:fb:46:63:6d:55:5b:ce + dd:7a:58:d0:0a:9d:15:6a:9b:09:cf:c1:3f:06:18:e8 + 9d:0b:57:7f:00:36:8b:04:89:fd:9c:63:f9:ac:de:2c + 3b:1b:fe:7a:57:ac:b8:8e:a8:6b:a7:b8:95:59:77:a7 + 59:59:1a:38:b1:18:a3:43:76:36:9d:96:60:39:5e:c5 + c3:3e:71:56:49:0e:8c:d9:e3:5c:d9:50:71:b4:b0:ad + 05:8b:90:3c:02:d0:bf:dc:76:0c:f9:c2:e6:1c:0e:7d + 0f:f4:03:b1:7d:24:4b:d2:9e:ff:7f:79:fc:ef:a3:4e + 01: + + +Public Key PIN: + pin-sha256:WiIaPbDgZ234tiqBvORGWeUdOMl96+Vkd/bTbTgWXPU= +Public Key ID: + sha256:5a221a3db0e0676df8b62a81bce44659e51d38c97debe56477f6d36d38165cf5 + sha1:6d63040fffd6f9d688fb1e44fa80e744074866e9 + +-----BEGIN RSA PRIVATE KEY----- +MIIG5QIBAAKCAYEAz1jtfOHVCcds7WruRz/iYrTGGyV2QwwPhmDXl1dTDDrDXCyj +iBS/sXchsnLDJ3qdMr7mu36Yw+JBoYjekUZLejb8C8V6atvLD26eJ94BYS+KgcfQ +ex/GTb4zWxOhYCAfBILMSRi31Wz8sh559DEVMk+wTDgHdKT6LJJk+6Ow4/qF7mQc +pLDhAccmozixto4Tdd6MVv8hf946Qfr5W9bmjR8gsjLDR5MWzmwZ/p0GPQMx1LIf +Ojy/ey+NIuKXmvIT3sJiVIdAksIYpSYFUwGHKEEYLMKYvZN18zLsljq372e+mak8 +nhATIcwi+d5soUZOkOf72eIkOPplZxs/abTJEwHtrqRYAU/wWT10Is/QVlDP6okf +8mQpG3v4qOzlky0smivVSVImkFWi7LMiDSd/WrL3ZS/dCg4KoJTfIjGxrcyxXfZF +I7RLoiLcyWkX/da5+CZ13u9FGCweerlYP19009HFQ+KftKYkwlCDhJjhcE8Ec0Qp +Wnx3Y6WlPDeaJlkBAgMBAAECggGAFV5Sy0Xy0JkuzqDwgYNB72415GJN98bsaqrc +TQqA0ofTzlIDYGjTAJUIcf2FwzHNtYca/EOltrpAjUcvuMUHzkaQXx4w6YZRPPvn +bLBicAOYQJu5DpdNtoFdhYtWXDOzPqHEL9xORb5/pFOjudi9GHxB7PjxO8Iszh8g +LRbHihctak4C7a4U4jwF7VhQaEHoG4Od7vFIIIdkdZxJyn8xL2X/1p2Ipn2wIgHe +A/FmzS7hGcxpj3TnPui9oNS9TwiXd/gTdhzGLis9k/B4G/b/xy9ZjFdGY5MAb8hu +XWF+8nga3kIrYQx3M6nKVxv6V/uhEfxi0W0LtIgXS7bfInJS8Cn+Vwftq7OxzpSq +7X5VVuIcW83OvZIwoCmvRRMoHU0Oay6MMARVcNCvoGljOBskegLnfqkF7oIBI3yd +Su8Wj4Ll48gOTpvQWGadOufzaGgNV/SgJrCE+mFgOzynqhVnelzcypoY/MOpvv/1 +pVifddSTCPgj/W4lBSO24in1dNeBAoHBANMTVXD/nZHAn24LK9y3h5QwVk0BDdxI +2zl97EW46GV2HGwEJfRC0JuYqerERQXpb34UkXbVOiNQ5nfTeH0N67jyv7gUYeGU +8hv3zGebeyzqxgb8tpyswE++LknX62pYSxa1NtJoBkBpbTpxPuwNrECyFM4JPmSo +jtx3rca0b3xpqyJaBvqMtzfC7b1AFJiDI1DNDUlLSHDFV38PAa5capgIGVbMAofY +1Rd3AGeeTY2lpYTXMXinyj2CDdLFSDO22QKBwQD7enZA1tgIdO/iWdfaiiQI11f7 +xfzJIdHiFEjx1FodgAYnY65OiUBlkQS8sB8eNOGW+lmQnZZCF7nEq6iNOz38tKWf +mgRjwNlPmXDD39ooIXZLxtaFNk1986KLQt8A1kGNSBjydch79jMTyE6RITtK2Lnm +C9Zhx3B9eKmHSpAZhzT6345W3JIOsBNgkHpSxjfRppNxABrd5KtdudgrFjxZy18U +BPdtqwbxg0uSsmEAc9F+L9TgKG0LH7l0LeF+6mkCgcEAmE98OSUK09EWenbvOL7q +w6E5tSlMkie0ocDfDNTIRea7zaoUpTTNiWnZOwJT+FchT+6RpRlqcW+ATvk3Ga5A +6d2pQLDcjMZJCqt+QUkt0hS7vvD+6QGzaBeJGVoIk12RGZq8K4pK8JHi8ugjCn03 +Thvy7VY4QrRrGmX17MvpIvKxPgGOxZ9i2ob7vLOP6RnAEx9UNg5wAIg2ggYXJXWk +qX42oq5mKRbrdZo2nY7a0Zq1XK1YEoOpaUb+qJgZaM/JAoHBAM0PTt4QUpiSwgkQ +ubK6cifDcTscdsSLj1mKsPCA9/qWKm50Ge5wfNJVLkeuVbGL7WfvPJlv5tZ+Aj0c +vJRtel5V77f1Hx84YftGY21VW87deljQCp0VapsJz8E/BhjonQtXfwA2iwSJ/Zxj ++azeLDsb/npXrLiOqGunuJVZd6dZWRo4sRijQ3Y2nZZgOV7Fwz5xVkkOjNnjXNlQ +cbSwrQWLkDwC0L/cdgz5wuYcDn0P9AOxfSRL0p7/f3n876NOAQKBwQDABFISO+aj +ChqV1617l69oTu44TojDRQXVvV1pcNMgkM3T2cNJ/4TdNsCga3MR8MtVa+IRdnyj +Sn6crA/JqoUulfDMByCyH1Qs6CCmmKzhROzgAOuqIUi7RUU5bmYMkSkyJYP5xjTR +G7KsSe8Axhni1nJQ+Kz/LJA1DxzsNf7eOmUSoD69lMUpld0NDk2UYf/DaAFqiTwD +/j4xgDowMZsBDzAwl0j+5/qy2gLhN8oYNKP4TeisG6C74l1zP32BedY= +-----END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/client-template.txt wget-1.20.1/tests/certs/client-template.txt --- wget-1.19.5/tests/certs/client-template.txt 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/client-template.txt 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,23 @@ +# Template file to generate server-cert.pem for certtool (GnuTLS) +# see 'man certtool' for more options + +organization = "GNU" +unit = "Wget" +# locality = +state = "Sunshine" +country = Freeland +cn = "Wget" +#uid = "wget" +#dc = "name" +#dc = "domain" +expiration_days = -1 +#dns_name="127.0.0.1" +#dns_name="::1" +#dns_name="localhost" +#dns_name = "WgetTestingServer" +#ca + +# key options +signing_key +encryption_key +tls_www_client diff -Nru wget-1.19.5/tests/certs/create-certs.sh wget-1.20.1/tests/certs/create-certs.sh --- wget-1.19.5/tests/certs/create-certs.sh 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/create-certs.sh 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,28 @@ +#!/bin/sh + +#create key for CA self-signed certificate +certtool --generate-privkey --outfile test-ca-key.pem --rsa + +#create CA self-signed certificate +certtool --generate-self-signed --load-privkey test-ca-key.pem --template test-ca-template.txt --outfile test-ca-cert.pem + +# create server key +certtool --generate-privkey --outfile server-key.pem --rsa + +# create server certificate +certtool --generate-certificate --load-privkey server-key.pem --template server-template.txt --outfile server-cert.pem --load-ca-certificate test-ca-cert.pem --load-ca-privkey test-ca-key.pem + +# create expired server certificate +certtool --generate-certificate --load-privkey server-key.pem --template expired-template.txt --outfile expired.pem --load-ca-certificate test-ca-cert.pem --load-ca-privkey test-ca-key.pem + +# create not activated server cert +certtool --generate-certificate --load-privkey server-key.pem --template invalid-template.txt --outfile invalid.pem --load-ca-certificate test-ca-cert.pem --load-ca-privkey test-ca-key.pem + +# create client key +certtool --generate-privkey --outfile client-key.pem --rsa + +# create client certificate +certtool --generate-certificate --load-privkey client-key.pem --template client-template.txt --outfile client-cert.pem --load-ca-certificate test-ca-cert.pem --load-ca-privkey test-ca-key.pem + +# create CRL for the server certificate +certtool --generate-crl --load-ca-privkey test-ca-key.pem --load-ca-certificate test-ca-cert.pem --load-certificate server-cert.pem --outfile revoked-crl.pem --template revoked-template.txt diff -Nru wget-1.19.5/tests/certs/crlnumber wget-1.20.1/tests/certs/crlnumber --- wget-1.19.5/tests/certs/crlnumber 2017-05-03 19:22:57.000000000 +0000 +++ wget-1.20.1/tests/certs/crlnumber 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -1122 \ No newline at end of file diff -Nru wget-1.19.5/tests/certs/expired.crt wget-1.20.1/tests/certs/expired.crt --- wget-1.19.5/tests/certs/expired.crt 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/certs/expired.crt 1970-01-01 00:00:00.000000000 +0000 @@ -1,149 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=CA, L=San Jose, O=Wget Testing Department, OU=Testing, CN=WgetTesting/emailAddress=bugs-wget@gnu.org - Validity - Not Before: May 14 09:05:02 2017 GMT - Not After : May 8 16:03:42 2017 GMT - Subject: CN=WgetTestingServer, ST=CA, C=US/emailAddress=ExpiredTester, O=Dis - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (4096 bit) - Modulus: - 00:d8:ed:cc:9c:e5:35:42:f2:1b:d8:30:36:40:a5: - 01:8e:0f:c2:3c:5b:f0:d1:09:a0:aa:63:07:44:b9: - 2e:20:20:47:5e:43:f3:bc:3b:df:88:f9:26:e6:07: - d9:9c:4c:67:53:46:3a:78:c5:0a:90:0c:f2:e9:a1: - e0:d9:f3:52:bc:51:07:32:ac:9b:d3:ac:f9:25:7d: - 52:8b:2f:fa:06:6e:2d:c4:d4:2e:c7:38:81:f3:30: - 4e:b5:d6:7b:2e:fe:4c:12:84:db:f4:7f:22:91:4d: - 45:37:bb:01:96:61:59:62:af:2e:de:21:70:fa:3e: - 29:97:9d:3c:bf:41:5c:cd:2a:b4:f7:4f:6f:78:a1: - b3:d5:79:53:4e:68:7b:cf:0e:78:87:47:9c:3f:3f: - da:50:27:08:7d:12:c7:e2:da:cc:6f:a4:63:12:ca: - 28:a0:7d:f8:a8:ac:a3:72:77:ab:18:52:83:b1:2e: - 44:49:1a:0c:25:bc:21:bd:40:09:96:6b:60:04:e4: - f2:3f:bc:c4:1e:3c:43:55:1d:fa:40:18:cd:70:91: - 24:03:1a:b8:95:e0:b2:70:3f:1e:05:a8:21:37:b1: - d0:ff:54:36:65:9f:a7:ba:2d:c2:ef:e2:a9:a4:c4: - 72:c5:4c:82:8e:46:3e:b6:d9:aa:62:14:07:1d:53: - 19:08:9b:88:6d:b9:20:88:7c:bc:89:95:02:d5:54: - 96:7b:b0:a8:14:fd:30:ce:5f:41:b7:bf:e2:75:9a: - a3:fa:20:43:2f:c8:80:cd:97:f7:57:37:5d:11:9b: - fe:bf:aa:56:0e:2f:cd:47:7e:0f:db:2d:f7:71:44: - c5:21:7d:c6:b3:50:5d:30:b0:4c:54:8f:7e:05:82: - e6:5e:3b:62:d7:1b:5a:f5:de:57:76:2a:90:b0:d4: - ec:72:8e:ab:64:f1:6f:12:21:80:7c:64:8a:5c:da: - c1:86:12:ff:a9:e9:93:2f:2c:70:59:84:a4:5c:13: - e0:02:d4:9a:72:0e:40:c3:db:99:1b:60:85:c0:94: - 1d:15:24:5b:8b:f6:6f:2c:d1:b5:95:50:e2:53:76: - 4f:cf:57:8e:d5:8b:c1:f5:3f:ad:07:aa:7b:84:32: - dd:32:b5:59:a5:1b:d4:a2:b6:3b:6c:07:cc:4b:e8: - fc:6a:d8:42:e8:08:dc:f1:f1:91:74:cf:9f:5f:57: - 6e:ab:93:5b:5e:af:7d:1c:b7:d3:eb:08:4c:a9:a7: - b5:aa:d6:46:a8:a0:63:68:7b:44:cf:5c:21:42:3c: - 98:ff:42:31:77:94:4f:85:d2:7a:da:56:b1:c4:3c: - b9:2d:e9:d6:88:f3:6c:ff:7b:39:19:83:80:ab:31: - ab:19:6b - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Subject Key Identifier: - E6:C0:06:2E:89:41:44:32:AE:B6:C5:62:B6:7E:B5:DA:3B:75:D4:04 - X509v3 Authority Key Identifier: - keyid:17:ED:93:43:8F:A7:A6:00:75:D4:E8:B6:82:0D:88:37:7E:C0:6D:08 - - X509v3 Key Usage: - Digital Signature, Key Encipherment, Certificate Sign, CRL Sign - X509v3 Extended Key Usage: - TLS Web Server Authentication - X509v3 CRL Distribution Points: - - Full Name: - URI:http://test.wgettest.org/Bogus.crl - - Full Name: - URI:http://test.wgettest.org/Bogus.crl - - X509v3 Subject Alternative Name: - DNS:WgetTestingServer - Authority Information Access: - CA Issuers - URI:http://test.wgettest.com/Bogus.crt - CA Issuers - URI:http://test.wgettest.com/Bogus.crt - OCSP - URI:http://test.wgettest.com/ocsp/ - OCSP - URI:http://test.wgettest.com/ocsp/ - - Signature Algorithm: sha1WithRSAEncryption - 41:03:d8:91:54:f2:5c:e5:15:80:cd:96:a2:89:94:df:8c:d4: - ce:99:1a:f6:69:03:1d:aa:a8:3d:7f:8a:65:bd:b2:3a:f0:46: - 00:6d:c7:cc:7a:18:44:cb:b4:17:f1:40:83:b1:17:90:64:ba: - 22:2e:18:7e:35:29:20:4c:8f:34:14:86:34:1f:42:6e:a6:e7: - d7:18:a3:11:77:3d:ec:b1:39:59:7b:12:3f:55:b0:86:4a:9f: - 6a:1c:b6:9e:03:3d:39:bf:f6:34:f5:d7:6f:44:bd:9a:54:e5: - f9:d9:14:85:01:d9:3d:0e:18:89:d0:bf:27:df:9a:4f:39:7c: - ec:46:92:e5:3e:9e:e5:10:4a:ed:03:aa:3b:93:02:e9:f3:18: - c1:5f:e8:cb:16:e0:54:9f:8b:0a:c9:65:48:32:93:90:91:2e: - 84:26:14:28:b5:5c:61:38:39:28:3e:8e:74:dd:08:07:67:41: - 9a:82:67:48:ba:3b:c1:66:76:27:7a:9c:c5:95:45:b5:9c:4d: - 94:9b:f5:e2:93:39:2c:d8:15:31:27:82:56:9b:1a:73:e5:f2: - 6a:9a:cd:47:0a:2b:ff:6e:5f:b2:f8:53:4f:fc:c3:1c:b7:25: - 00:30:77:21:87:9b:88:d4:87:f7:30:79:f7:bd:a2:df:42:c4: - 95:c4:e3:3c:94:4a:87:96:94:54:de:fe:80:13:e6:ec:37:dd: - 33:a2:e4:f7:15:e7:a8:08:c6:3d:3b:65:34:96:5f:46:c8:41: - 7f:ce:c5:ca:3a:44:d2:fb:9c:3c:c7:2c:da:12:b3:1f:62:40: - 38:12:cb:36:b7:5c:e7:32:5c:e3:2a:af:b5:36:e8:83:d3:8e: - da:4c:b5:52:5f:f4:d6:54:b7:3b:9d:62:86:5a:26:f1:58:a8: - 2e:f6:46:9c:6f:98:76:e1:bb:9c:27:73:0f:78:11:60:b9:ac: - 13:6e:d9:ec:24:5f:64:e9:59:14:36:02:f1:f0:57:97:ce:31: - 0a:80:1e:d0:c0:c0:77:62:24:c5:d9:61:e9:d9:57:76:64:e1: - 1c:c7:5a:55:e2:58:ab:2f:58:6f:42:91:03:aa:6f:1c:9b:fc: - 0a:c5:ee:14:1d:07:a1:b3:ec:97:6f:ac:2f:85:7f:ea:88:18: - 78:84:ac:af:d8:e9:b7:23:5c:a3:14:ab:8e:ee:95:5b:0d:6c: - e4:25:be:77:04:59:19:57:1e:f7:e0:5a:f2:fc:33:12:57:28: - 11:2e:1f:05:6b:43:62:8f:c0:c3:4a:97:f9:6a:73:1d:dd:c0: - 6f:d4:a2:23:0a:d2:86:68:df:bd:ac:75:61:cf:d8:3f:9a:d1: - 8e:e9:33:59:bd:13:9a:27 ------BEGIN CERTIFICATE----- -MIIHODCCBSCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMCVVMx -CzAJBgNVBAgMAkNBMREwDwYDVQQHDAhTYW4gSm9zZTEgMB4GA1UECgwXV2dldCBU -ZXN0aW5nIERlcGFydG1lbnQxEDAOBgNVBAsMB1Rlc3RpbmcxFDASBgNVBAMMC1dn -ZXRUZXN0aW5nMSAwHgYJKoZIhvcNAQkBFhFidWdzLXdnZXRAZ251Lm9yZzAeFw0x -NzA1MTQwOTA1MDJaFw0xNzA1MDgxNjAzNDJaMGIxGjAYBgNVBAMMEVdnZXRUZXN0 -aW5nU2VydmVyMQswCQYDVQQIDAJDQTELMAkGA1UEBhMCVVMxHDAaBgkqhkiG9w0B -CQEWDUV4cGlyZWRUZXN0ZXIxDDAKBgNVBAoMA0RpczCCAiIwDQYJKoZIhvcNAQEB -BQADggIPADCCAgoCggIBANjtzJzlNULyG9gwNkClAY4Pwjxb8NEJoKpjB0S5LiAg -R15D87w734j5JuYH2ZxMZ1NGOnjFCpAM8umh4NnzUrxRBzKsm9Os+SV9Uosv+gZu -LcTULsc4gfMwTrXWey7+TBKE2/R/IpFNRTe7AZZhWWKvLt4hcPo+KZedPL9BXM0q -tPdPb3ihs9V5U05oe88OeIdHnD8/2lAnCH0Sx+LazG+kYxLKKKB9+Kiso3J3qxhS -g7EuREkaDCW8Ib1ACZZrYATk8j+8xB48Q1Ud+kAYzXCRJAMauJXgsnA/HgWoITex -0P9UNmWfp7otwu/iqaTEcsVMgo5GPrbZqmIUBx1TGQibiG25IIh8vImVAtVUlnuw -qBT9MM5fQbe/4nWao/ogQy/IgM2X91c3XRGb/r+qVg4vzUd+D9st93FExSF9xrNQ -XTCwTFSPfgWC5l47YtcbWvXeV3YqkLDU7HKOq2TxbxIhgHxkilzawYYS/6npky8s -cFmEpFwT4ALUmnIOQMPbmRtghcCUHRUkW4v2byzRtZVQ4lN2T89XjtWLwfU/rQeq -e4Qy3TK1WaUb1KK2O2wHzEvo/GrYQugI3PHxkXTPn19XbquTW16vfRy30+sITKmn -tarWRqigY2h7RM9cIUI8mP9CMXeUT4XSetpWscQ8uS3p1ojzbP97ORmDgKsxqxlr -AgMBAAGjggG/MIIBuzAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTmwAYuiUFE -Mq62xWK2frXaO3XUBDAfBgNVHSMEGDAWgBQX7ZNDj6emAHXU6LaCDYg3fsBtCDAL -BgNVHQ8EBAMCAaYwEwYDVR0lBAwwCgYIKwYBBQUHAwEwXQYDVR0fBFYwVDAooCag -JIYiaHR0cDovL3Rlc3Qud2dldHRlc3Qub3JnL0JvZ3VzLmNybDAooCagJIYiaHR0 -cDovL3Rlc3Qud2dldHRlc3Qub3JnL0JvZ3VzLmNybDAcBgNVHREEFTATghFXZ2V0 -VGVzdGluZ1NlcnZlcjCByAYIKwYBBQUHAQEEgbswgbgwLgYIKwYBBQUHMAKGImh0 -dHA6Ly90ZXN0LndnZXR0ZXN0LmNvbS9Cb2d1cy5jcnQwLgYIKwYBBQUHMAKGImh0 -dHA6Ly90ZXN0LndnZXR0ZXN0LmNvbS9Cb2d1cy5jcnQwKgYIKwYBBQUHMAGGHmh0 -dHA6Ly90ZXN0LndnZXR0ZXN0LmNvbS9vY3NwLzAqBggrBgEFBQcwAYYeaHR0cDov -L3Rlc3Qud2dldHRlc3QuY29tL29jc3AvMA0GCSqGSIb3DQEBBQUAA4ICAQBBA9iR -VPJc5RWAzZaiiZTfjNTOmRr2aQMdqqg9f4plvbI68EYAbcfMehhEy7QX8UCDsReQ -ZLoiLhh+NSkgTI80FIY0H0JupufXGKMRdz3ssTlZexI/VbCGSp9qHLaeAz05v/Y0 -9ddvRL2aVOX52RSFAdk9DhiJ0L8n35pPOXzsRpLlPp7lEErtA6o7kwLp8xjBX+jL -FuBUn4sKyWVIMpOQkS6EJhQotVxhODkoPo503QgHZ0GagmdIujvBZnYnepzFlUW1 -nE2Um/Xikzks2BUxJ4JWmxpz5fJqms1HCiv/bl+y+FNP/MMctyUAMHchh5uI1If3 -MHn3vaLfQsSVxOM8lEqHlpRU3v6AE+bsN90zouT3FeeoCMY9O2U0ll9GyEF/zsXK -OkTS+5w8xyzaErMfYkA4Ess2t1znMlzjKq+1NuiD047aTLVSX/TWVLc7nWKGWibx -WKgu9kacb5h24bucJ3MPeBFguawTbtnsJF9k6VkUNgLx8FeXzjEKgB7QwMB3YiTF -2WHp2Vd2ZOEcx1pV4lirL1hvQpEDqm8cm/wKxe4UHQehs+yXb6wvhX/qiBh4hKyv -2Om3I1yjFKuO7pVbDWzkJb53BFkZVx734Fry/DMSVygRLh8Fa0Nij8DDSpf5anMd -3cBv1KIjCtKGaN+9rHVhz9g/mtGO6TNZvROaJw== ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/expired.key wget-1.20.1/tests/certs/expired.key --- wget-1.19.5/tests/certs/expired.key 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/certs/expired.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEA2O3MnOU1QvIb2DA2QKUBjg/CPFvw0QmgqmMHRLkuICBHXkPz -vDvfiPkm5gfZnExnU0Y6eMUKkAzy6aHg2fNSvFEHMqyb06z5JX1Siy/6Bm4txNQu -xziB8zBOtdZ7Lv5MEoTb9H8ikU1FN7sBlmFZYq8u3iFw+j4pl508v0FczSq0909v -eKGz1XlTTmh7zw54h0ecPz/aUCcIfRLH4trMb6RjEsoooH34qKyjcnerGFKDsS5E -SRoMJbwhvUAJlmtgBOTyP7zEHjxDVR36QBjNcJEkAxq4leCycD8eBaghN7HQ/1Q2 -ZZ+nui3C7+KppMRyxUyCjkY+ttmqYhQHHVMZCJuIbbkgiHy8iZUC1VSWe7CoFP0w -zl9Bt7/idZqj+iBDL8iAzZf3VzddEZv+v6pWDi/NR34P2y33cUTFIX3Gs1BdMLBM -VI9+BYLmXjti1xta9d5XdiqQsNTsco6rZPFvEiGAfGSKXNrBhhL/qemTLyxwWYSk -XBPgAtSacg5Aw9uZG2CFwJQdFSRbi/ZvLNG1lVDiU3ZPz1eO1YvB9T+tB6p7hDLd -MrVZpRvUorY7bAfMS+j8athC6Ajc8fGRdM+fX1duq5NbXq99HLfT6whMqae1qtZG -qKBjaHtEz1whQjyY/0Ixd5RPhdJ62laxxDy5LenWiPNs/3s5GYOAqzGrGWsCAwEA -AQKCAgBPnog5Fc+EsMQThy6Cb42wjIwoBz7OGpCDuTETwjvxwqcvLBWrgvY6mefz -CfKO8WQDJoWTig6kbHxD0AxtMmetgrf3m27eNGCFqAfB2mwULCBUW+SHbnATyCk7 -iGtSBjf5nBX3GSqg1hGPsO2WOkjKda3oDbIfxu0RHr8LG3xqOUCOfPNW/VK6CXvQ -DX1Ts+X9EQWCGXeRb6In9dqzosbiOx256cUbkuDPV/3tp4p+tNptD6Q0iIDo4LIp -efWK5gIqCbX4OtpolonIFeah2/ibVko3cXlKWVxk4mWsgdcfT/57mHcWuZCgPueL -kE/fj9LoI3rPqWyfRCjLMrqhwrwuxZArvsN56CALrbBRpmJql+JL68bPu3fXBgak -X457pXZVGj6GNFdv8JMXRMo/oyn/73jJdWt4g83HiXkXlcxuoLwsbiA8hq72DLMn -dLTVS31Kn3T9RczKSk44xbGSJQUV/s3ErOA378lHJe5wQHk+A0p59fKen7GiT7dj -4ZOzFy1sJW+DS9rklq6gGupdoHJVhcCLe9ryanb28MidMeWsUMa11OGXCpoRk8Np -ZY9ASgfW0+o2XUZukL+NpU7/1ihdybr3E5w0N1IFAAvUa+f7A4iKJW65COdB53wz -jG7zGal2aDqTbC2xLpaUk54Z3sEgpZNW7PqB+O21Yu/ZzC8wkQKCAQEA8MDWS7LF -MkAppvl3M7ATU2tzq0PisoiUS595Sp+Y3LxB3GHKEQKKeMz2P2mHcg4tzYCg4bvP -LE0HXizfFNBKwGMyi40+T2fYz+FC8zAYHKbsZQt0O2uvSGcMriZLCWuAEs45U/b0 -N9UN9BuE4yYizmUGYFjYmUMBUB0Oj/nIU8iikdbV3wBoCzuH1sP5f3kIQzAqNJgt -zci+etMVCPecT8brbLAxKZOEaIX3IAxQu2t2V3geDvukLNECWsVeDAY9DGuL2x3e -BnS+HGrOYDyAPVjxyzzNkjjzBdCV2ciipxwL2QzKsgVPx8L21RdK8mYEDB0dkv7B -kTLw8wH4fxMavwKCAQEA5qq264K+QCRBTYtdayoK2qQksWd3U1QynF3zM0XMb8Ip -J1HnCbzhQ2/ccXKgT9j9KuK+8A4q4Mw+RggwM5QWIfxzD7AjOYPO4G4mCFwwViM7 -H/HbH1WJMHo2LWDEx4/UrphXg2FF2yApX3nCDzNx2cVz39BDyiIKNXs+O8PFoF9N -7emitJ7U+GV7wLWacMgTz4qvTuNu/dQfoCVzsfEvxYay6sAW2cX0nrwr5/+T7js8 -KrfklAOD5Rd36cLRTB7vUDgYQ39MN9Ab1X1e5kwn2HSLbcBJyUMDfRgnc82MnLKn -O8CS2AS4j6tyEvRYrAOwqMmcwWnDBJzrfVicThLIVQKCAQBh7P39YmTFcMXAbh4n -PwpNVxqAYid2mQlAzUgHq20A8+4SFxCa5J6wTiYnWuRF5zCIMza9OqglC9vgWX4P -uD1/jZnEm5npsILG44hY5IoaNWdYHlWTydRNLeVBfL/uv/QjMhCtb3icsSNw1DS0 -NBHaQ8tZKypHBLMnA/qlY2MxeR1vFqR9hWvMjdVN7P6x8+gBdDjmlbOjzXB1AyC+ -OgExjea6mdwVXjRwU3VWasv3v9kt8OTBEWgQ9p7vjvIXD/6K67/CS57An4Goi2UQ -TeuXiHMpSL0RKernxZT+NZa7RDQpgAN+b5yo00uVF1lbyVUCHGGoJclUJxVMstOB -1KJ/AoIBAFCOvmNxvc/Y2ZWjXnTWsgO537a1U88eUK6bgRwe/E7rmEPLLs0P0fwj -TPGx/prkRUZ8+gIMcJ0ht33tzie1SCWGbQjFkwe7KLzouw+gYqEynKuDY+uFi+wK -QnGGojKv4K85NRcFGch1av2VIFj+tnw/oUBBE+u8B6S17f4hWRuxLR4xwkkiT26Q -wq+CvPU2avTIkoESnOi49HKRod47RVvOtx2VCGX15ICrZwoXECrbNSAWKRYoRB/2 -GkLhbwcOprV1YcPw6UV0wMPGjSYQ4rmNukQSK7LGXKmLjfu7hagUHKOZla8rtuk2 -DxjfjThF8aSBBOXncdxikTutfqklliECggEBANGHBID63eBukoc16NOIRenrRNSJ -Oa2W0VhQ/iI9Di9fjZuQutPq2UqR+N0tW5V7qiGm7vb7lRlrnB/jt3pNqGj3qSdC -CEp7IEH0kJ/hp9KwA7MxVzmk5hbDbSrtzxYFYjYNEybKndPmKt+J9AZS3u21WGwU -MaaX2WS2JHLwnSJ0qgp/rg+uoYIXzPLn/1k7H0s8s6lMhY40nZSaxx9dEEe5RWSz -HY9ajmcRUqEbdFNmu+J9yR5q5mku++CLRGU921XomoIf/R3dBvMFFRtiymiVV0qt -+fueaAfibaLDFRSutkfLCyOl2EFyvsSk5TJmutAIe8ba5d1CdCkm4w9SsBI= ------END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/expired.pem wget-1.20.1/tests/certs/expired.pem --- wget-1.19.5/tests/certs/expired.pem 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/expired.pem 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIEzTCCAzWgAwIBAgIMW+WWpBQQ7rn1JYOGMA0GCSqGSIb3DQEBCwUAMFIxDTAL +BgNVBAMTBFdnZXQxDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTERMA8GA1UE +CBMIU3Vuc2hpbmUxETAPBgNVBAYTCEZyZWVsYW5kMB4XDTA0MDIyODE1MjE0MloX +DTA1MDIyODE1MjQ0MVowXzEaMBgGA1UEAxMRV2dldFRlc3RpbmdTZXJ2ZXIxDTAL +BgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTERMA8GA1UECBMIU3Vuc2hpbmUxETAP +BgNVBAYTCEZyZWVsYW5kMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA +sNRnU60QudO+MD8QbYbKtD09cxTCqT7ozRAk5yt5ETwMlGLHBBsEcFDStuwdgXci +ddoXXulLEvuHSobTCdR0GK0ifCxDRwddvE2heudxZtp5xKUHEb0LFob7boRt1Emu +HeXLk9U81oUdDmEEyEW0xmKeaPI4cKJ/n4vczLIpH8+rQD/2AJwWSC+OFnUpt78p +vQzfObKIakr81ckw0G49A6p9OFO7l28AUzwB7UUpnRKllC44FZ5LvsXdK5SQQ44r +f4do1PjTflC9L9iccSdqq4z+FCL0rwK3Wpw+Ly5HeBGtsfMk88Eg00KeF9Fym5ho +bcrky5EPFBLhRJ/k4BGnlGnxboFdKK8Gyna7ivAIhvXJ+9sbnfg7FPQ+MEnpqJzq +i/ziJzC339ruJqYWted/tGlYbPm8M02MmIejGYnMp85v6tnhkToaDKeElAp7E6wC ++/fl3LQyW9vvWdSiVl29sAG1QlVq2IFfprRkRwy7SwsBPTtgIHwm7JyG2kYA/2vB +AgMBAAGjgZUwgZIwDAYDVR0TAQH/BAIwADAcBgNVHREEFTATghFXZ2V0VGVzdGlu +Z1NlcnZlcjATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMDByAAMB0G +A1UdDgQWBBSxiQDjENGd3WwSbMM3SdgZqkgNajAfBgNVHSMEGDAWgBSeDlsijPvS +jydT1dYKDMsNWQ9kmDANBgkqhkiG9w0BAQsFAAOCAYEAMHNHe6JsrZu3J/6Lw6wL +wh0U7X+er01qPq4Csp4Zrk66eLWt9475TNXGYzDaOv8Yrczx3Lv+Liny73R4/HLi +P5lMjXwfijFnj6cCzMziLbpxo11cHj7Km7nDequtiUFt80Ug3PEuYoMkY6HpNMHo +rh5dgTOHjX1q8j/T6s/b46SKr4nEtdX9IdNvWzdxiLTR2EMH5mE0q3Pu+A25N0GG +ij+L09Fh+qq3BlhqeRYvROO4LqE5VvbS7cpqXnxL/jSLm87CV2/0z7E1ApWSDDvK +205ORvoE3oc+gOMbpMbKP4dPbXLves+iTQWabWjlMdleTD2eEE7aewH71r7Y8lEn +LH/lpxIcteasOUNFxet9nBB26L4yVG29t4dhrwqd/lf8tvLV4h79DGJCESocu3Z/ +xkZIZZLWywGuDxrGSvJrcaA6BlSV/8oiGttyaP4XTQ+K4ZHFMCmC3jceXQFPkatq +bqeIKABNlxsYVk9vDLiPL+8HbBoN0LtHb+KfORGUc9Qi +-----END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/expired-template.txt wget-1.20.1/tests/certs/expired-template.txt --- wget-1.19.5/tests/certs/expired-template.txt 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/expired-template.txt 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,20 @@ +# Template file to generate expired.pem for certtool (GnuTLS) +# see 'man certtool' for more options + +organization = "GNU" +unit = "Wget" +# locality = +state = "Sunshine" +country = Freeland +cn = "WgetTestingServer" +dns_name = "WgetTestingServer" +#uid = "wget" +#dc = "name" +#dc = "domain" +activation_date = "2004-02-28 16:21:42" +expiration_date = "2005-02-28 16:24:41" +#ca + +# key options +encryption_key +tls_www_server diff -Nru wget-1.19.5/tests/certs/interca.conf wget-1.20.1/tests/certs/interca.conf --- wget-1.19.5/tests/certs/interca.conf 2018-05-06 16:47:57.000000000 +0000 +++ wget-1.20.1/tests/certs/interca.conf 2018-12-26 20:09:06.000000000 +0000 @@ -6,7 +6,7 @@ authorityKeyIdentifier=keyid:always [ myca ] - dir = /home/tim/src/wget1.x/tests/certs + dir = /tmp/wget/tests/certs new_certs_dir = ./ unique_subject = no certificate = interca.crt diff -Nru wget-1.19.5/tests/certs/interca.csr wget-1.20.1/tests/certs/interca.csr --- wget-1.19.5/tests/certs/interca.csr 2017-05-03 19:22:57.000000000 +0000 +++ wget-1.20.1/tests/certs/interca.csr 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEzDCCArQCAQAwgYYxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEiMCAGA1UE -BwwZSW50ZXJtZWRpYXRlIE15c3RlcnkgU3BvdDEMMAoGA1UECgwDSW50MR4wHAYD -VQQDDBVpY2EtV2dldFRlc3RpbmdTZXJ2ZXIxGDAWBgkqhkiG9w0BCQEWCWljYXRl -c3RlcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMGp3svUd1hESaDF -NHDbErPqHZhb1SEtSJ5k5WsDIPcmzmalNNfQhhhVmA8COg/pfe7/XcrnGfAmDOD8 -0YnNFb8Irczfmdw/q4XuGdrtocMtm05BUWCMpcDeHg1MBaHhd56y85+IPcoMVPYm -EmWd1UMYvcg7OzoCaja0xTg6KFfXvtR0xyY2xRGsOhAMzuoTl3mQ75BrzrLTvUzC -wZuQmSL5lWK6gYBc5pNvK58bn6S4zSroPN5z41Vyjy36BHzsxmfXHPSiPDqgRUFp -77abkiv5TlTeGIA5bNQEw85dk1ThVlyTk4vr4Y/SPCzcUWlOsVcNpeTr0jUA0veL -P0BzgMCPDkESQLyCzPiOH8CY5gsFjDQbfLm2aqbdOp5Wp2v7G3epAq1kpTtqFdUX -D6owlHXbJM1d/fQxrlrZ8gdJoLSOe6oR5chjRTL4kVrfSRqTZQMVi9tzf6HcZXdi -flqSLPOYoHypObgzMpAdju/pnPu3SZQ95CJhUf00UvFNbEs56+c/KrmGItWPypBY -w7+SqMgXxVCWeBVMLZcJoggNXRXieW2wBCR1lHb/eNcmel4jdSggoEPLXvfCyp4u -Hb+YkV8+VLLLpDPypjrvQBIVd7YxCfnJ+pGRzYMq4IebxYBpsnInrOppY8H3SMc7 -mdCbJq5BM7qeYIfcS2ZDt/KRHhfbAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA -ALPzZQAHG7eg73I/C4I0QmAj5l208ikrPbQ+btIaTJ5rSPMCGmUez9BurEx6cI/O -Ph91WENnJfdrohvX+PFd0VoNGKBvtqexjt/mXYKtUt8EHmgyELdmtlvkp7nQtrDK -sKXYAlANyH1O86fdiNSdZA4oLHpA1Jh/0yTPPcAgUidG9awAJaWso/j+HQsRppS+ -5a/yPuubpVfnGg2bzt9sd45FCMydIavwzng0sOt8pPELASVECs9F0V7Vg41x0Xpz -D1Ap8bnwSgn5iDvguN6W247Z2EijYtDZyOOpFPBdWkowbY/Z5osx77s7eQJG4yLG -ilSBJyt8Fp2P/FIlXi+olctSUaaIliXZ562uabhFBN6LSN5XuLCoj/0wtJ1ME+VX -SnWm/xSvli77herJg4KiGdfqfcun0dZhy0r/zDtcVCS2DEWUQjG9toZcEnoEaj8K -brpiv+7WIAWIkb7wvvXbfBgkaFM4WC3fCs1T3US+4bK1FHhqhdhcWuWvrbxmCtUz -GHOrR3mRKh58C/vK/gI0V4D5Emx/0PlaykfuB4xRdTyXs84Phqaq0BE7jd4ZpRqM -E84aIl3/hON4pkLfPCNeuiRqAj+S5Lcqlb2yVmnoTjx2QtCyGAsFrSkCP1SyHq5b -uqrIw7LZ5b8MVlnD9oxitQXh8cDNz3h85cS37ceBc/c= ------END CERTIFICATE REQUEST----- diff -Nru wget-1.19.5/tests/certs/invalid.crt wget-1.20.1/tests/certs/invalid.crt --- wget-1.19.5/tests/certs/invalid.crt 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/certs/invalid.crt 1970-01-01 00:00:00.000000000 +0000 @@ -1,149 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=CA, L=San Jose, O=Wget Testing Department, OU=Testing, CN=WgetTesting/emailAddress=bugs-wget@gnu.org - Validity - Not Before: May 15 15:28:03 2037 GMT - Not After : May 15 13:28:04 2019 GMT - Subject: CN=WgetTestingServer, ST=CA, C=US/emailAddress=ServerTester, O=Dis - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (4096 bit) - Modulus: - 00:b4:d4:0b:fe:35:25:05:a2:ec:28:c3:6a:d8:13: - f7:57:7f:f6:f2:4b:87:64:59:29:cb:81:93:c0:3d: - f5:2b:30:d4:30:4b:ab:e1:0e:5a:57:e9:ac:d0:ef: - 62:f6:a3:f2:d7:24:f6:8b:e3:54:98:68:75:bc:f8: - 34:4c:2f:96:6c:dc:1d:af:72:f9:c6:5a:6e:0f:03: - 4c:45:ed:0a:17:9b:ba:2e:f3:8d:7d:6e:e9:4b:3d: - 36:d9:7a:18:2e:24:72:5b:98:84:5b:09:6f:a5:f2: - 87:b3:0d:d7:93:92:2e:6f:68:4f:db:5d:78:77:c6: - 63:04:c6:29:67:42:3a:6f:0f:c0:e2:cb:1e:52:f3: - 11:0b:c3:80:4a:3f:b5:5e:1f:43:0c:04:c4:b4:f1: - 95:98:e4:b7:b0:4b:14:fe:1c:99:70:f4:1c:91:1e: - e3:9a:a2:ff:48:54:fa:3d:01:e7:48:6f:0b:3f:4f: - a5:45:b1:1b:98:0d:57:6f:15:a6:75:bb:45:0a:52: - 66:e6:1b:77:29:ba:c5:13:41:91:8b:0b:a0:6a:44: - fa:8e:60:46:8c:c6:43:de:67:46:1d:30:c5:ce:77: - f2:4a:53:c2:27:85:1f:48:69:c8:27:df:b1:71:09: - 42:10:2e:7f:b8:fe:85:fe:bd:39:2c:84:2a:10:a5: - 80:00:79:42:a8:6f:3b:55:08:f2:98:c7:44:e7:a0: - b4:dc:c5:c1:3e:75:30:cb:a9:7a:44:a8:a1:03:8a: - 44:cb:dd:04:74:54:91:91:11:2d:32:ce:67:2b:af: - 23:a9:69:35:39:8c:7e:4a:fe:d9:b4:86:c9:ff:f8: - 09:86:2b:ad:eb:12:74:2c:6a:25:29:8c:ab:13:68: - 9a:26:8f:12:2d:ac:36:23:99:91:7f:5f:22:3e:f3: - 6c:a3:a1:5b:fa:64:da:dd:80:81:8f:8d:36:5b:e7: - 8f:0a:0f:84:c7:6a:fb:f4:6d:4d:3f:ce:ff:f4:1e: - c2:62:d7:95:e7:af:f4:57:c2:b8:e4:ba:d2:18:1f: - 2c:47:ef:6b:b8:7f:e3:92:4d:6d:b2:86:70:fe:fd: - 54:42:0e:88:cf:9c:02:7d:a5:11:72:ef:6e:63:05: - 81:1a:00:fc:cb:b7:91:af:3c:7c:53:da:7a:54:d8: - 3b:98:e7:de:bc:1e:10:7b:fb:60:89:e6:40:13:da: - da:d7:d6:7c:f6:61:b9:82:33:1c:c6:62:06:6e:ae: - 5c:99:ab:1d:44:a7:10:7e:03:51:dd:59:97:0a:da: - ab:c8:85:28:bd:e0:5d:12:5d:aa:02:3c:1d:a6:0e: - 6e:43:18:b6:ac:4e:7f:f3:4a:2f:67:84:dc:7c:0c: - c0:9f:bf - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Subject Key Identifier: - EA:FC:B3:3E:7E:5E:68:61:80:61:59:4C:D5:B7:A0:9D:1D:86:E5:97 - X509v3 Authority Key Identifier: - keyid:17:ED:93:43:8F:A7:A6:00:75:D4:E8:B6:82:0D:88:37:7E:C0:6D:08 - - X509v3 Key Usage: - Digital Signature, Key Encipherment, Certificate Sign, CRL Sign - X509v3 Extended Key Usage: - TLS Web Server Authentication - X509v3 CRL Distribution Points: - - Full Name: - URI:http://test.wgettest.org/Bogus.crl - - Full Name: - URI:http://test.wgettest.org/Bogus.crl - - X509v3 Subject Alternative Name: - DNS:WgetTestingServer - Authority Information Access: - CA Issuers - URI:http://test.wgettest.com/Bogus.crt - CA Issuers - URI:http://test.wgettest.com/Bogus.crt - OCSP - URI:http://test.wgettest.com/ocsp/ - OCSP - URI:http://test.wgettest.com/ocsp/ - - Signature Algorithm: sha1WithRSAEncryption - 3d:8d:a9:7a:8c:32:7e:7a:9c:c5:d6:14:d4:05:3e:49:50:d3: - 11:a4:61:df:82:91:c3:87:26:9d:fb:3f:2f:b5:10:86:22:f0: - 4e:c5:54:6d:09:33:17:3c:0d:aa:87:43:2a:89:62:c6:28:b5: - 4e:41:17:7d:57:ad:76:f5:3e:c6:e7:b5:3b:21:16:79:7b:a0: - 42:ee:59:88:16:92:4e:3d:8d:ec:8e:87:07:3b:8a:dd:55:1d: - 0a:f2:ea:aa:e7:20:6b:0e:4e:f5:33:46:34:16:8c:be:61:b1: - 6c:47:52:03:cc:df:8a:3e:cd:01:92:6d:1a:39:5a:d0:75:38: - 71:f2:b2:78:65:26:5c:c9:72:c6:26:dc:09:ee:b6:e8:b5:60: - d6:e8:09:d0:db:ea:c5:80:8a:86:c0:f9:97:1d:44:94:33:c7: - 73:39:d0:5e:62:e7:90:d8:1f:23:09:98:18:c6:da:28:b4:30: - e0:d0:6f:20:a7:a4:06:4e:ee:b4:ef:3e:18:16:0b:f7:46:f0: - c7:d0:6d:41:1e:cf:c7:08:78:f7:22:b6:a7:c5:40:be:09:61: - 5a:65:71:c5:37:33:f5:c1:8c:b0:c3:1a:d8:9e:a2:98:71:10: - a3:39:c5:d2:57:5d:24:62:dc:48:58:2d:1e:f1:29:54:a2:e7: - dd:86:09:1b:a6:b4:27:27:e1:7f:04:98:92:2e:e1:68:48:51: - 38:44:59:9a:3e:3d:e9:d1:69:db:eb:4d:27:d6:9f:a4:d0:4a: - 58:10:ca:b4:60:dc:52:5d:63:a0:73:9c:74:89:aa:92:40:81: - 91:0a:b1:ad:ea:d2:f6:bf:9c:49:ab:ce:d9:47:ae:86:8f:da: - 41:ad:ec:0f:2a:cb:f6:ce:0e:67:09:0b:75:60:16:99:cd:4a: - 2b:d1:b8:be:9b:37:58:4d:78:c5:67:69:5c:c7:48:31:50:83: - dd:10:40:b7:80:fe:d7:a4:a9:59:32:c4:3c:80:ad:6b:7c:9c: - 47:14:e8:74:18:e8:f9:ad:b4:dc:e9:f6:38:21:90:0b:58:60: - 48:a2:95:2b:a1:58:0a:52:5a:ba:5d:8e:4a:96:22:a7:8e:cc: - f1:db:5e:15:cd:e2:77:db:25:1f:83:ad:d6:10:98:1b:0a:b0: - 43:23:8c:14:65:72:8e:c4:b8:81:f8:a2:27:55:69:37:e6:fa: - 4a:74:30:fc:d0:31:e8:9a:67:cf:b0:59:e3:82:92:37:2e:f1: - 77:7f:ec:41:2d:9c:6e:46:11:65:b7:5f:b6:8b:90:fa:a7:2c: - 4e:3e:fd:18:c7:5c:6c:b6:f3:f4:07:13:66:48:43:b4:30:ec: - b6:ca:f1:3d:03:57:c1:38 ------BEGIN CERTIFICATE----- -MIIHNzCCBR+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMCVVMx -CzAJBgNVBAgMAkNBMREwDwYDVQQHDAhTYW4gSm9zZTEgMB4GA1UECgwXV2dldCBU -ZXN0aW5nIERlcGFydG1lbnQxEDAOBgNVBAsMB1Rlc3RpbmcxFDASBgNVBAMMC1dn -ZXRUZXN0aW5nMSAwHgYJKoZIhvcNAQkBFhFidWdzLXdnZXRAZ251Lm9yZzAeFw0z -NzA1MTUxNTI4MDNaFw0xOTA1MTUxMzI4MDRaMGExGjAYBgNVBAMMEVdnZXRUZXN0 -aW5nU2VydmVyMQswCQYDVQQIDAJDQTELMAkGA1UEBhMCVVMxGzAZBgkqhkiG9w0B -CQEWDFNlcnZlclRlc3RlcjEMMAoGA1UECgwDRGlzMIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAtNQL/jUlBaLsKMNq2BP3V3/28kuHZFkpy4GTwD31KzDU -MEur4Q5aV+ms0O9i9qPy1yT2i+NUmGh1vPg0TC+WbNwdr3L5xlpuDwNMRe0KF5u6 -LvONfW7pSz022XoYLiRyW5iEWwlvpfKHsw3Xk5Iub2hP2114d8ZjBMYpZ0I6bw/A -4sseUvMRC8OASj+1Xh9DDATEtPGVmOS3sEsU/hyZcPQckR7jmqL/SFT6PQHnSG8L -P0+lRbEbmA1XbxWmdbtFClJm5ht3KbrFE0GRiwugakT6jmBGjMZD3mdGHTDFznfy -SlPCJ4UfSGnIJ9+xcQlCEC5/uP6F/r05LIQqEKWAAHlCqG87VQjymMdE56C03MXB -PnUwy6l6RKihA4pEy90EdFSRkREtMs5nK68jqWk1OYx+Sv7ZtIbJ//gJhiut6xJ0 -LGolKYyrE2iaJo8SLaw2I5mRf18iPvNso6Fb+mTa3YCBj402W+ePCg+Ex2r79G1N -P87/9B7CYteV56/0V8K45LrSGB8sR+9ruH/jkk1tsoZw/v1UQg6Iz5wCfaURcu9u -YwWBGgD8y7eRrzx8U9p6VNg7mOfevB4Qe/tgieZAE9ra19Z89mG5gjMcxmIGbq5c -masdRKcQfgNR3VmXCtqryIUoveBdEl2qAjwdpg5uQxi2rE5/80ovZ4TcfAzAn78C -AwEAAaOCAb8wggG7MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOr8sz5+Xmhh -gGFZTNW3oJ0dhuWXMB8GA1UdIwQYMBaAFBftk0OPp6YAddTotoINiDd+wG0IMAsG -A1UdDwQEAwIBpjATBgNVHSUEDDAKBggrBgEFBQcDATBdBgNVHR8EVjBUMCigJqAk -hiJodHRwOi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMCigJqAkhiJodHRw -Oi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMBwGA1UdEQQVMBOCEVdnZXRU -ZXN0aW5nU2VydmVyMIHIBggrBgEFBQcBAQSBuzCBuDAuBggrBgEFBQcwAoYiaHR0 -cDovL3Rlc3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAuBggrBgEFBQcwAoYiaHR0 -cDovL3Rlc3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAqBggrBgEFBQcwAYYeaHR0 -cDovL3Rlc3Qud2dldHRlc3QuY29tL29jc3AvMCoGCCsGAQUFBzABhh5odHRwOi8v -dGVzdC53Z2V0dGVzdC5jb20vb2NzcC8wDQYJKoZIhvcNAQEFBQADggIBAD2NqXqM -Mn56nMXWFNQFPklQ0xGkYd+CkcOHJp37Py+1EIYi8E7FVG0JMxc8DaqHQyqJYsYo -tU5BF31XrXb1PsbntTshFnl7oELuWYgWkk49jeyOhwc7it1VHQry6qrnIGsOTvUz -RjQWjL5hsWxHUgPM34o+zQGSbRo5WtB1OHHysnhlJlzJcsYm3Anutui1YNboCdDb -6sWAiobA+ZcdRJQzx3M50F5i55DYHyMJmBjG2ii0MODQbyCnpAZO7rTvPhgWC/dG -8MfQbUEez8cIePcitqfFQL4JYVplccU3M/XBjLDDGtieophxEKM5xdJXXSRi3EhY -LR7xKVSi592GCRumtCcn4X8EmJIu4WhIUThEWZo+PenRadvrTSfWn6TQSlgQyrRg -3FJdY6BznHSJqpJAgZEKsa3q0va/nEmrztlHroaP2kGt7A8qy/bODmcJC3VgFpnN -SivRuL6bN1hNeMVnaVzHSDFQg90QQLeA/tekqVkyxDyArWt8nEcU6HQY6PmttNzp -9jghkAtYYEiilSuhWApSWrpdjkqWIqeOzPHbXhXN4nfbJR+DrdYQmBsKsEMjjBRl -co7EuIH4oidVaTfm+kp0MPzQMeiaZ8+wWeOCkjcu8Xd/7EEtnG5GEWW3X7aLkPqn -LE4+/RjHXGy28/QHE2ZIQ7Qw7LbK8T0DV8E4 ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/invalid.key wget-1.20.1/tests/certs/invalid.key --- wget-1.19.5/tests/certs/invalid.key 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/certs/invalid.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAtNQL/jUlBaLsKMNq2BP3V3/28kuHZFkpy4GTwD31KzDUMEur -4Q5aV+ms0O9i9qPy1yT2i+NUmGh1vPg0TC+WbNwdr3L5xlpuDwNMRe0KF5u6LvON -fW7pSz022XoYLiRyW5iEWwlvpfKHsw3Xk5Iub2hP2114d8ZjBMYpZ0I6bw/A4sse -UvMRC8OASj+1Xh9DDATEtPGVmOS3sEsU/hyZcPQckR7jmqL/SFT6PQHnSG8LP0+l -RbEbmA1XbxWmdbtFClJm5ht3KbrFE0GRiwugakT6jmBGjMZD3mdGHTDFznfySlPC -J4UfSGnIJ9+xcQlCEC5/uP6F/r05LIQqEKWAAHlCqG87VQjymMdE56C03MXBPnUw -y6l6RKihA4pEy90EdFSRkREtMs5nK68jqWk1OYx+Sv7ZtIbJ//gJhiut6xJ0LGol -KYyrE2iaJo8SLaw2I5mRf18iPvNso6Fb+mTa3YCBj402W+ePCg+Ex2r79G1NP87/ -9B7CYteV56/0V8K45LrSGB8sR+9ruH/jkk1tsoZw/v1UQg6Iz5wCfaURcu9uYwWB -GgD8y7eRrzx8U9p6VNg7mOfevB4Qe/tgieZAE9ra19Z89mG5gjMcxmIGbq5cmasd -RKcQfgNR3VmXCtqryIUoveBdEl2qAjwdpg5uQxi2rE5/80ovZ4TcfAzAn78CAwEA -AQKCAgAZRMBgR4Di5r9letlFVJTtrz4M4a0LwsHqZDMHXCEUZgBgt1JPYrgRLOAv -WiRUHtjiY5HoPl4l5gL94xk7xDKbB69GQyTQKPbUNjvEUbllTyeXRAVzj7od/3HY -tg0G9aTdU9S6+/iUEe4QgVCsmHLQspzmJIufASP5GM/UVBbiSitEBeo44SpyoGEe -/wQTIP83gLsUJeYntV5NzlAiqlBuzk3noY9gnoJZ0zYcrFVrc8j4keKgeH1IpCSh -qz7VmNOu+5DReukN9cFwTWtPKNLDxtvUZXO2XEZDn97WWWhqz6wV4tpwt1OFxPJp -UAL1rruCk1zZtwd2b26738QZC2d1bUdWwFo/d100cihzgvycMNCERne37ZDl4/NA -izm1nfWraYiFcbAMXLccnt19SWvPo1/UgtHVutOgTuV/dHnLq4iBktUnbiwnHrn6 -aVchQeetKtVYtjDx3ioP1v8vnYtZiKh7TSePVrOZPQah4H3wqCvxawdRFsK4jSXq -KFtCCDaspFcIcbkPnfRnCnojFnXwso0d0o3g0sY6RIRmkIrdzbFTwtYPTgiTP7A+ -F2LMjvAdkEQFHPop2vtji9tlMdNSK/zlG4M74Vc68IKa5/JtsnN+TjCkVlQ2uwfo -/NJnGANZZZm3kpS+an7XrwJMo8WqWt35jS9i3mt0/awzTEVAoQKCAQEA4jvWInF/ -PK34RUzrVA4Xc5QCkVqxbcSu6+V2EKKLhS15eqp+jaBhUSL+d8e2oTIYCIEf2YWK -7lrD424NR/i93TlBVdkg4AjZ6yvjFRqdK6+6NjINvgObkcdDMORrPxE5h2n1LoO0 -efHwRD3Ae1PHOgSPZHNHL75lfH4wzQOmHsBm6Oucu9DBFa8mAhFONrZOSFsD6cbi -6B0Qdpz/Eb0MrNF8pJA0rupe88Jg1d6/DX24TIUMaKEd3rbqb3YENBw9mPlT1Vr7 -VHvR9oxyZgQ69sx9BblBVilyXoxtZclL1ebx/03zvzZ4v1PgP7x4eW1Upz8QyaBh -KFed6yrzrJYc5wKCAQEAzJ7VNzxzTMfKgw/Ps3Y10qHTigyZ48y+6tMFGoc5ecul -8zsElksR35D0wBsJHmoVLs0JFH2vsuWPFqAaS34o3ayaXhMOkD6PuwKN2jJOckxn -3Urh9dQ5S0j2L4ektRt1dTTJrYDTpMShBEAuYBeDEiuEVYH+ccnPLhL7Tz/Kwfkj -cfjo1WwmU3JMo3hSuEKRkdchYdS6F9sHeC04qjYzJSyKkvuularZN8alkiR8xJTx -9iwjst0K9JEgL/pe3KvNx1ukh/jLPB3B6RtUhy5EWlT/IsO2MUyn0GrBRvR+CugF -LdND4zJQEMy1FRdVjch2HZjOBuNCW5YOjvtb+NVzaQKCAQEAy4UC3Vd3HFJxD37k -EWjf5gTXzoVlKpeOuP5jGRHxK6y+JQDt+mC2S3SMsZrDi/3xquzmhxvg4Q5cPOQL -JJz7yOEyCpXbQlAUIsEHdzvK+rsKbKjYvgCm2h0FMB288S6Ar3Y9sEuhdzaUa/+V -ghzbFDF4AejGuIey6qznH/fRYMa7jXwwMrHYkbZQHfoNf6C/ic3/Fjbqd991qQ8R -U5bbqTiHxc9I5bZIF0fdL2lEPFHGE2h5wkJ3CZ1KB12G6I4jR9O8fCpuARGm0AKH -A4l4tf891YFT6rw8fBweajwNce9h8sfgqDrLo2tESHI3ex1E03QjmQ8jeFRh52Zr -ce5VLwKCAQAxUyBmnkXU/lxM16Tjx90VlzjdEEiQZyymgpO6X1p1h6fLSDDE4fe/ -ArxdCqdaE4xjqb1EmT+fSkMB2zo7dH/5X8AeaU2ba9lN5UG4lWPfnZdz+rcZgT0G -buIZdwM3PRVFWaI8Fs/t6hA+bBJBy6km2iKeUiW53EH7A0xdQC1qMNpggPXvbJCY -kPb0eO7HyBQ7Kba8VIE/eucECzKbpVES5vfIkq71GSgfj90dq3oAET96bg108l/P -sKQnrJztaOTD581zkX+8UBgMTzBDHd4QQGj4QmFK5QWW8gUBS7KOgnutHj5BKEGw -qwgDu4o+EVKXs9wGQQYf+b4srV7wTtPxAoIBAGnAVJA9pLhXHG0ClgbAyHDyK/uG -/OSDkfJwLtauYs5ZpLIe0wnNJgDUWs4Sk/1UpedZeg5YuyjGJsBwwOLKmv4Smxgf -2/j7mEU6otSeIdgGwrWdCGbQij4tWE0g6KehNbovOZm0dpUPw5LZqynWbkioSP/L -qFSGfxvqdwYM0Oe+GI6gxXA9OU6kzZcXXYiq08eFaRWHcrksGHL84tp4T3OoL/Xq -EBDHD8byyvCcOTb7aAopAA+XVWZEACeHbAHbyoD8t4aXRVWSddOBix/tM5aSIcvb -G4I/tnbAb23NFmgLNxsUEg5zE0NklQx6ogt+OdEHmjTbDFCAnPFYEZ3Romc= ------END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/invalid.pem wget-1.20.1/tests/certs/invalid.pem --- wget-1.19.5/tests/certs/invalid.pem 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/invalid.pem 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIEzTCCAzWgAwIBAgIMW+WWpBUMPLiaHr/bMA0GCSqGSIb3DQEBCwUAMFIxDTAL +BgNVBAMTBFdnZXQxDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTERMA8GA1UE +CBMIU3Vuc2hpbmUxETAPBgNVBAYTCEZyZWVsYW5kMB4XDTM1MDIyODE1MjE0MloX +DTA1MDIyODE1MjQ0MVowXzEaMBgGA1UEAxMRV2dldFRlc3RpbmdTZXJ2ZXIxDTAL +BgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTERMA8GA1UECBMIU3Vuc2hpbmUxETAP +BgNVBAYTCEZyZWVsYW5kMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA +sNRnU60QudO+MD8QbYbKtD09cxTCqT7ozRAk5yt5ETwMlGLHBBsEcFDStuwdgXci +ddoXXulLEvuHSobTCdR0GK0ifCxDRwddvE2heudxZtp5xKUHEb0LFob7boRt1Emu +HeXLk9U81oUdDmEEyEW0xmKeaPI4cKJ/n4vczLIpH8+rQD/2AJwWSC+OFnUpt78p +vQzfObKIakr81ckw0G49A6p9OFO7l28AUzwB7UUpnRKllC44FZ5LvsXdK5SQQ44r +f4do1PjTflC9L9iccSdqq4z+FCL0rwK3Wpw+Ly5HeBGtsfMk88Eg00KeF9Fym5ho +bcrky5EPFBLhRJ/k4BGnlGnxboFdKK8Gyna7ivAIhvXJ+9sbnfg7FPQ+MEnpqJzq +i/ziJzC339ruJqYWted/tGlYbPm8M02MmIejGYnMp85v6tnhkToaDKeElAp7E6wC ++/fl3LQyW9vvWdSiVl29sAG1QlVq2IFfprRkRwy7SwsBPTtgIHwm7JyG2kYA/2vB +AgMBAAGjgZUwgZIwDAYDVR0TAQH/BAIwADAcBgNVHREEFTATghFXZ2V0VGVzdGlu +Z1NlcnZlcjATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMDByAAMB0G +A1UdDgQWBBSxiQDjENGd3WwSbMM3SdgZqkgNajAfBgNVHSMEGDAWgBSeDlsijPvS +jydT1dYKDMsNWQ9kmDANBgkqhkiG9w0BAQsFAAOCAYEABiAwqOoIbbA5q3IvEU3X +qZ9WYemx1AVvUpJY1ft+hYqc6Z/XJfXzHb6xzN6duzpjC5/fER+FTqGk7PpIp17q +9WAABo+LGM1fEDNvTJ4+v054Yi2qbV151T8xwv5xvMsI6VOx2+fMFBsKYrvoee1i +NBlyUIoeBjWmauHouXslQY1BKxhNgH7qYVr+LN9cicJEJNgsVcjfGGXOvf8PHMNZ +YxCEVZDhQ7F7Zqpy+84z8gaEhthZ19tdfuVEW40GX1mOVk6MAWTolKd5EK1CYOS6 +Dtth4yJivopbG4UwMAOQvHq6t1jXAubYXyrVoxMVw0BOCimiGuPWqHYR3rmTgQWS +ABwsxcc9RtDbF+PcXpqLRSUwTZLjo39xvy2mIAdssE+dKqWPqgIk8+3InJJI/9Fq +NZaY4p+olmPQUHw8GFrB/jrm8GjGzt0Z+IACcNEr+SD5BSmNKlCe70xyBVfdmwHZ +o62bYy40zCW8+3lzLQoi+t5PYXIF/ioUJP67EBYkWGf7 +-----END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/invalid-template.txt wget-1.20.1/tests/certs/invalid-template.txt --- wget-1.19.5/tests/certs/invalid-template.txt 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/invalid-template.txt 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,20 @@ +# Template file to generate expired.pem for certtool (GnuTLS) +# see 'man certtool' for more options + +organization = "GNU" +unit = "Wget" +# locality = +state = "Sunshine" +country = Freeland +cn = "WgetTestingServer" +dns_name = "WgetTestingServer" +#uid = "wget" +#dc = "name" +#dc = "domain" +activation_date = "2035-02-28 16:21:42" +expiration_date = "2005-02-28 16:24:41" +#ca + +# key options +encryption_key +tls_www_server diff -Nru wget-1.19.5/tests/certs/README wget-1.20.1/tests/certs/README --- wget-1.19.5/tests/certs/README 2018-05-06 15:18:45.000000000 +0000 +++ wget-1.20.1/tests/certs/README 2018-12-26 19:58:39.000000000 +0000 @@ -1,87 +1 @@ -# create a CA certificate -$certtool --generate-privkey --outfile test-ca-key.pem -$certtool --generate-self-signed --load-privkey test-ca-key.pem --outfile test-ca-cert.pem - -Common name: Wget -UID: -Organizational unit name: Wget -Organization name: GNU Wget -Locality name: -State or province name: -Country name (2 chars): -Enter the subject's domain component (DC): -This field should not be used in new certificates. -E-mail: -Enter the certificate's serial number in decimal (default: 6080487640893163573): - -Activation/Expiration time. -The certificate will expire in (days): -1 - -Extensions. -Does the certificate belong to an authority? (y/N): y -Path length constraint (decimal, -1 for no constraint): -Is this a TLS web client certificate? (y/N): -Will the certificate be used for IPsec IKE operations? (y/N): -Is this a TLS web server certificate? (y/N): -Enter a dnsName of the subject of the certificate: -Enter a URI of the subject of the certificate: -Enter the IP address of the subject of the certificate: -Enter the e-mail of the subject of the certificate: -Will the certificate be used to sign other certificates? (y/N): y -Will the certificate be used to sign CRLs? (y/N): y -Will the certificate be used to sign code? (y/N): -Will the certificate be used to sign OCSP requests? (y/N): y -Will the certificate be used for time stamping? (y/N): -Enter the URI of the CRL distribution point: - - -# generate a server certificate -$ certtool --generate-privkey --outfile server.key --rsa -$ certtool --generate-certificate --load-privkey server.key --outfile server.crt --load-ca-certificate test-ca-cert.pem --load-ca-privkey test-ca-key.pem - -Please enter the details of the certificate's distinguished name. Just press enter to ignore a field. -Common name: WgetTestingServer -UID: -Organizational unit name: Wget -Organization name: GNU Wget -Locality name: -State or province name: -Country name (2 chars): -Enter the subject's domain component (DC): -This field should not be used in new certificates. -E-mail: -Enter the certificate's serial number in decimal (default: 6552424755099978648): - - -Activation/Expiration time. -The certificate will expire in (days): -1 - - -Extensions. -Does the certificate belong to an authority? (y/N): -Is this a TLS web client certificate? (y/N): -Will the certificate be used for IPsec IKE operations? (y/N): -Is this a TLS web server certificate? (y/N): y -Enter a dnsName of the subject of the certificate: 127.0.0.1 -Enter a dnsName of the subject of the certificate: ::1 -Enter a dnsName of the subject of the certificate: localhost -Enter a dnsName of the subject of the certificate: WgetTestingServer -Enter a dnsName of the subject of the certificate: -Enter a URI of the subject of the certificate: -Enter the IP address of the subject of the certificate: -Will the certificate be used for signing (DHE ciphersuites)? (Y/n): -Will the certificate be used for encryption (RSA ciphersuites)? (Y/n): -Will the certificate be used to sign OCSP requests? (y/N): -Will the certificate be used to sign code? (y/N): -Will the certificate be used for time stamping? (y/N): -Will the certificate be used for email protection? (y/N): - - -# create a CRL for the server certificate: -$ certtool --generate-crl --load-ca-privkey test-ca-key.pem --load-ca-certificate test-ca-cert.pem --load-certificate server.crt --outfile revokedcrl.pem - -Generating a signed CRL... -Update times. -The certificate will expire in (days): -1 -CRL Number (default: 6552487324127713992): - +If ever needed, 'create-certs.sh' generates all keys, certs and crls. diff -Nru wget-1.19.5/tests/certs/revoked-crl.pem wget-1.20.1/tests/certs/revoked-crl.pem --- wget-1.19.5/tests/certs/revoked-crl.pem 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/revoked-crl.pem 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,16 @@ +-----BEGIN X509 CRL----- +MIICejCB4wIBATANBgkqhkiG9w0BAQsFADBSMQ0wCwYDVQQDEwRXZ2V0MQ0wCwYD +VQQLEwRXZ2V0MQwwCgYDVQQKEwNHTlUxETAPBgNVBAgTCFN1bnNoaW5lMREwDwYD +VQQGEwhGcmVlbGFuZBcNMTgxMTA5MTQxNjA0WhgPOTk5OTEyMzEyMzU5NTlaMB8w +HQIMW+WWpBMQnOLkjLG8Fw0xODExMDkxNDE2MDRaoDowODAfBgNVHSMEGDAWgBSe +DlsijPvSjydT1dYKDMsNWQ9kmDAVBgNVHRQEDgIMW+WWpDAhS8Dvbk2wMA0GCSqG +SIb3DQEBCwUAA4IBgQCNblPk62TVxX2dFmY5IqMGnrBNwIgMehX1q6p5MYEkRGne +qJ76ZhvNPZMXh+gM5SHzp9zKicRiGQu2RL5lPOJ7FDnmoQrTXxAORFqJUGDa681p +DMT5bkYkkwNT0+goyinDc+8Zw8DsXPYNO7bi4JcwDtBky5tSt/BPXjfT0Pi5I4Ki +Gf/sdIIGCYd+s4IlHDtnBn1cz33TDZZ4efEYVKI2uqSihtchDbCLR/TouQB+f9G/ +FL67qeNdE7h+D5MEYyHLwlZ0yMl7Om1kDevKyODWL+wh2+QK8rkdC2YYkDqy20Gc +jNqUHvGZDGnjh6iwoC2WcStlin45KNaSWEvU9WirYvqxLap4CRDfBXlcI8vuWUZl +HCovBQBTeuNNVkMShyTWlK82qC3idWWmsGk0UdvUmkR/TOu+RACdeFhyqlu1RXwK +TC9I7yBCVATs7NGdTCK98PGuqt08IKuqNhZ5qAEk2JR2iF4HoIeIC0hpjJEF3DWi +PwayMhMirDuyo8yMTHY= +-----END X509 CRL----- diff -Nru wget-1.19.5/tests/certs/revokedcrl.pem wget-1.20.1/tests/certs/revokedcrl.pem --- wget-1.19.5/tests/certs/revokedcrl.pem 2018-05-06 15:17:23.000000000 +0000 +++ wget-1.20.1/tests/certs/revokedcrl.pem 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ ------BEGIN X509 CRL----- -MIIC0TCBugIBATANBgkqhkiG9w0BAQsFADAxMQ0wCwYDVQQDEwRXZ2V0MQ0wCwYD -VQQLEwRXZ2V0MREwDwYDVQQKEwhHTlUgV2dldBcNMTgwNTA2MTUxNzE5WhgPOTk5 -OTEyMzEyMzU5NTlaMBswGQIIWu7jmTk1y5gXDTE4MDUwNjE1MTcxOVqgNjA0MB8G -A1UdIwQYMBaAFH681m4jgi27YaqRhfZ+jeWJEyn/MBEGA1UdFAQKAgha7xyBNeHa -yDANBgkqhkiG9w0BAQsFAAOCAgEAYLQQbcz/tfEC02QEIWu0S39e4+b+lssOsZ4u -ljcz0UfavagkLLTiunFQx64no0d+xRzk5c1IZd6HGmf2TokIK0+6bkTJejLLeL7G -3mmhzbFY8tQYcCEbcJL2fj5jmQAd33nr+wZkajQWLt6PbuGmpLpXz9lG27RKm8xc -5TD51+5RwwWUrsFLwEt7xnk7737zB4flZmjpvlHvGVDgp81SVndghVvpUcqQSCwq -XgvgbxYy+f1peHV0matV3it9jmwrCfOBkxD2zOX6UphUn4upXNGuHR0zLN37CINA -OoYlFtHRsabbW/c2b+qUBBw4OniH7g/HMH3/p8MUrMmInxE1/cZCmTcR+NUyogqo -VtDFAG8UV9MFyYK6vCfUqgrE3UzSXvKIXoX6DypOb4wgXdHF8dt93yUOSHVynjON -FbgpHz8XUj6r/o0OcJioACCSv3j34w7Hvwh/8jkHBKucjWly/IpyQjs+qiLbnGmN -Fqf/kuLKqxrXrkvePyPMts5w+eIXauGy+a5p72H58ZncoV3+w0v3LJpQ0G0lnjnV -nQGKm1MUAfcDZQr07iEva7DneoMCZIB1CZz1Yfp7/7oY1BRF1KsyknI5Fh+gSiUp -LdC4ycYcO1RSfPnKx7Hw+VeiFVy2Ka6Yi346zlJMAyFDyxqYG+tbHQLwF3flTtW7 -UYoG2xE= ------END X509 CRL----- diff -Nru wget-1.19.5/tests/certs/revoked.crt wget-1.20.1/tests/certs/revoked.crt --- wget-1.19.5/tests/certs/revoked.crt 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/certs/revoked.crt 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHOTCCBSGgAwIBAgICESUwDQYJKoZIhvcNAQEFBQAwgZkxCzAJBgNVBAYTAlVT -MQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxIDAeBgNVBAoMF1dnZXQg -VGVzdGluZyBEZXBhcnRtZW50MRAwDgYDVQQLDAdUZXN0aW5nMRQwEgYDVQQDDAtX -Z2V0VGVzdGluZzEgMB4GCSqGSIb3DQEJARYRYnVncy13Z2V0QGdudS5vcmcwHhcN -MTcwNTA5MjIzMDE5WhcNMTkwNTA5MjIzMDE5WjBiMRowGAYDVQQDDBFXZ2V0VGVz -dGluZ1NlcnZlcjELMAkGA1UECAwCQ0ExCzAJBgNVBAYTAlVTMRswGQYJKoZIhvcN -AQkBFgxzZXJ2ZXJ0ZXN0ZXIxDTALBgNVBAoMBFNlcnYwggIiMA0GCSqGSIb3DQEB -AQUAA4ICDwAwggIKAoICAQDOQ+DNimL/GtTaZZotU21lLk4tZnbLrgJkBjlIWQvU -N91vhjrQqJDK7pwojk5kKZ4RL+ZBPdd0dYgXMNaDflv9mlwlzTIwy0nveY7/APML -R4p+PtbmKVP3YXe8kLmgkJklWntu6iCVhESO8PJ/It2KUS6bgr/M2zXN6HiPlgns -IyH1Mo+Nxtvs7Hz+Qc+37rctmgtSR25qfQtqK4MmzeAGcMIG3JRlVT6B1cjlOmIJ -23+KCd24tng3+G0+4u1FnIQS0Z25yrPWSvRSZJE678zQDDxzd6gGsuQbG/fniTIt -Csj/9SV+6C12ZIl/j5snzdNJtb72s5BlcTVIiTXXwOxx+1/IKvTRCpGUDF+7jLHF -68jIIzbP7z2lSWJz70MDzZoyT63rgnlakrwwcvWK45cCuyHVrItPDOcPbiVfJYP7 -OSafzC2NqtK+JdY5/RWhEJIgm86nbPvZCIh9xAVpVXg4NXLvPBW+hwN1V5GFY6Pk -9LG2IYEedUabHtojFC8JK8A+cHFsVn1Kur5Gn1aqp/lYotIKZ1hWryFB6gmOfK6J -RI1Vrj/j/hSfFY5yZFRcb1qlP1Z1yi6X6WFlIU10JRB9qr1Pc5ohDDN9fwtL/n5b -gzPP22NsOcIomf5PdPTjmI2JKe2cQRPZkatNoKqFmgPy6gR+jm2auQkKDzXhP18+ -xwIDAQABo4IBvzCCAbswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqTa7LrpK -PiP4/zI29dHqqxgv/SkwHwYDVR0jBBgwFoAUF+2TQ4+npgB11Oi2gg2IN37AbQgw -CwYDVR0PBAQDAgGmMBMGA1UdJQQMMAoGCCsGAQUFBwMBMF0GA1UdHwRWMFQwKKAm -oCSGImh0dHA6Ly90ZXN0LndnZXR0ZXN0Lm9yZy9Cb2d1cy5jcmwwKKAmoCSGImh0 -dHA6Ly90ZXN0LndnZXR0ZXN0Lm9yZy9Cb2d1cy5jcmwwHAYDVR0RBBUwE4IRV2dl -dFRlc3RpbmdTZXJ2ZXIwgcgGCCsGAQUFBwEBBIG7MIG4MC4GCCsGAQUFBzAChiJo -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vQm9ndXMuY3J0MC4GCCsGAQUFBzAChiJo -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vQm9ndXMuY3J0MCoGCCsGAQUFBzABhh5o -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vb2NzcC8wKgYIKwYBBQUHMAGGHmh0dHA6 -Ly90ZXN0LndnZXR0ZXN0LmNvbS9vY3NwLzANBgkqhkiG9w0BAQUFAAOCAgEAPUgd -LtrK+WYYhSJkvsa7pB6hUmZFMiqs1/uJqz8b8Q6uX33IXyg5zmFU07d3uOrFYSXi -MFMhpw2A/D+CbPECaPEWGXII8dh9WlomxpjpZABZ/cmeG2SM7BxVwjIjACscXogJ -A/Gm7I0hhvYSZ/G+kFbYbSf/Pj7Rz/4KW6WSwwQK23ab00MXBM6jWEueAeWebzeW -rzWgyyy+GiqgLqQAKQrYtD51uF5Co+S0e2wazORLakvdF/USCBQwX+Pla09Wyf+b -0HBqNjuxQc278/69Xp0mg8k67oUrWt3zgJ8kDhNIGvLnCB+0595G/z+7+mxdEztc -BavKAMEDWTSCClwxO6lBQR7+oiNWdaaqHP1SS8sckjtt2jTbmjmRzWWkU+xSIlt2 -waIXS/BYRbyhLuWfxivvRjS7eQogeSP0rtZj/upBwM4xKVPF0bal/LMyEfrY3qV5 -8YXXFhnoVr7q3t0YaioIZXY35QcA5aR+P4XyLnzCTVuKUi172BS8KJBXMijEXxta -rRQxtHLQeYB5eP/MaC2qMJH/OMR3A9Z7sXYbp/YuE+V/MxcGwAoHWKxMeKtdF420 -HGeKfzMla6uJQk26VEFAt+TYV2KUriPWyL/IPDzAjrSPMF9ZDIMhqELjFYCRGPwc -X6txpIEgZCGdJWK0H3et8ZSe469AED6oqTfn44w= ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/revoked.key wget-1.20.1/tests/certs/revoked.key --- wget-1.19.5/tests/certs/revoked.key 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/certs/revoked.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJJwIBAAKCAgEAzkPgzYpi/xrU2mWaLVNtZS5OLWZ2y64CZAY5SFkL1Dfdb4Y6 -0KiQyu6cKI5OZCmeES/mQT3XdHWIFzDWg35b/ZpcJc0yMMtJ73mO/wDzC0eKfj7W -5ilT92F3vJC5oJCZJVp7buoglYREjvDyfyLdilEum4K/zNs1zeh4j5YJ7CMh9TKP -jcbb7Ox8/kHPt+63LZoLUkduan0LaiuDJs3gBnDCBtyUZVU+gdXI5TpiCdt/ignd -uLZ4N/htPuLtRZyEEtGducqz1kr0UmSROu/M0Aw8c3eoBrLkGxv354kyLQrI//Ul -fugtdmSJf4+bJ83TSbW+9rOQZXE1SIk118DscftfyCr00QqRlAxfu4yxxevIyCM2 -z+89pUlic+9DA82aMk+t64J5WpK8MHL1iuOXArsh1ayLTwznD24lXyWD+zkmn8wt -jarSviXWOf0VoRCSIJvOp2z72QiIfcQFaVV4ODVy7zwVvocDdVeRhWOj5PSxtiGB -HnVGmx7aIxQvCSvAPnBxbFZ9Srq+Rp9Wqqf5WKLSCmdYVq8hQeoJjnyuiUSNVa4/ -4/4UnxWOcmRUXG9apT9Wdcoul+lhZSFNdCUQfaq9T3OaIQwzfX8LS/5+W4Mzz9tj -bDnCKJn+T3T045iNiSntnEET2ZGrTaCqhZoD8uoEfo5tmrkJCg814T9fPscCAwEA -AQKCAgAEWkxZKg1ywrcxMKmzQSpy0ypVLO9e1vo38CWvUCm+vbsPim6dTqFXlvd2 -p6Ih3Pr38+HRCKQOUhigHKi6N6VrUaGWLqFbhD64LgGFghie6VCT33Gbg83Az66+ -LPOt3r9MmX83VPuBDDyCI7WKV0sDizkHkRfJE+srwDcjGJB3CjrCOOHspQCpHEh6 -+RqQEBqPfMu2XcmHt8HQ6MAoxnluyVxe1rLO/KCIDuHhbHz7JkWnvROPvVIGJFjx -1coaCPaEiyXf8NYgtI45WuPxsXPKBCgWa7UBBy9nHwz5Ntz3NF4PgLXc2rty3yZD -qd0lVuOZj5tLC3kFmwD72eFn/ys+JtIw9a2wwQ1sGbNa764yY4T3GWLJ6HgHHhPk -D94PC7wfBFzoZtUoZrE0T4XP8TrM730SERj0HCNfURnYlYR6mqj+0pVTHZaeXEho -NZdDgdWP0b8v+EZky1L5pgM761GtJ9vKHZMMBj0/hVULIkpVcf5gs5fwGiXzj/o6 -CcSoLP4JvFm8nINH302dBzS0o2bW4fZehvRtiapdu6kXE9k7ZsnpFcvMCxmtHJGd -p3yRyhqO5CEMVJOVJSpNQqRueyd8X6QRbuFsGG+FcBOTe9DxIcdzKkwHRAo1osRw -mPF85QzsgF7tWw/AoYzi5FupLud7HUNg4ucQS6NZdKM+DvEzcQKCAQEA7tPxo01m -z3MAJdHtyG8PE66SNCXBDyoIYhXl1EiYppPn75jjOnaIK0sRSJF9DX6rt+7OX6Jd -InhqEJKFk22pJ7lcACBZl0Obg9RBTd2hNKWkH5oRvPOHwGC8NF34HDxpgY6utw3Z -LiLr8nwLZkd7FXGi6GFL0wB2YQhXqn2cJvPSgnNE8HQINU5OHfEMPRhikat8+OoJ -ZVgm8kQ5N7sy6Up9G2OCF8iV/qkSLYyVATN/5SZmLohSWlSJZIfMJe1tEexSOQEM -8wQxgBaJNqBXeeEOR7XIrbCcc50ZZ6INzR1Hdakyd27Qi8gOJqCKkAOS8bwlGzMb -5Na7xm4/GQn5eQKCAQEA3RiO6x66Pmsuz4Q+2+3sZFipX9D1GRnMRVSsgd/HjtZk -8NkaGXI2NA5GdVXmZrWl/65kAcDsh93+rv1X7hKYkTkpOE+G1Zkj8mLgEN3V0nh9 -WoPcrqthzvRNUUuklJCuxAGA3mgKIUuSW4oBnBgop5EFtz9Y0aai/wP0gdAp4/7S -CR2g910KgvDtbsAp93hTBrzzu/+Engar5mdZKvqCl7uOxWqSmeaPD1tucraDX0e5 -rd3KE/vXd9RSlcWiJmKkqEiNnsQ2XnwjiE0jJdJdH5z+Vo7OqfexXDsydtFKrmke -2ZQ+eajLU7iXipiYpM+wWkwGGdUFdJAi+N7T6KUqPwKCAQAe03Zt+JCbmCFdwFHr -vAH7LV4rou/fUDKSznbCxrgFUDPwphA2PJRo2iCZ+EVm14G8lPNIPsG8sEQobXEW -TWI3AWLRlVta/dv10RC4xzGGhRbBCXbep6RO/W1taO+cXWPU2CDO+dedb956hu5F -vlYxt2AqlFxgGMAu2A/QrrPYB0KVmeE9FAz3LGtCzBkjTaFzYeoYisS5sv4b6Rhl -jCEPIZEyVs602SwbGaGCBZI5/Ha2khVATlIq3Jx7QFfmUVXxqUoXl34fY9wrxzzg -syN3VMguE1WaraAUACQGT1FutyfBFRyxc7kxQZop/DDGU9/Emd9EOn2QNPM5soMs -bTApAoIBAAZnMaxphWdNX1uvLsrbxx7Y2n7l5FNHxfy0CRLx0iu21dGL2A+omR1E -1JGNXVDYLeiLumW6mp8MtNWIjMVeUIDUMPdqhjMlbj8U0fxrEEg6KRc3/moomHqP -5LVYBXov/n+6s2q9hJ2WPLTd+FH2+SZxMsMt2Hqp4sqT6L7hsnTh6l9NNl4zmZxV -MeslMZHzMCRf0Ic/TS3ub4gKsjBmdOXEDsx0264NWVNOiJJV6tQVlbENXU7a2lCk -G4gu4xVNggtFnqRcdl6iJb1KzpvHzd6eg1cqZ53QiJhtNnbudMU8UiJnArAvTUQt -cmYXKUSMp0TWMs8ItlG74udmPKjeL60CggEAdUp2FbZZEB3/G8tR7Z5slF925zXK -N8ku/qOUEk3d76kcqYi9XJLmyJAXu9PhQnsN8DpfThOqJUXCh9xtk+1AiHTdXk8m -BP7RE2oI2aoT9lO0ozwFJBFRRCkd6zTtYJYUbwIk1nayro83xl/AQPF2wRm5unKU -xl5KJ8I2GCUw4Bh5Gjwk21y6XpPsjO8tfbO5jrAIQVTqab3hAcBouwQNsxNpunJm -BaP+XYTBNM+HVamwLwDQgtVxPb8WUX8TSTuFv99jpWBYhlhq/OUcbo8f1D7miIFt -b6UYNl1ofvBtqjlNz3NKJ+S57AN+jcdQfOG8xAiKPWCj1QnVc3aJdr+8bQ== ------END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/revoked-template.txt wget-1.20.1/tests/certs/revoked-template.txt --- wget-1.19.5/tests/certs/revoked-template.txt 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/revoked-template.txt 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,5 @@ +# Template file to generate revoked.crl for certtool (GnuTLS) +# see 'man certtool' for more options + +crl_next_update = -1 + diff -Nru wget-1.19.5/tests/certs/rootca.conf wget-1.20.1/tests/certs/rootca.conf --- wget-1.19.5/tests/certs/rootca.conf 2018-05-06 16:47:57.000000000 +0000 +++ wget-1.20.1/tests/certs/rootca.conf 2018-12-26 20:09:06.000000000 +0000 @@ -6,7 +6,7 @@ authorityKeyIdentifier=keyid:always [ myca ] - dir = /home/tim/src/wget1.x/tests/certs + dir = /tmp/wget/tests/certs new_certs_dir = ./ unique_subject = no certificate = $dir/test-ca-cert.pem diff -Nru wget-1.19.5/tests/certs/server-cert.pem wget-1.20.1/tests/certs/server-cert.pem --- wget-1.19.5/tests/certs/server-cert.pem 2014-02-27 17:11:10.000000000 +0000 +++ wget-1.20.1/tests/certs/server-cert.pem 2018-12-26 19:58:39.000000000 +0000 @@ -1,22 +1,29 @@ -----BEGIN CERTIFICATE----- -MIIDnDCCAwWgAwIBAgIJAIsoR6UicPPEMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYD -VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTETMBEGA1UEBxMKU2FudGEgQ2xh -YTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRQwEgYDVQQDEwtN -aWNhaCBDb3dhbjEfMB0GCSqGSIb3DQEJARYQbWljYWhAY293YW4ubmFtZTAeFw0w -ODA0MjIwNTQxNDBaFw0wODA1MjIwNTQxNDBaMIGRMQswCQYDVQQGEwJVUzETMBEG -A1UECBMKQ2FsaWZvcm5pYTETMBEGA1UEBxMKU2FudGEgQ2xhYTEhMB8GA1UEChMY -SW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRQwEgYDVQQDEwtNaWNhaCBDb3dhbjEf -MB0GCSqGSIb3DQEJARYQbWljYWhAY293YW4ubmFtZTCBnzANBgkqhkiG9w0BAQEF -AAOBjQAwgYkCgYEAxgJGqBxMUjykBTWHg0jTAH59WbxV6JLMAirwskri0u9o6m9f -Xw/ZsteKxmypgvwPcDoqZFWF5TB4sEf2l2m7N++mOLtjS9PLBaE8Y0siF1+EMXrI -mffet9PeXXceuTMFx6bTzls7EwLMvmvSynwFK1j9EHH0mFA19MkeQwWG5zECAwEA -AaOB+TCB9jAdBgNVHQ4EFgQU0LEi7ld7tvUls/fmbmn80+b//TAwgcYGA1UdIwSB -vjCBu4AU0LEi7ld7tvUls/fmbmn80+b//TChgZekgZQwgZExCzAJBgNVBAYTAlVT -MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRMwEQYDVQQHEwpTYW50YSBDbGFhMSEwHwYD -VQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFDASBgNVBAMTC01pY2FoIENv -d2FuMR8wHQYJKoZIhvcNAQkBFhBtaWNhaEBjb3dhbi5uYW1lggkAiyhHpSJw88Qw -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBOSi75jsItAkhiYW0Up1d8 -OFA1saDlxBDm7ZUQTcfxIQL75iYfxMUEWeWPRLmNId96a1PgMT6U2+vKrnoNj8bu -R45xNaFPKxOzp7axWSOp9AJcR6neug2v7lKkKOcQ14dFlKH1AoP+fDuvSAZyfMeC -7fbIfz3XFNxaR4Rd07w/OQ== +MIIE3TCCA0WgAwIBAgIMW+WWpBMQnOLkjLG8MA0GCSqGSIb3DQEBCwUAMFIxDTAL +BgNVBAMTBFdnZXQxDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTERMA8GA1UE +CBMIU3Vuc2hpbmUxETAPBgNVBAYTCEZyZWVsYW5kMCAXDTE4MTEwOTE0MTYwNFoY +Dzk5OTkxMjMxMjM1OTU5WjBSMQ0wCwYDVQQDEwRXZ2V0MQ0wCwYDVQQLEwRXZ2V0 +MQwwCgYDVQQKEwNHTlUxETAPBgNVBAgTCFN1bnNoaW5lMREwDwYDVQQGEwhGcmVl +bGFuZDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALDUZ1OtELnTvjA/ +EG2GyrQ9PXMUwqk+6M0QJOcreRE8DJRixwQbBHBQ0rbsHYF3InXaF17pSxL7h0qG +0wnUdBitInwsQ0cHXbxNoXrncWbaecSlBxG9CxaG+26EbdRJrh3ly5PVPNaFHQ5h +BMhFtMZinmjyOHCif5+L3MyyKR/Pq0A/9gCcFkgvjhZ1Kbe/Kb0M3zmyiGpK/NXJ +MNBuPQOqfThTu5dvAFM8Ae1FKZ0SpZQuOBWeS77F3SuUkEOOK3+HaNT4035QvS/Y +nHEnaquM/hQi9K8Ct1qcPi8uR3gRrbHzJPPBINNCnhfRcpuYaG3K5MuRDxQS4USf +5OARp5Rp8W6BXSivBsp2u4rwCIb1yfvbG534OxT0PjBJ6aic6ov84icwt9/a7iam +FrXnf7RpWGz5vDNNjJiHoxmJzKfOb+rZ4ZE6GgynhJQKexOsAvv35dy0Mlvb71nU +olZdvbABtUJVatiBX6a0ZEcMu0sLAT07YCB8JuychtpGAP9rwQIDAQABo4GwMIGt +MAwGA1UdEwEB/wQCMAAwNwYDVR0RBDAwLoIJMTI3LjAuMC4xggM6OjGCCWxvY2Fs +aG9zdIIRV2dldFRlc3RpbmdTZXJ2ZXIwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYD +VR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUsYkA4xDRnd1sEmzDN0nYGapIDWowHwYD +VR0jBBgwFoAUng5bIoz70o8nU9XWCgzLDVkPZJgwDQYJKoZIhvcNAQELBQADggGB +AKEexGBDmeETUgumcxjYszaDSX3YdAJiKvmzy/9KVn6riOvmjy5x9ilpdOZ0+JHn +PQhgjkxFNQsq+G6j5RKQGBBklIz/JaUpCWZWCVbnPEMmdsEMWKwAvRRpSbxRt55w +UChuprPu1A+RWOqggbkB74GaT8BmMacPIMDKo1frSzPmX1a9xaWgiYQiSatJpOOE +ElcZd4sN1NyrIYNqIj0krxbQ64O8tMg2pPRtVFq1BQT1Kf5mAxusE+pilStGrGAk +F9J+lDfwKxuIQ3p0uaR6isLGpEtdEe02+vm1zlYh4ER+7xGOuoXPTIS/foIngih+ +JoM8URUVgwyuhdsh7gPGAv8q5OlL3tmur0TZA6dWYMQKRRnw1oZGsw3/I/o4cfXD +xHHCBTN+V6/A4ZeRKA8qMcLhfr3QrD7/BStLf4/Ylm3V02ZDniOCxBPxkvhSxwYG +b/+9mPMDVrF5Ls8V+VwdMnPuDLIv7DfGncDvqJXF+iM/t79lrF2D8DfcIqBkbS3M +JQ== -----END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/server.crt wget-1.20.1/tests/certs/server.crt --- wget-1.19.5/tests/certs/server.crt 2018-05-06 11:16:50.000000000 +0000 +++ wget-1.20.1/tests/certs/server.crt 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEpDCCAoygAwIBAgIIWu7jmTk1y5gwDQYJKoZIhvcNAQELBQAwMTENMAsGA1UE -AxMEV2dldDENMAsGA1UECxMEV2dldDERMA8GA1UEChMIR05VIFdnZXQwIBcNMTgw -NTA2MTExNDM2WhgPOTk5OTEyMzEyMzU5NTlaMD4xGjAYBgNVBAMTEVdnZXRUZXN0 -aW5nU2VydmVyMQ0wCwYDVQQLEwRXZ2V0MREwDwYDVQQKEwhHTlUgV2dldDCCASIw -DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANXGNSzoaeTX3B34xqiKuVXc2YzL -/QQFexj+dyJ5XwwDF420gEv+zFjy8Y9wiGZ4rgHzF2TviNCoAy7ntlltA9Ab41jk -CikwbZ9R81qsvmxc4HXRNgiKadNIb7BYNh6HljJjOSclkbF/LypJtdF5g7b6Qron -ME/UuDIYLQV765emZh+2h/BJLtTXU+8n985gC+/9dw68WjLnWk9REzHYZPFU4UGK -bCx+h7M/cVE5uIWjDC3Uq93jCweZJ8UFbmAnwlER8fXSEzy2SK5yqlRu+st8ae5w -ZQAgXSeHF0jZ/lUgZBlq2QnqfzVlDd26CXMa/2OLZo9qUIoS/c0y5qLghTUCAwEA -AaOBsDCBrTAMBgNVHRMBAf8EAjAAMDcGA1UdEQQwMC6CCTEyNy4wLjAuMYIDOjox -gglsb2NhbGhvc3SCEVdnZXRUZXN0aW5nU2VydmVyMBMGA1UdJQQMMAoGCCsGAQUF -BwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFOBZKlHSJ4GW2mOjJ4fkDhLr -X5mCMB8GA1UdIwQYMBaAFH681m4jgi27YaqRhfZ+jeWJEyn/MA0GCSqGSIb3DQEB -CwUAA4ICAQAwCcJs/+PLNhWF43YQOCB2ZXRELfE9j/p/H018rTr6vdYZunpdi0wf -AceI+xBylMQs6CG0zh8bOgf0wwaOwGd1ESg3a5qtLbp565KZ8VD0LvnwZQX+ZBwA -b5V1mrmtPzyLTSJScf6GiuqQJiwrQIDhpGlw00r8U0s9L+yuBP7XbUY+TFKNWhL1 -wkoalRc6vFOSWkc6SJHa/dDqMBXC86Q90OUu+DSNMiKk8ps0MpZAj17OADyf6Qu0 -IbB0+l+rJKKuOSl87pl3ACKZwSEopQBxjOuSmUZ641ZtZRy5HoMwM+LneoR3I1Re -a2xKgCT3qMNVrKI4gzN7zYAAXlVT7ZfZWzPYvRZ+1Hxlbsf/DrSmBIvaCx7fTyBL -etFKP8joarPrtffLu9XhXH5IB6G8spPOlkxGHg8WyCG67Y7hHzwDJH4cyG1OKiWj -gsaxaN7WQ8Nyyz/WoQq9NeAkjhMen1JXB4ueeVXI4wgQIl1jWb31foR0KylGdAj7 -H89v9QJtBf/1Jghi6t78faUq8t1dyfF0vAiLAOF9DKjvCUd7oU5zBZTB0inoWK1g -WoDaOddQKc76LajP74X4t78L8mGkQ0W2Kmnr508YXYGHU8eNlYgrSxBGNhW2QRFM -/cCToErw+hJAAXNWibGPW8yZTcen7jKQBQTVL18tRxDOSgjgoWbpRw== ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/server.key wget-1.20.1/tests/certs/server.key --- wget-1.19.5/tests/certs/server.key 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/certs/server.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEA1cY1LOhp5NfcHfjGqIq5VdzZjMv9BAV7GP53InlfDAMXjbSA -S/7MWPLxj3CIZniuAfMXZO+I0KgDLue2WW0D0BvjWOQKKTBtn1HzWqy+bFzgddE2 -CIpp00hvsFg2HoeWMmM5JyWRsX8vKkm10XmDtvpCuicwT9S4MhgtBXvrl6ZmH7aH -8Eku1NdT7yf3zmAL7/13DrxaMudaT1ETMdhk8VThQYpsLH6Hsz9xUTm4haMMLdSr -3eMLB5knxQVuYCfCURHx9dITPLZIrnKqVG76y3xp7nBlACBdJ4cXSNn+VSBkGWrZ -Cep/NWUN3boJcxr/Y4tmj2pQihL9zTLmouCFNQIDAQABAoIBAEXCOlP/O58Lua6m -Id2Z90THns5NOrF3QGY1k5bSWGvJDoSVZFBoQzK7hIw0Qq59rvq/4uBzMgg062UB -BAZGhroAf73gHFi4ju0whuMN/83IuQ55SNKcqE/kEV5QSsjHogGrU1ks71AmmrOH -/ibvKkYpgGDSrPdACSN/tCFYANcpQtzbhkFXRqZ5JSIQyVCE+XLrZinxI6D23XVe -5qMpfBH1gnKfBPf86UCI+iVTdNIC9sLp+C5MoSKCWMvYzKlQqbxVgulEdcOq01U7 -Sq7ZU6/f8QuTjd3d+WGTp2ZxFf2H+2XuKNVl9akp2exap+/JEj9Et0jMIN5Z9zHa -6bTDMPkCgYEA8uO+VAAq4R1WJCTFpYy4/gzJPbQtxVxOMGBnxgAW+4G0jv+BiqiU -WrQ6Rtcyfx8LFB/z1tExfDSJSpTw8wd3j19a/sMqACwCgkudmi8dzKbH2Y9U9DCz -IB++zaQVKgJNE1VEsuySpf9HzQKBJGhO4fNMzol6YhlQT4ex7gSrFyMCgYEA4VAl -p0A6798a9rmUGhNSzn5IcO2unpS7IYDTqKv46oIQ1rKKEiawugni+F1gL9StK90g -NvDREiaM0eKo9QlhUzqBBSsNBVh4UVadbOpBOqyM6CUE94I4H199SwfzPuCILYa4 -01syaosJ2SRUr8S101x7U0VQ2SCYq38as27FY8cCgYB67dr5RrBtCNz9JANIW2WR -ZsU/Tn7P4XzNLS24X3lCR44rxZM5q0KSeZ75FZdAEWUZBWby9SN3elt1/NXKGqBf -VuKGCB6swZlvenfEfk41sr95E/rqL++otYhrKb1waoO54jEH4YYDL6WWU8sqswQh -hXL9IUVoeulTpxjdn008QwKBgCxCnELwoSNBxoA1EFzW8utRb1WPuz+3o9L/BZUa -wzj99+TVCb5rD0hcbNOxNBXxR1tYgt2IDOnt3LfWOK55+z5oPbQQMuyb5nbD9wTQ -N6QZBU0NCJ6+W9v93BUDKMtvPBEFaAVM4uh/C542PtSQZc9xWWCQO0OL3bHCtDIP -ToM9AoGADJ+6tYMTBEHhJyZxqD6oZgHTAqfA6HqKP5UUCpQ8G4IEedEq+cpQSFM9 -Wez+ChUdeDCaFSOeh+8o/u4w3x44g7GyFdOL6lGV6YjzGk4WkbRwqJWW/AKV0htl -Fby2y2PzLnbLGKnt7nGTxag9l28NwbGppy7Kex8jVYcQP15djCg= ------END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/server-key.pem wget-1.20.1/tests/certs/server-key.pem --- wget-1.19.5/tests/certs/server-key.pem 2014-02-27 17:11:10.000000000 +0000 +++ wget-1.20.1/tests/certs/server-key.pem 2018-12-26 19:58:39.000000000 +0000 @@ -1,18 +1,182 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,8B09CBCC4587B80C +Public Key Info: + Public Key Algorithm: RSA + Key Security Level: High (3072 bits) + +modulus: + 00:b0:d4:67:53:ad:10:b9:d3:be:30:3f:10:6d:86:ca + b4:3d:3d:73:14:c2:a9:3e:e8:cd:10:24:e7:2b:79:11 + 3c:0c:94:62:c7:04:1b:04:70:50:d2:b6:ec:1d:81:77 + 22:75:da:17:5e:e9:4b:12:fb:87:4a:86:d3:09:d4:74 + 18:ad:22:7c:2c:43:47:07:5d:bc:4d:a1:7a:e7:71:66 + da:79:c4:a5:07:11:bd:0b:16:86:fb:6e:84:6d:d4:49 + ae:1d:e5:cb:93:d5:3c:d6:85:1d:0e:61:04:c8:45:b4 + c6:62:9e:68:f2:38:70:a2:7f:9f:8b:dc:cc:b2:29:1f + cf:ab:40:3f:f6:00:9c:16:48:2f:8e:16:75:29:b7:bf + 29:bd:0c:df:39:b2:88:6a:4a:fc:d5:c9:30:d0:6e:3d + 03:aa:7d:38:53:bb:97:6f:00:53:3c:01:ed:45:29:9d + 12:a5:94:2e:38:15:9e:4b:be:c5:dd:2b:94:90:43:8e + 2b:7f:87:68:d4:f8:d3:7e:50:bd:2f:d8:9c:71:27:6a + ab:8c:fe:14:22:f4:af:02:b7:5a:9c:3e:2f:2e:47:78 + 11:ad:b1:f3:24:f3:c1:20:d3:42:9e:17:d1:72:9b:98 + 68:6d:ca:e4:cb:91:0f:14:12:e1:44:9f:e4:e0:11:a7 + 94:69:f1:6e:81:5d:28:af:06:ca:76:bb:8a:f0:08:86 + f5:c9:fb:db:1b:9d:f8:3b:14:f4:3e:30:49:e9:a8:9c + ea:8b:fc:e2:27:30:b7:df:da:ee:26:a6:16:b5:e7:7f + b4:69:58:6c:f9:bc:33:4d:8c:98:87:a3:19:89:cc:a7 + ce:6f:ea:d9:e1:91:3a:1a:0c:a7:84:94:0a:7b:13:ac + 02:fb:f7:e5:dc:b4:32:5b:db:ef:59:d4:a2:56:5d:bd + b0:01:b5:42:55:6a:d8:81:5f:a6:b4:64:47:0c:bb:4b + 0b:01:3d:3b:60:20:7c:26:ec:9c:86:da:46:00:ff:6b + c1: + +public exponent: + 01:00:01: + +private exponent: + 00:80:07:29:50:a2:2b:4c:00:0c:e1:ad:a7:5d:45:8c + 99:f7:04:f8:bf:7d:39:40:bd:19:4b:a9:0c:5e:a3:67 + 61:0c:d2:9a:b9:f1:35:06:7f:b3:64:fc:df:f3:74:fb + 26:ce:21:3b:6e:92:86:b2:95:be:9c:ad:05:3b:46:c1 + 4f:e4:7a:e5:60:be:cd:3c:7e:17:8a:35:72:61:03:f0 + 2e:1a:9f:cf:c4:50:89:88:ef:a4:87:82:bb:0b:31:fa + ae:c0:22:d2:c4:94:4d:5a:1c:42:af:58:7b:37:ed:90 + 37:5a:cb:ca:bc:25:35:17:d2:43:57:e6:63:a6:52:b4 + 1f:8d:a4:15:2b:2d:c1:d5:38:2a:86:3b:a8:54:ae:1f + 10:3f:3a:84:9c:a7:b0:b1:14:dd:fe:83:8e:7e:3a:72 + 9e:a6:df:c6:da:89:25:d9:4e:68:f5:37:87:ec:dd:76 + 46:3b:f0:0f:8e:b7:c8:46:9b:37:73:2c:cc:81:af:07 + cd:2d:cd:f5:c8:12:72:55:05:90:d1:bc:2c:bb:c3:5f + 60:dd:5f:cf:bc:ff:23:b5:ca:a3:86:29:08:6a:93:ce + d2:83:c6:cc:57:bc:18:5a:ce:48:b4:16:f3:55:d2:8a + ef:14:d5:14:1d:8b:55:b1:07:9f:f0:29:93:a1:66:85 + 05:1c:1b:ff:35:ee:fe:c9:6c:40:68:5a:6a:f3:9a:60 + 5c:7e:fa:f9:ed:24:05:c3:e7:ba:67:9f:f4:f3:a4:35 + 3c:3c:cb:d9:d1:d0:02:ec:c7:40:fe:e9:33:62:4d:b2 + 8f:51:1b:a7:da:d7:27:14:18:a8:10:ba:6c:f8:68:73 + 22:38:34:a3:49:fe:e5:5b:7a:1f:97:87:0b:c4:11:84 + 5c:19:2a:49:23:fa:e5:15:dc:a6:d2:fd:e4:36:4d:5d + ad:b5:fa:7b:ef:84:d6:9c:02:ce:98:e4:fe:12:b4:e3 + 9d:09:c5:d1:52:93:fb:31:9f:cb:7a:38:96:2e:39:c5 + e1: + +prime1: + 00:e4:26:db:d4:9f:04:12:81:66:e6:1c:4e:a3:af:69 + f6:73:63:87:04:1f:52:53:87:0b:ea:73:7a:e5:b1:43 + c2:3d:63:c6:f0:57:91:0d:5d:02:e4:02:48:fb:20:d6 + 2b:38:a9:c1:9c:06:5a:a1:33:2b:c4:74:bb:b5:29:21 + 15:85:fc:72:f6:e4:96:4b:40:c5:2b:98:c9:00:a7:09 + dc:60:d9:4d:ae:f4:c1:62:6f:02:49:7a:72:29:e3:ee + 61:81:0a:5a:15:99:7d:08:f0:c1:cd:ae:9d:88:df:8f + e3:29:ba:18:eb:74:d3:fe:85:9b:71:9f:28:26:9b:d3 + a1:2c:99:ab:ac:c5:d7:f0:b9:ae:eb:f9:fc:43:e0:04 + e7:01:7e:82:48:08:45:ef:ed:05:1e:a1:7c:db:be:a3 + ce:01:48:a9:fc:92:0e:d5:db:1b:81:f1:36:81:8b:85 + a6:91:4d:e6:05:3b:38:1a:46:4b:4c:05:a0:c2:96:3f + dd: + +prime2: + 00:c6:69:dd:74:26:b1:c2:ee:6f:82:3d:31:0b:f9:f7 + 40:fb:41:fa:79:d0:04:5c:53:fb:dd:22:2a:d6:b7:26 + 7f:39:c9:20:a8:31:89:32:f7:56:04:84:7b:6a:c4:ea + 9b:8f:29:b3:28:4b:2f:bc:9e:56:0a:3b:b1:53:40:a0 + 3e:4b:29:07:24:0f:20:05:62:96:c3:df:f5:62:15:dc + 0f:5e:53:70:3c:6d:b8:ef:41:b3:97:67:93:db:d1:1b + 83:d7:77:63:a4:78:23:95:07:36:0e:d3:50:3d:7a:fa + 76:41:72:94:49:ac:8a:ea:97:b2:4f:ff:f6:82:23:f5 + 5d:3a:bb:f4:0b:06:31:b0:79:b9:5d:e6:29:d2:6f:5a + 6c:b6:cb:99:42:d6:74:02:2d:cc:13:03:48:ef:54:ea + f8:b7:93:ea:5a:76:11:0b:14:70:a2:08:c3:9c:45:f4 + 46:cf:74:f4:64:28:4b:e2:a3:3f:35:bc:be:27:7b:4f + 35: -Yikael4jBlULlN5QU2SIN38OsTqbkcNZGVcoT5rpGf2Mh+aLRRnSvpIAOqNbIcEw -T8pOtbic9AUh2YaCUK5xw5ou47t2dkieWB0a/amfOAFiajca+94AI+f1k73D85Y9 -bqCkal7pMzIEh22+qIHrUqJLeZdFOIq/C2j4a8Ymv2qmcQ7aKHfmtM3I1XWqg/ql -GNDwhDxTJ1C6rMvXblDQ5gb4uqdUCw03jVOKTh7kQCNjV6RZqtzFShARiuL2yt4J -l8H116hT6JtyVAm6kQIws0wqYPiIQxgpHQV21OibDh7WwD+i2sN77vnG06bYi7C6 -l8PkHsB2VbR2GjrZXAW1MGrCIVllbouFJ3zhPTr1DsDuCQ7G9dc8J/lviaWCi+HL -aWq99V824sjz0CuzRqdUINx1f2XR53+ltSiyXk77NpyUOj/2nGQd2RhsjC/gLHdU -J5152dOoYRmhftubfNr9Cend76rCkwLhZ1ZOa1LDgkT7HFD+4FIeW02opwGpRo/k -XxOIkI7EF3em1MXfbRq1GEXr/KBkTKKeiaVUYW4klytX9crOZ+Dxv9KZRANAPzuF -Tmx1gO4qJL2d8SXlNbUd4MRwCwK2CgUyUknL9kGkt98N2sYUyJETwSWUWbNnP31g -R0sUKSvJN1k8DfZTpP/8znW1kz+vPa66tuRjBRd96JNUDdqSHHywT4DnR/pUNzdG -uUD4/x4VgEwMcOYOKAFeOInn5pPINecU8EE4SehLODW3YdQW4hnxxaltuXPAkvNo -6ST/6HVi/iSJsfvqUuEEXw/SGRMB0aZ+YEIOn4hVnu+gE8N07tuyvQ== +coefficient: + 4a:53:30:b7:56:5a:d3:2b:40:f0:70:f7:32:54:9b:1a + b2:15:40:35:f0:62:65:21:7a:16:6a:2e:ae:81:7e:94 + 19:58:19:57:d4:b5:c4:84:e1:65:5f:84:3b:50:e0:7f + 4e:01:97:74:9f:6c:ed:e4:fa:85:96:17:b3:c4:79:df + c4:20:bf:ea:9e:de:b5:aa:99:e4:2f:58:e0:0b:d3:aa + 86:e8:5c:1e:8a:8b:69:bb:9d:62:a4:32:63:48:53:cc + 19:32:62:2e:30:9a:9f:58:f2:3e:c1:ef:d2:50:a7:cd + 89:2b:98:3d:4e:6d:c1:4b:1d:f1:3f:fe:ff:87:fe:5c + 16:88:ca:dc:9e:1c:ae:2b:2e:b1:86:ff:90:ee:c1:29 + d9:12:b3:a8:02:ac:2f:81:85:49:6e:4a:27:10:14:40 + 27:46:e1:49:b4:31:3a:b5:84:24:45:63:f4:9c:60:a6 + bc:0f:4a:6d:7a:87:22:e8:9c:bc:10:bb:ad:8d:e9:9a + + +exp1: + 32:3d:dc:6b:16:19:6f:79:cf:8f:1c:ec:b4:5f:0c:96 + 99:12:71:c9:16:9c:aa:88:32:b7:8e:76:a1:de:47:6d + 9e:d7:3a:17:f3:30:9e:20:bd:62:38:9e:99:ae:c1:7b + 03:1f:5e:e3:5d:02:d8:3c:cc:86:96:ae:3f:56:af:52 + 6e:0f:09:c2:14:d4:83:fd:df:6d:9a:57:a9:2d:1f:9e + c8:35:12:46:54:df:c1:2d:70:f3:7d:63:66:96:2b:08 + 8d:c2:19:d4:67:d8:80:ff:83:ae:27:a5:c9:5e:71:f1 + 34:5f:26:dd:b2:fc:7c:30:2f:ea:f5:81:81:ff:0e:bb + 8f:76:c7:b7:64:5a:09:48:da:9c:5c:90:90:e1:e4:32 + 7a:c1:c1:2e:db:a3:8b:12:46:ee:57:e1:87:02:94:4f + e9:38:77:36:87:73:7c:e4:a3:4a:1a:34:46:92:d2:fb + bb:43:cc:43:9a:a6:e0:22:5a:b2:83:0a:c3:cf:12:81 + + +exp2: + 00:a9:b9:93:7b:31:42:6c:6a:44:2e:d7:a3:66:08:4c + 8e:64:a0:1a:e0:2a:a6:20:48:a3:31:95:71:a9:bc:80 + 0c:e2:e4:7e:b0:01:b7:c8:46:35:69:a5:de:61:05:d3 + 5e:80:47:7e:7e:e0:5a:14:72:29:4d:95:a4:69:7f:e5 + d3:83:bd:b3:e3:0f:a1:27:9a:1f:37:ad:13:9d:f4:ef + 0a:a2:78:a3:90:bd:97:2d:eb:38:f2:31:e3:14:6d:3a + a9:3c:1e:5f:b9:28:1f:df:f2:8c:36:80:62:aa:44:d1 + 8d:69:0c:d7:76:72:47:5e:c7:a6:fb:b2:0c:2f:65:0d + 15:d4:11:45:80:4c:ab:22:b7:ed:6e:3a:5d:da:29:f0 + e3:00:37:07:82:5a:2a:60:56:c6:b4:18:e2:42:00:95 + 03:6f:1d:f3:a1:b0:4f:81:f7:d9:25:72:73:c9:f1:39 + 35:7d:6f:21:43:b0:08:c1:f5:3d:33:fd:a1:77:ea:8e + 65: + + +Public Key PIN: + pin-sha256:wBv5do0qlKwMzOKVUIb13Gdlv7BAhyWaX/jgaxcqy2U= +Public Key ID: + sha256:c01bf9768d2a94ac0ccce2955086f5dc6765bfb04087259a5ff8e06b172acb65 + sha1:b18900e310d19ddd6c126cc33749d819aa480d6a + +-----BEGIN RSA PRIVATE KEY----- +MIIG5AIBAAKCAYEAsNRnU60QudO+MD8QbYbKtD09cxTCqT7ozRAk5yt5ETwMlGLH +BBsEcFDStuwdgXciddoXXulLEvuHSobTCdR0GK0ifCxDRwddvE2heudxZtp5xKUH +Eb0LFob7boRt1EmuHeXLk9U81oUdDmEEyEW0xmKeaPI4cKJ/n4vczLIpH8+rQD/2 +AJwWSC+OFnUpt78pvQzfObKIakr81ckw0G49A6p9OFO7l28AUzwB7UUpnRKllC44 +FZ5LvsXdK5SQQ44rf4do1PjTflC9L9iccSdqq4z+FCL0rwK3Wpw+Ly5HeBGtsfMk +88Eg00KeF9Fym5hobcrky5EPFBLhRJ/k4BGnlGnxboFdKK8Gyna7ivAIhvXJ+9sb +nfg7FPQ+MEnpqJzqi/ziJzC339ruJqYWted/tGlYbPm8M02MmIejGYnMp85v6tnh +kToaDKeElAp7E6wC+/fl3LQyW9vvWdSiVl29sAG1QlVq2IFfprRkRwy7SwsBPTtg +IHwm7JyG2kYA/2vBAgMBAAECggGBAIAHKVCiK0wADOGtp11FjJn3BPi/fTlAvRlL +qQxeo2dhDNKaufE1Bn+zZPzf83T7Js4hO26ShrKVvpytBTtGwU/keuVgvs08fheK +NXJhA/AuGp/PxFCJiO+kh4K7CzH6rsAi0sSUTVocQq9YezftkDday8q8JTUX0kNX +5mOmUrQfjaQVKy3B1TgqhjuoVK4fED86hJynsLEU3f6Djn46cp6m38baiSXZTmj1 +N4fs3XZGO/APjrfIRps3cyzMga8HzS3N9cgSclUFkNG8LLvDX2DdX8+8/yO1yqOG +KQhqk87Sg8bMV7wYWs5ItBbzVdKK7xTVFB2LVbEHn/Apk6FmhQUcG/817v7JbEBo +WmrzmmBcfvr57SQFw+e6Z5/086Q1PDzL2dHQAuzHQP7pM2JNso9RG6fa1ycUGKgQ +umz4aHMiODSjSf7lW3ofl4cLxBGEXBkqSSP65RXcptL95DZNXa21+nvvhNacAs6Y +5P4StOOdCcXRUpP7MZ/LejiWLjnF4QKBwQDkJtvUnwQSgWbmHE6jr2n2c2OHBB9S +U4cL6nN65bFDwj1jxvBXkQ1dAuQCSPsg1is4qcGcBlqhMyvEdLu1KSEVhfxy9uSW +S0DFK5jJAKcJ3GDZTa70wWJvAkl6cinj7mGBCloVmX0I8MHNrp2I34/jKboY63TT +/oWbcZ8oJpvToSyZq6zF1/C5ruv5/EPgBOcBfoJICEXv7QUeoXzbvqPOAUip/JIO +1dsbgfE2gYuFppFN5gU7OBpGS0wFoMKWP90CgcEAxmnddCaxwu5vgj0xC/n3QPtB ++nnQBFxT+90iKta3Jn85ySCoMYky91YEhHtqxOqbjymzKEsvvJ5WCjuxU0CgPksp +ByQPIAVilsPf9WIV3A9eU3A8bbjvQbOXZ5Pb0RuD13djpHgjlQc2DtNQPXr6dkFy +lEmsiuqXsk//9oIj9V06u/QLBjGwebld5inSb1pstsuZQtZ0Ai3MEwNI71Tq+LeT +6lp2EQsUcKIIw5xF9EbPdPRkKEvioz81vL4ne081AoHAMj3caxYZb3nPjxzstF8M +lpkScckWnKqIMreOdqHeR22e1zoX8zCeIL1iOJ6ZrsF7Ax9e410C2DzMhpauP1av +Um4PCcIU1IP9322aV6ktH57INRJGVN/BLXDzfWNmlisIjcIZ1GfYgP+DrielyV5x +8TRfJt2y/HwwL+r1gYH/DruPdse3ZFoJSNqcXJCQ4eQyesHBLtujixJG7lfhhwKU +T+k4dzaHc3zko0oaNEaS0vu7Q8xDmqbgIlqygwrDzxKBAoHBAKm5k3sxQmxqRC7X +o2YITI5koBrgKqYgSKMxlXGpvIAM4uR+sAG3yEY1aaXeYQXTXoBHfn7gWhRyKU2V +pGl/5dODvbPjD6Enmh83rROd9O8KonijkL2XLes48jHjFG06qTweX7koH9/yjDaA +YqpE0Y1pDNd2ckdex6b7sgwvZQ0V1BFFgEyrIrftbjpd2inw4wA3B4JaKmBWxrQY +4kIAlQNvHfOhsE+B99klcnPJ8Tk1fW8hQ7AIwfU9M/2hd+qOZQKBwEpTMLdWWtMr +QPBw9zJUmxqyFUA18GJlIXoWai6ugX6UGVgZV9S1xIThZV+EO1Dgf04Bl3SfbO3k ++oWWF7PEed/EIL/qnt61qpnkL1jgC9OqhuhcHoqLabudYqQyY0hTzBkyYi4wmp9Y +8j7B79JQp82JK5g9Tm3BSx3xP/7/h/5cFojK3J4crisusYb/kO7BKdkSs6gCrC+B +hUluSicQFEAnRuFJtDE6tYQkRWP0nGCmvA9KbXqHIuicvBC7rY3pmg== -----END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/server-template.txt wget-1.20.1/tests/certs/server-template.txt --- wget-1.19.5/tests/certs/server-template.txt 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/server-template.txt 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,23 @@ +# Template file to generate server-cert.pem for certtool (GnuTLS) +# see 'man certtool' for more options + +organization = "GNU" +unit = "Wget" +# locality = +state = "Sunshine" +country = Freeland +cn = "Wget" +#uid = "wget" +#dc = "name" +#dc = "domain" +expiration_days = -1 +dns_name="127.0.0.1" +dns_name="::1" +dns_name="localhost" +dns_name = "WgetTestingServer" +#ca + +# key options +signing_key +encryption_key +tls_www_server diff -Nru wget-1.19.5/tests/certs/test-ca-cert.pem wget-1.20.1/tests/certs/test-ca-cert.pem --- wget-1.19.5/tests/certs/test-ca-cert.pem 2018-05-06 11:00:26.000000000 +0000 +++ wget-1.20.1/tests/certs/test-ca-cert.pem 2018-12-26 19:58:39.000000000 +0000 @@ -1,30 +1,26 @@ -----BEGIN CERTIFICATE----- -MIIFKTCCAxGgAwIBAgIIWu7f2CMW9qgwDQYJKoZIhvcNAQELBQAwMTENMAsGA1UE -AxMEV2dldDENMAsGA1UECxMEV2dldDERMA8GA1UEChMIR05VIFdnZXQwIBcNMTgw -NTA2MTA1ODM0WhgPOTk5OTEyMzEyMzU5NTlaMDExDTALBgNVBAMTBFdnZXQxDTAL -BgNVBAsTBFdnZXQxETAPBgNVBAoTCEdOVSBXZ2V0MIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEArx5p0JWOfE/z3GXkd57QaemGBC8ZmE463Yhy6WtR7ww5 -MGMlQmlsYYvEeZj/3FLe2mdAazTAlU8uf3BM5f8PUVahESgwevGVNJLtgOGJgxXp -5cslLlWYZ+a3qL1FJYVqPKfiK/tb8BsgzzPyECmlCerXw1lQ+34Fc36bw5vFw6ig -egb8yz5N59yvZp3b9iooU1J5yRTGTpEmGhUrUNdUc2MEe2bwLiEgffVmX9oc2mIq -LwfRtFjJMvNb6Zr42yllWC5aVeSJ86tkIhuLRQRD/nmy3NR/Txne764BhNnJ+/IN -V16UfJz1A2BeFBhbPdH7T6jQx3BxRDQew66Qe8ESGuWa6SsjWwhiCl/lJ1UeUWt9 -pjDNqT4kfeWQzZKnbMoC7hwLMmmo9fsL65jPNR9iclf5FXBap39/gtWl9vobuTi+ -6yLJBGBvB4FsFsRNDVu0PM06wUew/d9oTP+3/GKI8UnqiT+76RlC3lcyRdAk5LKF -ofg9bPkNm/dw6aDFtfFTE4oNjRXrUK9w3SZsknne2oOveKoGOYg79T/wlgUo++Uw -wa8NyYujycVhEvqMdvX68awlrQIxMFSOcyeaiGVuZ/gWIq/7VZaDJGEpnm8vXkpk -yxhDWa3qQcLqHKbydckEaLHc2BuNjI3yNiYZUxVr8MHRgrBarEXLHz0yarvNNUEC -AwEAAaNDMEEwDwYDVR0TAQH/BAUwAwEB/zAPBgNVHQ8BAf8EBQMDBwYAMB0GA1Ud -DgQWBBR+vNZuI4Itu2GqkYX2fo3liRMp/zANBgkqhkiG9w0BAQsFAAOCAgEALbu9 -EGQtB7WSOL+bsj30/1dvzKngq71Mpv00jrXwPjtHbhc7ZWMqbcd0v9ws64bJX8sg -LrEv1zpqB4oS/yRKWZsCgLaBxPdPqPcCrmdLEBACkrIAl65LWzvFquMZ+XxXcruJ -vVTKmfTcTVGo5n9ixNtoZ41Sl4oT67AsViSmk6Yai2Eyi7LbXkZrCva758lMbWmw -QT3Scr4HDaHYVnPLqSicb6qWPssZidNtQyE7v96s9nXvjYs9UOYR6Dg8U2VOsPXn -XyevMumH/70Z4wfwkMwBOtgKe+UmxAfOwYh/N3AFpbK93cfGEFWBzo+uMkH1SeGw -ccDYk9riVe/ya4xutOqz9dJF05Els5Qq6SwBNClHedJNM0HWOgYvZqhBrngGjDQI -VP4Klxewn5Q4FTMud1sZEfr4wnZvgH0Axkl+vVvDkEcC0LnfXc4fUj3mpD9X0YKl -AYw/MPsDVA7kF3ayctbZDBqEoqVg6UkG2cv9Jt2nXDRTpANPzQg6J4XxVrF2m8fR -P7fiXtM6vczzpl9nwFvpon0sqD52sRlvyjB0DWuTFBU1V5fQOdCfnsQayyYvbigx -rHlw0D97+hhNQhWZw0i3+YcpoAGiftpSFSxIcbCp+aYFfmgmwVCYG5QVEjaH+TJp -cVBYPisU7ic8jq97R+D0Ot6kZtcaHeFzh1BYbF4= +MIIEbzCCAtegAwIBAgIMW+WWpAgbVfvBnwynMA0GCSqGSIb3DQEBCwUAMFIxDTAL +BgNVBAMTBFdnZXQxDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTERMA8GA1UE +CBMIU3Vuc2hpbmUxETAPBgNVBAYTCEZyZWVsYW5kMCAXDTE4MTEwOTE0MTYwNFoY +Dzk5OTkxMjMxMjM1OTU5WjBSMQ0wCwYDVQQDEwRXZ2V0MQ0wCwYDVQQLEwRXZ2V0 +MQwwCgYDVQQKEwNHTlUxETAPBgNVBAgTCFN1bnNoaW5lMREwDwYDVQQGEwhGcmVl +bGFuZDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMUMCfmwSzYFSrbQ +7C/CbcKVkirAWjFmSVCndYbb4Wbi4kr7+VHU02w6NFRXoQsB7dLwXlpKEuuuVPSc +FgGUIy450JbQ9QCvqn0Ln+OR25tzAXPFH4975cNTWdv5ZNunh/K688VJ3xtQRZYv +7YcqW3mrP81VZUKSsPGrlQN3GiwzCRRVPt5db3eG4t/oWfYlLxP3wnRGUaMuTj3g +Cf1tQAtL0EBr9k2HwrPyIylJEI2u5iDA3XL66uAkWhj0jWyYbydE/BcGpsRnIjpl +4igvFdEjiJb8dGL9pHVO7i/kAxoTYc45KbI3SUTMMNA1nAVMKrTCX2IbRUh7VrIs +ohYTxXPOB5dy3lWU/sypdiHFyPt9PO24G3oeXjOQv7oE93bMbYmBisk50zt2csdU +B89cqAKo7oMXjaZZ3F5ELIaLRsdh7R7qKHVYzqRLuLqitjEr+sY11znfzFpuje6l +d9PzZHmsiSie8iS2apkqr1KLpkM3zry6+fv3BbjdhRAbyq3LRQIDAQABo0MwQTAP +BgNVHRMBAf8EBTADAQH/MA8GA1UdDwEB/wQFAwMHBgAwHQYDVR0OBBYEFJ4OWyKM ++9KPJ1PV1goMyw1ZD2SYMA0GCSqGSIb3DQEBCwUAA4IBgQBZvCyOAWWB+/sAyK4y +Lv34sv2DJijSYsxOWOEJEG8OurbWSl74cmI5YXIswvVI455nnZ4jPQUKZobPL8rO +uGWrdhJItE7lN8YioswZhJk9VmCxHdk1G2+slHwVddfHIrvrYD7F5MijxAvvijJ8 +tdWprACJGrsoaKu/t129oumjfVy4/1sAVw6S+Jj+vr21Q/3SVnIv0gyTIWhu4cYA +bzzcDu6+wo4TwjfL/EbgHwFvu0H9PuwgP71xQSFz8+KHvNwxIb65xCgfEVycmuFm +oDyDMGUu95XG14QKeKOmQlqHd+nkWqcT+NvrcbDkEvnOgaQM3qX5YDokiOpGhY2q +f7PBiTbYLqP4L5o5qGhWyD3iQvDfTPZKIQA6AX8ZR3T0fVdwUOyiMPkgfYSZ3ZYG +1kH3TFQk0IkRp5H56ZOfeFd7p3lTpqYMYofYpbG1p763VFuZTIaZJFeCtFaA4ZoY +lPut92lZl8Igo6iW/tB0JNama558N/T0BJ8QWYSwaRkjyJM= -----END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/test-ca-key.pem wget-1.20.1/tests/certs/test-ca-key.pem --- wget-1.19.5/tests/certs/test-ca-key.pem 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/certs/test-ca-key.pem 2018-12-26 19:58:39.000000000 +0000 @@ -1,58 +1,182 @@ -!!!!!DO NOT USE THIS KEY FOR ANYTHING !!!!!!! -!!!!THIS FILE IS FOR TESTING WGET ONLY!!!!!! +Public Key Info: + Public Key Algorithm: RSA + Key Security Level: High (3072 bits) + +modulus: + 00:c5:0c:09:f9:b0:4b:36:05:4a:b6:d0:ec:2f:c2:6d + c2:95:92:2a:c0:5a:31:66:49:50:a7:75:86:db:e1:66 + e2:e2:4a:fb:f9:51:d4:d3:6c:3a:34:54:57:a1:0b:01 + ed:d2:f0:5e:5a:4a:12:eb:ae:54:f4:9c:16:01:94:23 + 2e:39:d0:96:d0:f5:00:af:aa:7d:0b:9f:e3:91:db:9b + 73:01:73:c5:1f:8f:7b:e5:c3:53:59:db:f9:64:db:a7 + 87:f2:ba:f3:c5:49:df:1b:50:45:96:2f:ed:87:2a:5b + 79:ab:3f:cd:55:65:42:92:b0:f1:ab:95:03:77:1a:2c + 33:09:14:55:3e:de:5d:6f:77:86:e2:df:e8:59:f6:25 + 2f:13:f7:c2:74:46:51:a3:2e:4e:3d:e0:09:fd:6d:40 + 0b:4b:d0:40:6b:f6:4d:87:c2:b3:f2:23:29:49:10:8d + ae:e6:20:c0:dd:72:fa:ea:e0:24:5a:18:f4:8d:6c:98 + 6f:27:44:fc:17:06:a6:c4:67:22:3a:65:e2:28:2f:15 + d1:23:88:96:fc:74:62:fd:a4:75:4e:ee:2f:e4:03:1a + 13:61:ce:39:29:b2:37:49:44:cc:30:d0:35:9c:05:4c + 2a:b4:c2:5f:62:1b:45:48:7b:56:b2:2c:a2:16:13:c5 + 73:ce:07:97:72:de:55:94:fe:cc:a9:76:21:c5:c8:fb + 7d:3c:ed:b8:1b:7a:1e:5e:33:90:bf:ba:04:f7:76:cc + 6d:89:81:8a:c9:39:d3:3b:76:72:c7:54:07:cf:5c:a8 + 02:a8:ee:83:17:8d:a6:59:dc:5e:44:2c:86:8b:46:c7 + 61:ed:1e:ea:28:75:58:ce:a4:4b:b8:ba:a2:b6:31:2b + fa:c6:35:d7:39:df:cc:5a:6e:8d:ee:a5:77:d3:f3:64 + 79:ac:89:28:9e:f2:24:b6:6a:99:2a:af:52:8b:a6:43 + 37:ce:bc:ba:f9:fb:f7:05:b8:dd:85:10:1b:ca:ad:cb + 45: + +public exponent: + 01:00:01: + +private exponent: + 5a:0b:d7:5f:28:46:26:88:a2:8d:0a:ca:74:44:d8:9d + cc:76:40:5d:28:9a:5c:90:f2:6f:a4:50:9d:98:d2:c8 + a9:fa:f4:4d:0a:2d:44:f4:b7:60:84:8e:8b:04:99:bc + 11:e2:50:6b:d8:5f:ef:1d:fa:aa:d1:cd:68:a9:46:ae + 70:33:37:48:84:3d:ed:08:ef:1d:e9:d2:38:2c:70:4c + 4d:04:97:b7:85:7d:6c:11:27:bc:ef:be:77:6d:bd:90 + 6d:c7:2b:71:24:01:f5:dc:68:00:6b:24:93:d9:32:76 + 56:60:d0:b7:ce:8f:6e:b3:b7:ac:de:6a:f7:f9:98:eb + 35:a1:fa:16:c1:cd:57:0b:fb:33:20:79:70:eb:00:31 + 14:61:eb:95:f1:30:8b:6e:b4:c8:a7:e2:48:d2:ad:2a + bc:59:8d:a7:08:a6:83:7c:e1:78:ac:c2:c8:25:ed:69 + 58:b6:ed:0c:05:e8:4e:7f:61:7d:5e:dc:1a:e8:de:7b + 57:d3:ac:05:9b:44:f1:fb:3b:ff:86:15:ae:e4:19:cf + 82:cd:2d:ba:59:a8:2a:23:1a:a9:ad:30:55:c8:de:15 + f4:16:cd:14:17:c3:8b:1b:93:dd:10:8a:6b:72:78:3e + fc:73:2e:2f:b9:a5:3c:5e:fc:4e:90:bd:3a:12:79:9d + 95:83:87:49:6d:c4:51:ab:d6:15:7f:d2:a5:6b:c0:76 + d6:0b:75:5c:83:d1:63:14:33:ad:26:43:97:d5:7e:08 + b8:80:b5:58:ff:b5:1d:eb:7a:1b:2c:e1:54:c9:86:37 + e9:fc:df:64:83:47:38:02:4c:43:78:93:4f:84:33:35 + a8:1d:3a:0a:17:63:79:fd:91:be:1c:8c:c6:d9:40:16 + fa:13:4c:d3:6d:f3:3a:39:65:e9:97:12:5d:6e:eb:9d + 07:64:3a:b1:4d:47:9b:82:fb:ff:e1:92:96:9a:f7:a7 + ec:5a:8a:91:e8:1d:87:21:db:7f:e9:23:53:a8:bc:61 + + +prime1: + 00:e6:1e:8d:ca:3e:ea:2f:43:8d:71:47:88:e1:5e:57 + e3:6b:9d:61:45:d6:15:79:b1:ee:21:06:8d:da:66:b7 + ba:de:b6:0d:68:4e:14:ec:97:30:ec:30:61:2f:ff:6a + 49:3d:33:3c:af:30:2e:a3:19:f1:7c:07:49:83:bf:34 + b3:f8:46:e0:e8:3b:35:46:69:19:c8:05:c4:f5:b7:90 + 97:01:80:bc:9a:ed:06:ca:a8:e7:c9:55:76:fa:b8:d7 + b7:38:ec:c2:80:d4:19:77:db:d7:6f:f4:c9:31:21:2d + 57:3a:2e:cd:b3:15:bb:1c:07:ae:9f:a8:a8:57:14:8c + 2b:5d:2b:84:2f:62:c8:7b:80:04:59:59:08:02:fc:86 + ef:4d:8f:5a:22:88:71:7b:83:4a:3b:31:11:e3:0d:ae + 53:9c:c1:41:d9:1c:66:d4:d9:8c:96:cb:96:ea:42:a0 + ed:c5:d6:e7:56:c2:40:22:9a:da:8e:1f:87:c7:73:b8 + 1d: + +prime2: + 00:db:35:49:d0:b4:9a:10:6c:5d:ce:cd:5b:1f:88:00 + 8b:a0:5f:40:48:54:9d:a5:15:cc:59:bb:21:f7:11:9e + 86:35:1d:45:c6:aa:a1:ae:fe:38:bf:99:58:aa:84:71 + d4:d8:2c:99:4f:54:1d:cc:e9:95:2b:3a:d8:7b:c4:3a + 96:1c:9a:e6:25:1d:1f:9c:60:a7:1d:aa:ff:e9:98:dc + 06:7a:97:87:bd:18:19:2a:c8:53:8e:c8:dd:b4:2d:af + a9:23:4e:da:82:64:e7:70:41:d6:45:f3:9d:36:2b:ff + bb:03:7b:c8:b2:e3:ac:f3:66:6e:f4:51:c0:f3:ca:d0 + 22:a0:3c:46:af:5e:81:b6:96:51:71:d7:97:67:db:21 + ca:57:fc:91:04:c0:64:e0:fb:73:f4:2b:b2:f1:c4:49 + f9:d3:8f:17:74:f6:bc:bc:cc:13:89:6c:0f:0e:5a:45 + 94:7a:60:0f:d3:ec:e1:ea:3e:2b:fa:af:d3:79:43:87 + 49: + +coefficient: + 00:8d:93:8a:53:c5:d3:ad:67:1c:8e:ef:bb:27:db:2c + 99:83:7c:a8:9f:a1:a8:23:ce:0e:7e:44:31:03:fd:23 + 8a:bc:1c:32:85:f3:3b:27:7a:66:5b:a2:38:13:26:4f + 11:ed:f4:c3:ce:ad:89:5e:db:ce:a1:2b:3a:69:f6:77 + 18:57:97:27:d3:2c:cd:9d:21:69:3c:40:ca:e4:df:82 + 62:d3:aa:88:e2:fe:e9:a8:ca:b3:c9:9d:b4:eb:9a:dc + 57:80:62:92:5b:94:76:10:a8:55:44:bf:4e:71:42:84 + 21:04:f8:d5:ff:aa:85:0f:e9:43:3e:04:33:c2:ef:00 + 46:e5:62:db:93:89:82:ff:fc:63:0e:09:6d:be:1b:23 + 6f:52:b9:9e:d5:71:7d:5f:b0:e2:a6:9c:d1:e2:c7:5f + 1a:63:a5:9b:54:f7:ff:ae:ae:d0:fc:a1:56:4a:d2:1a + 7e:19:3c:a6:40:98:c0:fe:54:2b:ea:50:99:3e:88:f4 + + +exp1: + 00:ba:89:87:fc:aa:f5:60:ec:cc:8a:48:27:90:30:ce + e3:be:47:6c:23:95:40:01:4f:17:ae:53:c6:c7:84:be + 68:cf:c2:19:aa:34:a9:47:83:e3:97:82:3c:36:11:40 + 92:2f:f7:09:b9:25:40:98:dc:1d:e1:a1:72:99:46:74 + ad:72:93:da:1a:c6:6c:10:30:80:42:a1:52:a0:b0:75 + 97:c3:13:1d:50:24:d5:7d:90:5f:9b:d8:18:c3:72:f5 + 02:44:35:c0:11:78:5d:50:c8:b7:a1:bc:77:1e:c9:3b + 1c:db:40:37:64:75:38:20:a7:a5:89:2c:c9:91:15:49 + ee:98:ee:fe:8e:fe:ef:6f:15:3d:f1:43:77:78:1c:46 + 31:53:d8:e1:82:de:c1:c7:12:8d:28:e0:45:14:9d:f1 + 73:3b:bd:78:e8:4a:da:9c:ad:e1:06:17:f0:b4:e2:df + da:fe:a5:8f:0f:c8:14:ff:38:31:f4:45:60:e6:70:4a + 8d: + +exp2: + 00:a4:06:90:d0:61:83:72:cc:93:b9:1e:02:94:6a:80 + f5:f9:af:ac:7b:33:0d:af:2c:cb:77:4d:46:92:08:96 + 15:18:83:69:e5:c9:62:28:7e:43:da:62:95:6d:2a:a3 + be:bf:6f:47:dc:8b:35:ad:52:0f:73:84:99:de:aa:ab + a8:0d:89:7e:b2:c0:c3:19:91:5d:1b:1f:0c:55:30:33 + 5b:89:b9:ff:30:e8:6a:54:90:07:ae:2c:f1:70:54:4b + 40:05:92:88:80:cf:9e:3a:6a:99:3a:48:9b:17:a0:fe + bf:62:50:ea:91:a9:39:8d:fb:d5:04:6e:74:32:38:4d + 5b:cb:88:ae:df:a4:98:ed:16:37:a5:36:cc:2d:43:54 + 5a:83:52:12:f5:7a:3d:41:f8:06:00:eb:fd:ff:58:80 + 7e:36:e6:b8:87:a5:e4:fe:64:ba:2d:b7:34:e0:e9:7d + 6d:27:d0:df:a7:15:76:ca:7f:71:0b:29:2b:d5:6e:49 + 39: + + +Public Key PIN: + pin-sha256:JJoOmvj7dwVzA9NdhmQGGH7pyIfyklw0jEoNpxXnfTk= +Public Key ID: + sha256:249a0e9af8fb77057303d35d866406187ee9c887f2925c348c4a0da715e77d39 + sha1:9e0e5b228cfbd28f2753d5d60a0ccb0d590f6498 -----BEGIN RSA PRIVATE KEY----- -MIIJKgIBAAKCAgEArx5p0JWOfE/z3GXkd57QaemGBC8ZmE463Yhy6WtR7ww5MGMl -QmlsYYvEeZj/3FLe2mdAazTAlU8uf3BM5f8PUVahESgwevGVNJLtgOGJgxXp5csl -LlWYZ+a3qL1FJYVqPKfiK/tb8BsgzzPyECmlCerXw1lQ+34Fc36bw5vFw6igegb8 -yz5N59yvZp3b9iooU1J5yRTGTpEmGhUrUNdUc2MEe2bwLiEgffVmX9oc2mIqLwfR -tFjJMvNb6Zr42yllWC5aVeSJ86tkIhuLRQRD/nmy3NR/Txne764BhNnJ+/INV16U -fJz1A2BeFBhbPdH7T6jQx3BxRDQew66Qe8ESGuWa6SsjWwhiCl/lJ1UeUWt9pjDN -qT4kfeWQzZKnbMoC7hwLMmmo9fsL65jPNR9iclf5FXBap39/gtWl9vobuTi+6yLJ -BGBvB4FsFsRNDVu0PM06wUew/d9oTP+3/GKI8UnqiT+76RlC3lcyRdAk5LKFofg9 -bPkNm/dw6aDFtfFTE4oNjRXrUK9w3SZsknne2oOveKoGOYg79T/wlgUo++Uwwa8N -yYujycVhEvqMdvX68awlrQIxMFSOcyeaiGVuZ/gWIq/7VZaDJGEpnm8vXkpkyxhD -Wa3qQcLqHKbydckEaLHc2BuNjI3yNiYZUxVr8MHRgrBarEXLHz0yarvNNUECAwEA -AQKCAgEApUnNkoU3QfqtMCA0bvvFt9IlHpneTLW6NhNucwdLBJjC+fr61h5vn/qu -bh+NkMXfdsHyOb5G8CcWuk6jJouCR8G+sVT/vWt862yrI/S9OK9cX/tIkt1Txu4r -9+b99xZgWfQUNHNCKfVRGIHtPngwQJYbJVWObHJcbtDX8N984Nqu7b7eqG+cVPcl -z3O8hDLycQLt1G/5ZXr3PbMxeVJlcavKNTfKB6BY7MrN4Dcc+LujGVUGCHWtIpw0 -6t/Nd/8wmvTVazEVTJs/HjplT7VhADaaLnmb2GuQ0yWoZV6zmUy0bvzkpmH3mUJC -SjFbHZSu4ldzCGwHXNrdFtITqdtoW81Tj+b3EsqNlB2u1I8DpOMR8vMGy5f0rYhs -Lf4Vmpvggw4bzLeu9A6XStxiB/wExn1QlQd54X1zfhssoF/pbu2RtCujn+y3zYCd -2c9gqdN5MaGsr1NSYUPilj39E4S4FwtGnZGIYhClglToy0sMB/8lQvGIz0WRRfSG -g+LUuiWuqn95ZrnSJvTSYCvsH0OB64IWpd9sHtu/P8Cjms3B/nIYjbG5gj68m319 -AsK1uFAqVmlGYVJVzgND9B9Egd4cODlTSsncEUQlS8PUZaym50FoBuO4vN+IYrZO -H/yL6+hq3l/va/xlr4ZMEiBdEAiSj7g6XqQGzTgOz47RJn1FAGECggEBAOi8Moix -SGHhxpJZgeHuL2FgBuNT9GVDoTNbUtEoZ7NsJd4BG3MjbZFluFoSfFiawAqJ3e6c -ptUSiZ1KXN1gvMwVkget3MyenEzohYczwYOQeREAeRVr25Wq8cegvLaDFejMclCs -ILC80BaGbVcAmJMdOBzLVqtY/7lps0LWpGd/6KYXTm41erhWJkvx+Vt0uPKVzGqx -Ijjh/DSc5eX5BIdn2bYHLRu/xqfnX2kSH37PSto55ROSu8D8YwjaOdyQ1Hha6+O1 -Q6E4d2HliYqv1WaDHjyAXjmlP/3ob5f3QdXbqpB1smGPimK3hiZB0sYgdUI3yW9c -NkynqGBeoTSPjG0CggEBAMCfyVJnG1fCnFZFCtPawYKK/IoMNyYzgIKomlcBdF/8 -J8Gwr6jcFBbdefT+VypVO0DywPrIFppDzjGEmZarFRgXsspGBenQQrZTPG1eUldY -U89ODTsYNk0AXdctkMvAFSfVbA/4pnXAiXzKeEDk2YOhDYP1Y/T9eZQ3AI+LNeGO -1Oqd9hGgsW0rqVgW+rCbUTezFE5J+2zbzMu2XnJieueG33iaVMpHzqnLLe27SYcI -7VmgttZL4eL6/klPHSKC8x3y1c2T88d+HAuW+mB+bQ2iQWYfM82SyxjTER/7jpTy -Zpj/mibgt2cQxVowWFmMMOLXczhpu/GOgRxxCXVQn6UCggEBAOa30vzxiskGMn1Y -4EpifnPw50MrMkfFEKRB70rL3GnhV3TK8jRlNbSC+4vHcZ/A4YpQ/EMU5sqp0uSs -GH2Z7e//nkGgmRf8UQRpKh5LL5bGfU5egqq6vveTfJajARGJyAl9zAGvccTjmQIL -h49NVvPYbo0VAzlgRDrBz2T+NgMoqTEmP6k/uQXO2a5GFiYVA1fxKrHGIh/z37sk -o0Aladj2Gby7RnuQ1VYUJ+CYh8KFqzXFWRPbTefWDDN1axD+PrOFpv2Y749+09Kn -438qKsqyRyJBO6e360VBzIcBJjHkzyTgmNLgopaUSxfX/yRMfxIDDd0os+ev+Vp3 -1SWu/M0CggEAWSvfZCFNPCRggWN27rpPaOJ0pGehRDMFY/cvc+W9fQ3bTcRAnXg8 -aJVg9vSjX3qTcq6ufaoRJJsNIklTXLeYjU2zPAaMiEAcEhGYYL0Qe1Ttf4OPhnLf -+GeaCZoTdO9YG9emLgKa9NoMC9QjNU98Dn6JJjR8cJbDKMUJomn8qI2ZrX8wwdpV -KMfUnm4M4aMVRybE2LVRCoT6WrfzIxrJ8NK0Mz2m0PnLBzmC6pIQKM4OKrbGzY/V -Y2F0RHW2dBqQ96VKKuA6M3kC/K6I/BCq5WvewKrjLWCuWrCjNd4blIJe0qdJMoRH -AxR1eBn3XIUUwH6i3VO9aMbiqEr/6OpI7QKCAQEAslqWEcRSL8bxXTVs1Jqip4wW -lbJoym+zXhMLiqxCbMukClkkCdaI+lxNVdxs4MpACHYRAhHwVvAujz5JcgiMjSRC -IK/JGu9uVkSriA/YJxmmMPvTYI1bmT1lT99HUqhzM5COuSFJh9D8cfpHJSUC+6rF -1U/YcdcrZAMl3UH30XdsJLc6l3L/0gyseohwWT76dSqqOOathvNM5PsE8jNzPEo7 -VUdfrrDpEw0dPjk4IF8cpC389H1j8lnwxkWQtHHhXZTXHJlC9xYPa3PRsRn18pJy -vxz9r76vJ3YJiQTxv8MKw/AaQrNDZng0Ff5kqQAqc/q/CvHdb2pur8NTsS/09w== +MIIG5AIBAAKCAYEAxQwJ+bBLNgVKttDsL8JtwpWSKsBaMWZJUKd1htvhZuLiSvv5 +UdTTbDo0VFehCwHt0vBeWkoS665U9JwWAZQjLjnQltD1AK+qfQuf45Hbm3MBc8Uf +j3vlw1NZ2/lk26eH8rrzxUnfG1BFli/thypbeas/zVVlQpKw8auVA3caLDMJFFU+ +3l1vd4bi3+hZ9iUvE/fCdEZRoy5OPeAJ/W1AC0vQQGv2TYfCs/IjKUkQja7mIMDd +cvrq4CRaGPSNbJhvJ0T8FwamxGciOmXiKC8V0SOIlvx0Yv2kdU7uL+QDGhNhzjkp +sjdJRMww0DWcBUwqtMJfYhtFSHtWsiyiFhPFc84Hl3LeVZT+zKl2IcXI+3087bgb +eh5eM5C/ugT3dsxtiYGKyTnTO3Zyx1QHz1yoAqjugxeNplncXkQshotGx2HtHuoo +dVjOpEu4uqK2MSv6xjXXOd/MWm6N7qV30/NkeayJKJ7yJLZqmSqvUoumQzfOvLr5 ++/cFuN2FEBvKrctFAgMBAAECggGAWgvXXyhGJoiijQrKdETYncx2QF0omlyQ8m+k +UJ2Y0sip+vRNCi1E9LdghI6LBJm8EeJQa9hf7x36qtHNaKlGrnAzN0iEPe0I7x3p +0jgscExNBJe3hX1sESe87753bb2QbccrcSQB9dxoAGskk9kydlZg0LfOj26zt6ze +avf5mOs1ofoWwc1XC/szIHlw6wAxFGHrlfEwi260yKfiSNKtKrxZjacIpoN84Xis +wsgl7WlYtu0MBehOf2F9Xtwa6N57V9OsBZtE8fs7/4YVruQZz4LNLbpZqCojGqmt +MFXI3hX0Fs0UF8OLG5PdEIprcng+/HMuL7mlPF78TpC9OhJ5nZWDh0ltxFGr1hV/ +0qVrwHbWC3Vcg9FjFDOtJkOX1X4IuIC1WP+1Het6GyzhVMmGN+n832SDRzgCTEN4 +k0+EMzWoHToKF2N5/ZG+HIzG2UAW+hNM023zOjll6ZcSXW7rnQdkOrFNR5uC+//h +kpaa96fsWoqR6B2HIdt/6SNTqLxhAoHBAOYejco+6i9DjXFHiOFeV+NrnWFF1hV5 +se4hBo3aZre63rYNaE4U7Jcw7DBhL/9qST0zPK8wLqMZ8XwHSYO/NLP4RuDoOzVG +aRnIBcT1t5CXAYC8mu0GyqjnyVV2+rjXtzjswoDUGXfb12/0yTEhLVc6Ls2zFbsc +B66fqKhXFIwrXSuEL2LIe4AEWVkIAvyG702PWiKIcXuDSjsxEeMNrlOcwUHZHGbU +2YyWy5bqQqDtxdbnVsJAIprajh+Hx3O4HQKBwQDbNUnQtJoQbF3OzVsfiACLoF9A +SFSdpRXMWbsh9xGehjUdRcaqoa7+OL+ZWKqEcdTYLJlPVB3M6ZUrOth7xDqWHJrm +JR0fnGCnHar/6ZjcBnqXh70YGSrIU47I3bQtr6kjTtqCZOdwQdZF8502K/+7A3vI +suOs82Zu9FHA88rQIqA8Rq9egbaWUXHXl2fbIcpX/JEEwGTg+3P0K7LxxEn5048X +dPa8vMwTiWwPDlpFlHpgD9Ps4eo+K/qv03lDh0kCgcEAuomH/Kr1YOzMikgnkDDO +475HbCOVQAFPF65TxseEvmjPwhmqNKlHg+OXgjw2EUCSL/cJuSVAmNwd4aFymUZ0 +rXKT2hrGbBAwgEKhUqCwdZfDEx1QJNV9kF+b2BjDcvUCRDXAEXhdUMi3obx3Hsk7 +HNtAN2R1OCCnpYksyZEVSe6Y7v6O/u9vFT3xQ3d4HEYxU9jhgt7BxxKNKOBFFJ3x +czu9eOhK2pyt4QYX8LTi39r+pY8PyBT/ODH0RWDmcEqNAoHBAKQGkNBhg3LMk7ke +ApRqgPX5r6x7Mw2vLMt3TUaSCJYVGINp5cliKH5D2mKVbSqjvr9vR9yLNa1SD3OE +md6qq6gNiX6ywMMZkV0bHwxVMDNbibn/MOhqVJAHrizxcFRLQAWSiIDPnjpqmTpI +mxeg/r9iUOqRqTmN+9UEbnQyOE1by4iu36SY7RY3pTbMLUNUWoNSEvV6PUH4BgDr +/f9YgH425riHpeT+ZLottzTg6X1tJ9DfpxV2yn9xCykr1W5JOQKBwACNk4pTxdOt +ZxyO77sn2yyZg3yon6GoI84OfkQxA/0jirwcMoXzOyd6ZluiOBMmTxHt9MPOrYle +286hKzpp9ncYV5cn0yzNnSFpPEDK5N+CYtOqiOL+6ajKs8mdtOua3FeAYpJblHYQ +qFVEv05xQoQhBPjV/6qFD+lDPgQzwu8ARuVi25OJgv/8Yw4Jbb4bI29SuZ7VcX1f +sOKmnNHix18aY6WbVPf/rq7Q/KFWStIafhk8pkCYwP5UK+pQmT6I9A== -----END RSA PRIVATE KEY----- -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!!!!!DO NOT USE THIS KEY FOR ANYTHING !!!!!!! -!!!!THIS FILE IS FOR TESTING WGET ONLY!!!!!! diff -Nru wget-1.19.5/tests/certs/test-ca-template.txt wget-1.20.1/tests/certs/test-ca-template.txt --- wget-1.19.5/tests/certs/test-ca-template.txt 1970-01-01 00:00:00.000000000 +0000 +++ wget-1.20.1/tests/certs/test-ca-template.txt 2018-12-26 19:58:39.000000000 +0000 @@ -0,0 +1,20 @@ +# Template file to generate server-cert.pem for certtool (GnuTLS) +# see 'man certtool' for more options + +organization = "GNU" +unit = "Wget" +# locality = +state = "Sunshine" +country = Freeland +cn = "Wget" +#uid = "wget" +#dc = "name" +#dc = "domain" +expiration_days = -1 +ca + +# key options +signing_key +encryption_key +cert_signing_key +crl_signing_key diff -Nru wget-1.19.5/tests/certs/tmpserver1.crt wget-1.20.1/tests/certs/tmpserver1.crt --- wget-1.19.5/tests/certs/tmpserver1.crt 2017-05-03 19:22:57.000000000 +0000 +++ wget-1.20.1/tests/certs/tmpserver1.crt 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHOTCCBSGgAwIBAgICESMwDQYJKoZIhvcNAQEFBQAwgZkxCzAJBgNVBAYTAlVT -MQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxIDAeBgNVBAoMF1dnZXQg -VGVzdGluZyBEZXBhcnRtZW50MRAwDgYDVQQLDAdUZXN0aW5nMRQwEgYDVQQDDAtX -Z2V0VGVzdGluZzEgMB4GCSqGSIb3DQEJARYRYnVncy13Z2V0QGdudS5vcmcwHhcN -MTcwNTAzMTkyMjU3WhcNMTkwNTAzMTkyMjU3WjBiMRowGAYDVQQDDBFXZ2V0VGVz -dGluZ1NlcnZlcjELMAkGA1UECAwCQ0ExCzAJBgNVBAYTAlVTMRswGQYJKoZIhvcN -AQkBFgxzZXJ2ZXJ0ZXN0ZXIxDTALBgNVBAoMBFNlcnYwggIiMA0GCSqGSIb3DQEB -AQUAA4ICDwAwggIKAoICAQDA7rBHc+f7uMdaaPbfo9vfRCGYX8ceCxENrmQG0MDs -eIlJXHx47aMpLQUOuZPH85BkLMCXP4Lk3gixNE7QXAr3etJVaiURoHXYDJr3Da+N -DAyOwTWYVgxNXM/JoQ9aJ9/dZFTwAwVhSMxbe4o+n3JfmmZdE5ezkdWLsfZrJLi5 -rSpAtYg9hjvTShx3M6hyCYR08Iw1MfXh0gdZjYidOj3sVzOip59dUtXA+tHE7QRJ -iTU9acsILbuy4FU6KD4pNKaIKGOygwECmXCJINk+69gbzl16+H4cjYGLB6G0icQK -xK2l3ZI3yckw11+Kv7TqHJZO+1ILBzqoczv77GAWNc0IboUtNC9ygmz8Th8cDQq4 -gCEhEY4fs6AFPzBcgXxn7k8ZZosU+hOIjUTPGNYxDUpNVf37bFBXevE90QPQZQsG -zAvbpLxTw/gUEB9+ksS3s7mDbfSJJ4N27uaMUsWhfKLSlb5hbBffhngdioGgzwn0 -656PZEaLPMiLiBcMEMMQGQDy2YGhYHYkBlhnIPAxxsLa2TmDRpgC9Kwt8y1cSrtP -Z66lrJGYf5bJjSpvXBNSYB2uZnm0DqdqpWoM1r7ii0jkn62iB6MiKdy5qEyL/+aI -VK3OqnfOi0eiPHjoGWl4k2cYpNYRNcOyYWKIAqQmfzBEoJ+JfQCPZaUuibU6mU5a -uwIDAQABo4IBvzCCAbswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUex5oeY5P -e9A+moy/fmTAPzLO7TkwHwYDVR0jBBgwFoAUF+2TQ4+npgB11Oi2gg2IN37AbQgw -CwYDVR0PBAQDAgGmMBMGA1UdJQQMMAoGCCsGAQUFBwMBMF0GA1UdHwRWMFQwKKAm -oCSGImh0dHA6Ly90ZXN0LndnZXR0ZXN0Lm9yZy9Cb2d1cy5jcmwwKKAmoCSGImh0 -dHA6Ly90ZXN0LndnZXR0ZXN0Lm9yZy9Cb2d1cy5jcmwwHAYDVR0RBBUwE4IRV2dl -dFRlc3RpbmdTZXJ2ZXIwgcgGCCsGAQUFBwEBBIG7MIG4MC4GCCsGAQUFBzAChiJo -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vQm9ndXMuY3J0MC4GCCsGAQUFBzAChiJo -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vQm9ndXMuY3J0MCoGCCsGAQUFBzABhh5o -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vb2NzcC8wKgYIKwYBBQUHMAGGHmh0dHA6 -Ly90ZXN0LndnZXR0ZXN0LmNvbS9vY3NwLzANBgkqhkiG9w0BAQUFAAOCAgEAlc7l -XCIP0ipVsWYqgmWLhZ4+N+s0D1aCpvdcuM9Yy2cp5Cb74UqZQNXUTSSDLN6aZJlD -Vsi31ZOrqjoFe0HuVC4Bfeekz48UhCALEB9I/fw7oRDKagXwYP2xR/AZ/lAkexPy -AQf86iDaKbxR3+uHQLRuY+MNAk0NZy7GQmi/+B5o4DO3Td7sQgj+3Ae37/w7gN+n -nXkqZvqCxSB2+aNaeGjsjBEitYApPGKd+ukmziBFvXCP1qHullkzsOZUBZeycnik -8Ri6Y8EV2vRjfQ9AsMgElg4qUR0/eOx2WcY9x2vCOb6z+h0iT6RHrYHfc+wWdgHQ -cpPqodQGRb8rdRnKGy6Yq08gOZyjAqbi+iBqeY32GuV8EfmVeSkVRvE2D05erS6S -0ABPZ6HMI93UfTUMBSVJWcdBNxi8h2x0G/SNBaQkdLXsUTOf4LmTkdoq67g1DHz9 -aMWsWDY6yJZ1hqkVRpIn9TBc99oiqkZYZYANPFGGZRVNrptae37Ko3cSnawDPTbq -ybP7p4sojfrLDuyjON0zjVQhTvPeQHHKt8bcOLeDQEM0PispMWN3prWTEsnJ9HVt -sqIyj3QNQS3WUU56l74BXeccX6/S0WWm+YVrQ3n9wm3t6vovEL9CUZ66LhlSSttQ -X5snflq4GaWb7cdyOoi+NvhM9ruNWPwUOOLknys= ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/tmpserver1.key wget-1.20.1/tests/certs/tmpserver1.key --- wget-1.19.5/tests/certs/tmpserver1.key 2017-05-03 19:22:57.000000000 +0000 +++ wget-1.20.1/tests/certs/tmpserver1.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAwO6wR3Pn+7jHWmj236Pb30QhmF/HHgsRDa5kBtDA7HiJSVx8 -eO2jKS0FDrmTx/OQZCzAlz+C5N4IsTRO0FwK93rSVWolEaB12Aya9w2vjQwMjsE1 -mFYMTVzPyaEPWiff3WRU8AMFYUjMW3uKPp9yX5pmXROXs5HVi7H2ayS4ua0qQLWI -PYY700ocdzOocgmEdPCMNTH14dIHWY2InTo97FczoqefXVLVwPrRxO0ESYk1PWnL -CC27suBVOig+KTSmiChjsoMBAplwiSDZPuvYG85devh+HI2BiwehtInECsStpd2S -N8nJMNdfir+06hyWTvtSCwc6qHM7++xgFjXNCG6FLTQvcoJs/E4fHA0KuIAhIRGO -H7OgBT8wXIF8Z+5PGWaLFPoTiI1EzxjWMQ1KTVX9+2xQV3rxPdED0GULBswL26S8 -U8P4FBAffpLEt7O5g230iSeDdu7mjFLFoXyi0pW+YWwX34Z4HYqBoM8J9Ouej2RG -izzIi4gXDBDDEBkA8tmBoWB2JAZYZyDwMcbC2tk5g0aYAvSsLfMtXEq7T2eupayR -mH+WyY0qb1wTUmAdrmZ5tA6naqVqDNa+4otI5J+togejIincuahMi//miFStzqp3 -zotHojx46BlpeJNnGKTWETXDsmFiiAKkJn8wRKCfiX0Aj2WlLom1OplOWrsCAwEA -AQKCAgB+Lt5OLUlpgkWoJQRp6nKQiK/sR6AkTxqdNxSmvHuhbYhk2b9zHAFdmds3 -8TntSaiDTB2+DkTeyTUoKMzvS3PEvqi4Qo7yA19vqXbk5CeP+XRxHX6fHpA3PN+N -wPAYiAHLe6Ztv5wSL5mwr5EQOhqE2qfeckUCpfvjvMYs9zx1/AKphdEQZC3WmB8b -+0ZNJ1phXT5mQEHPqx0xffb+1ivP2oyj8juxvs6cw67UvCvUqI+QlhO7SqX7bOtw -+QcGzi+o17m09CeB+rb2iOxtUbTrIsJS/hkFNaunMZuaR4xXeqET3WGXaTtT3VjY -l1+MypuoFolnOxgrOgreTo/dltx8Z42Z+1kOCScrgML55WUW9TN8EinPimlIybXu -Md2UAzSdnKe8BIXEC0HqmRYpTNqyx97Ik0OvYnlO0Tj1+Np+Q73xVJMB2srfF1op -I7x9zDka7r9SANSd1yfat73GSR1CcPtp5wKmSzix7Gblt10F6U2QLJ09snMg7oqN -NsHtRuIQLlOcrbsDjJkmTqV7GKTt4COv7ZY7WqKp6F/pfSKfEcwI38ePzOxPRfog -8MbYxYUEjd92k7+wy1CWT8dT7RVzAkRc2Ycop7P+1xAyrnddVaYntKpnNZcu0p7L -o3F0Wgv5eDDQtHn7WHgSIWiBypXvidGfM2kSVCd3uljKueyNcQKCAQEA39CNmPNu -zKaI9Tli3oAaU1y5ykuTktbagez40ReGRNlMgzILGxDEVlNHZmslGmb88mVfcveE -3iVANehH2AeiyiH71AM48jJqvEO8LMFdk+EMml1qrbHU6GgwBMvfiNMtA8qgY9Tn -0419qCMgJktBSbha5byaQi7Yv2rDZWGFvB0NVsmnLhUBpJpPrxE+jIvpDr6/2xNZ -JQL/GlMrNeWEkkSkjrac3rtfOWTU63yLh3oIa0EfD2U6iDD1BYIhmPhooye9d71i -mUmg3M9FxeMRCyelaC/btZpzzXbvBAjZMbqletqGcL50C/2ztRG+tmJE/J5KRh2a -jWcfP+R8NPVtSQKCAQEA3K0+hHeL1yR1xcL0ExeE9pBgDcBUkgUR8ooupfkvkBK9 -w5iIyqPM0J3YEa/s506nfqwSMBDL1rVMoAY12bo6A2fMY72TW6MqNQnrAyDaZFIw -aVNl7h41YXNs9uAeETLY0aBD0OAJd8hdheXSOWms4CRYo49bRg1fLrwEVgblN8lz -KJIbBpKmmQUeCKFklcRmhHRTF92+Z7ulkxOTlHF6CPG/6/bgiLvChAV95dAV8zZV -O8owdeCKPtDvP/O3sVG4VyRNGw6a7h5Fa9JDx6bJH1+CybsqRw/4ZsSV/fbwq6Qs -wkxI/55kT2OVXJzkVzcK4Fy3RhQ5q67EjiryOqnb4wKCAQEA2f7PPC+3NtvqQDfR -5fgOLC3/xFsSdQ6SK8R9oWLxY7PnQ04F5SnSomZhAA/SRsITE6HLczZFEv5jaV5C -Q9dEJu8s0pcE61pR/edXrJv2omesF9pvYpj4UBnS04kjw6g0iyHcUQB5gOOqhY8Y -7FOWVtCasHOgKGBqux6pDOENGmmNqX+mN0s8m2+1t0Xrj4diy/rc8ewJgvRFNwXU -650PIEx9n4eciZElMcjVXjyjxqQE+Tqnnx4xAZ/1t5TFVrJ1cJzvfWZYWAeQCCJW -ymTdH+lQwYcD0AGNU43JRju8GSS7s0qPcdb/PwKv++g5wnk6ynb+zwZcl+feVyQc -GpUGCQKCAQA6O4U504oVVcu2SgG6YAR4RBT0zAIFHk1kIU66AY2piSiGSuQeBSdx -DZYM5M2xJDJS3PlXsbb4i5MSz1C6icfxShzHXSlbjyz+HgXkJ3E58+5OfPFy6onP -k3P3maCVjUNl3dLHdbdJ4pe7U7Ar8lTqOO0jDBtb2v95B6hlQyCNnh1DYXq8O0q3 -KoCIan5ufwtGfKPIsn0iRoQk0Y+qJl+7qH+qttT9f/6OdByK3mRMb9QCGRK8qGoS -tXPM/nVE13m7lRq7vxjnKRnMoAm+z6ZXHw8WSMuZQP+drtad0+IiiQo+o37H5XY2 -9OJfNA+VbDL0jcLXPVMSmOXJVk/hZx1dAoIBACFJ1/2PlT4NIWpmy6nq4qL9HVR/ -MZjwlk4zaPnqbeLwNLN1kafd1sJmCx4/PUFyJTaKpWDq/em3qKKGAQ4t3Vl622WO -82R4C1fC/pbVhzA7eKkT8buoPJTX6zN/t77f7vPhhIqIaY48/qZ8Y3Zny5vpFE8M -MmAwOZFVCoMZ/PmXXg2vh3rd8eD+b/NhY/8vtPB14rWQyMbk4APvYIOo6V9D+j67 -leAls/mZyoAlPUj0qpqcXRNhChm8r6XYJJQnAaxOU7eF61GeNPfMfcwn4BhFO/U2 -bkO27d0S9/i6rjvS7ukL2rblLgJYTZKS6qKAKeOw+7w7vcbhjDiNeJZEPpA= ------END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/tmpserver2.crt wget-1.20.1/tests/certs/tmpserver2.crt --- wget-1.19.5/tests/certs/tmpserver2.crt 2017-05-03 19:22:58.000000000 +0000 +++ wget-1.20.1/tests/certs/tmpserver2.crt 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHOTCCBSGgAwIBAgICESIwDQYJKoZIhvcNAQEFBQAwgZkxCzAJBgNVBAYTAlVT -MQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxIDAeBgNVBAoMF1dnZXQg -VGVzdGluZyBEZXBhcnRtZW50MRAwDgYDVQQLDAdUZXN0aW5nMRQwEgYDVQQDDAtX -Z2V0VGVzdGluZzEgMB4GCSqGSIb3DQEJARYRYnVncy13Z2V0QGdudS5vcmcwHhcN -MTcwNTAzMTkyMjU4WhcNMTkwNTAzMTkyMjU4WjBiMRowGAYDVQQDDBFXZ2V0VGVz -dGluZ1NlcnZlcjELMAkGA1UECAwCQ0ExCzAJBgNVBAYTAlVTMRswGQYJKoZIhvcN -AQkBFgxzZXJ2ZXJ0ZXN0ZXIxDTALBgNVBAoMBFNlcnYwggIiMA0GCSqGSIb3DQEB -AQUAA4ICDwAwggIKAoICAQCV0MqVGbB7ddCux1Oukmrf37UFXWXUt9mkk43xVBfj -H2W1UyuwwVw4vxHbryPfCBEJosBhAwaWFrUgr8Eu3ygTjHP/APyU38tHBWLRntlJ -h6sDDWl0WrpnJganTiqDXAOm/14UOkTiNcROZL5VxuOaydOAYJr6Lhs1a6R+Mmjg -6XvH+UbBzGctV+ypRsYjBJtIdIZ2n7i4QK9OQEb3v6amG4gbQXU3UM0yHcrUgRlQ -wJksOcUynWn5uAUaXIwWFak5BhgPRKx5e95MyLBn4M5auk5+5+q4yjY9JllczDsN -oYgNilt4OgNBBTgsjDnMeqEQJyE9zxUWeyVAs+HTaiT0S/8IXQ3YzxBk4sY8JtCU -6/qZv4YTkYoTuHW7Q2zWhAX4Mokq4Rmn3ehZkxKw2xr0FQojJHZ9ELKah+jrwcSB -+kjZ5gldRO5vH2qYO2WMpmNaEsWiW+tOTLeD/1kcMaMi6G2XmUOeMifLAg7qu5f9 -FYs0L42fTHk052YPS+0Ut2SvBo9PFqk/KDrnsocTKWRj7acIl6VkRdm0RlFeAc7b -bGp/VhwXiM4Frv+5zNdL/c3Il2/wNhvOwgwETlqGjfoJidm3r/SeH9ewLrYfHwyk -ts1QAemrvll/ndozRJgbDds/byE6E9g6Bv9sed85Kzjk0Cc/4XaGqunBY9qIlGDE -0QIDAQABo4IBvzCCAbswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUBFqV/dPL -v7D0jfTtmkyR5CHH7uIwHwYDVR0jBBgwFoAUF+2TQ4+npgB11Oi2gg2IN37AbQgw -CwYDVR0PBAQDAgGmMBMGA1UdJQQMMAoGCCsGAQUFBwMBMF0GA1UdHwRWMFQwKKAm -oCSGImh0dHA6Ly90ZXN0LndnZXR0ZXN0Lm9yZy9Cb2d1cy5jcmwwKKAmoCSGImh0 -dHA6Ly90ZXN0LndnZXR0ZXN0Lm9yZy9Cb2d1cy5jcmwwHAYDVR0RBBUwE4IRV2dl -dFRlc3RpbmdTZXJ2ZXIwgcgGCCsGAQUFBwEBBIG7MIG4MC4GCCsGAQUFBzAChiJo -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vQm9ndXMuY3J0MC4GCCsGAQUFBzAChiJo -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vQm9ndXMuY3J0MCoGCCsGAQUFBzABhh5o -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vb2NzcC8wKgYIKwYBBQUHMAGGHmh0dHA6 -Ly90ZXN0LndnZXR0ZXN0LmNvbS9vY3NwLzANBgkqhkiG9w0BAQUFAAOCAgEAi2se -m+oCEBYHQ6CdmB6afz1MLjbHUm33//Oh0+Jb3RMILA9+S8t4lCozfvMUYjJaB0Kb -3WW6D6xJ5lZ1qDx1PDVNoQdLkdxCOL85rXyCdGNDejbo35FOhRe3YUmaznNZqhLh -xu6fKAgHmeb8PCIBtpgfV9qIRRc/x1UMRaQqtJg97QjIMKUpp9/FsrXde+09QK7s -0wmUTGC4HxsP1pQjRlvtHzFW6Wa/sB5/gBWj/8avh47HSALlb6HwoiyPNz8pm9NX -dDgOjVT4It4uJ3NWgQZ7NdY0L7RLF2Hrw1XogR110vOYU/dPrs4UY3GXoP1w+aOY -3Ie5Y7d81OG4ZtEhgjqsK76Vjnuobn4lVOHx9voYbV8ke9Q/av90Eyxgmph0oKwV -2uyMqIwR7+TsOJD2uHyyPD1M6dOJ4ywQULGzLN5k/5Oq4LtUrxRZQ3xaXDAUanmF -MPo17o0sPw7/ruAnWMLp423OePSMyTjb6cRSQzw22sMUIR3Ch+EqiOFX8LPGKcOk -tZOxUmBAaxbSWFcd8t1L9sVbeYHU8sU6RCPC8roQs64M+zyDgwYP6rADjwOrNPfF -JFTlU/MkO5qt69zvrmrShaLQ7DCMMreAlILdCAQ8l6jpj+kpEcO3fKi7YS1h8zfe -70OXwGoCIgLv2OOw9vak+yYAWl833tqc5DirZoY= ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/tmpserver2.key wget-1.20.1/tests/certs/tmpserver2.key --- wget-1.19.5/tests/certs/tmpserver2.key 2017-05-03 19:22:58.000000000 +0000 +++ wget-1.20.1/tests/certs/tmpserver2.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJJwIBAAKCAgEAldDKlRmwe3XQrsdTrpJq39+1BV1l1LfZpJON8VQX4x9ltVMr -sMFcOL8R268j3wgRCaLAYQMGlha1IK/BLt8oE4xz/wD8lN/LRwVi0Z7ZSYerAw1p -dFq6ZyYGp04qg1wDpv9eFDpE4jXETmS+VcbjmsnTgGCa+i4bNWukfjJo4Ol7x/lG -wcxnLVfsqUbGIwSbSHSGdp+4uECvTkBG97+mphuIG0F1N1DNMh3K1IEZUMCZLDnF -Mp1p+bgFGlyMFhWpOQYYD0SseXveTMiwZ+DOWrpOfufquMo2PSZZXMw7DaGIDYpb -eDoDQQU4LIw5zHqhECchPc8VFnslQLPh02ok9Ev/CF0N2M8QZOLGPCbQlOv6mb+G -E5GKE7h1u0Ns1oQF+DKJKuEZp93oWZMSsNsa9BUKIyR2fRCymofo68HEgfpI2eYJ -XUTubx9qmDtljKZjWhLFolvrTky3g/9ZHDGjIuhtl5lDnjInywIO6ruX/RWLNC+N -n0x5NOdmD0vtFLdkrwaPTxapPyg657KHEylkY+2nCJelZEXZtEZRXgHO22xqf1Yc -F4jOBa7/uczXS/3NyJdv8DYbzsIMBE5aho36CYnZt6/0nh/XsC62Hx8MpLbNUAHp -q75Zf53aM0SYGw3bP28hOhPYOgb/bHnfOSs45NAnP+F2hqrpwWPaiJRgxNECAwEA -AQKCAgAGobBl+zYhsOxk4DPnFVofwNJNg33fdafvrgxpc1R/XENvTFgxwc1oQaTz -uYP3+m5uo8KqSK0A9c5cvQrrHTuz6dK0pgGIQYPJCAcAymxJ4fSC9RQG74Ey0a8X -ttEQ8YDD4qfyc0XbUY/3/GOkfmJS1r5C/4O8sU/JBJPKdkbINe2hw3oLWBX1HuA9 -+gEJScnp4iaVl6pglZRs/VFm5BfnYG6c7j/XC/+ZSVJSJ8jMF0pwd7ov7GHliOzI -5vHYhGryOD/WZS7RTddgRL3ySzQ3NeoFmhR8y46tFEZ+Yhf3GYBhQQ+decvtE+MR -rb9dOsxoX6MMDl+bmCXlAFFtv1QVXvStSm+4rdjuHSUtg94jgZ5oVLCbLOmOqDhS -ibsvw0gpfL7js65h2nTIg5+ltxUafwYIQZ36rx7swqjD/bVEakvgkvR7oJ7XOnNM -EKapKGdDkf4HDWxHYzmlfRrj+f6y1JvRz1kary+uv/zrUaE5PYHi8cl51aNFRW3p -UQwAsnXS/Pyr7FbnghkeWTKv4aM1BeTJVju2gtxqBKyYvV/oerTWJNnZRKZPQavP -3COwyRYlri/39llWp5EqI9IEj7t06VFYSzOrusy6gdEaICFK5vnMfJyV3Y+IBCd8 -WkTtazmL/ulxEChDv9TW+vrOiEBFv4SRxc78TbiKdHkU9ttWAQKCAQEAxzOx3b9Y -Y5Lc/vgA5Yrri52rnwfYnvdCuBED9TsQLeEMDJow5ZZk1aqK2VPD+VesZ1Aei7L1 -7CqcTuyKSPH1N9DNUctJb9ygmFqc6BbvjoZy10V6BWKeJ83ztfD5yUiN709oFCul -P1nHBPM5jwr+zp2OlsG862bYkjdpKiRRD2N7x15Q1I41O6Gmbqd+hFkDpC2eJW47 -YHOPpK4TBGjn2bdXisEcntZc25KXJU59DSqAMGRTJNxdny/3WO4b3x3JeJYHPaNs -J7GfVxisdHX08CerQQ5bqX1100yr74zwDpYT/jhNx1xfPxEdwmSvfn/G1sUQGQvw -Vq8rS+j+WMJCoQKCAQEAwIg/5X5oobUg/THNYqjRBR/1AGCXeKRTtnIP/MSo6NCU -h1K+GgnJ+UWTY4QJJO7/qLz+XLxxEpBMcduVlU2Nl6TjpeL07/FvG8xAg7CVO9Rv -G5dct09YYj1sCjCIV1nkML5Qa6/AchxLfx91pe24w25yAIk0QstUxSZJviCAubIu -Ul7jhNWaYbu4MSmF96Jk3et/Lp11cUZMEb5ZBf03jlkR7+PAAqAKQCN9541QxMkp -IlVJB5o/BWbMXUZC0XNyNfOvVuA/QLv3u3/Nc09hp7MEHEXIb3PblA+lW3X48tSj -Jk3KLuSFnZv9uSySZ+iuc0+Kjde8p0gShLPn9HeEMQKCAQAxpQuF9SMFJdvX21z1 -2Apd8DyOVLlC3OKO1wbCfibJGFYVafQXs8SLj4YtJXgo0xXPZaNHM6GgavornT3V -ch+n+mzBHsW9kCGh9qs2GEk5nv5N8i23290IlIZRaK4H4QImiwaoSDxVrn0wGaHV -qWrZeWDI5526mRYOUqrt6sEc8bEufa3tW0efBelhmHKqbzi+GPRZ5b/8iLBa3Vs1 -9SMbGltB5GDKoSfhPQZYMNhviJEL/mTOQfE/NAgT7LubfmPwnotNbEYPGnBYl3ib -Sa5yj6BZhUeI1RChSXFsMRa+u95dtBCGR9og8JYXFVq7TwLyEYiyhUwvflZvA7En -07ohAoIBABp2n9G7fkY7zzz+C2z0J0a9Db/vhuJeM+Nv6iKkJVNa2A+Bn/+UON66 -YXfcPiWFdD6NO6kjfac/jkJYHEdZUYz2bRPwDhqs5Mi9WmC/dMO0f1EbjPLlRRC7 -wI3l/deD04mfnw4uKhWFLhtbB6C2/B5gn+rS8Qv9RrmSebBYZ1ke1J8dy8gGVCH6 -22ZmfrN67sJSDDksC2h2cR4/O51HIMvAEmcWtt2lgcMvHa8mDWP/AlhlwJP6746e -gpiPf7+qTph71i3qxMbxDywGdQbUcmfKg1YfgV1QX24KeIAJxx4ZfBNXveKUJolz -V3yMU9NUeCYBWNoGPTgBAAqdb9R6WQECggEAQBV0eWA0Yt4C6EcQVRR+y4frPP/y -oKfRhwg0CRFh9ZoWNknFZ7ghDppAd4z0hoF2x50pBI5AxCP4sUkmzPnQkRao196T -DAIB+cbvPaDdgpWTOQOWXph7/ywmi2OVBhJveyw9l0PRgTm802HZLCYa9YuduJ1O -2rp46XoyyN0rH+S4F/Q+mjSvIqvQvhToI7izPndivrctBpkQpr3/MiVs0ONtdgpo -sxxbZy43TAllftLJtQB5YgHaMskWWYbpPKBmJDiennY9nMCS2Kpz+G2kDrkbKE7w -CFw/T+I2sCNPjoDr5JRJOAm6mSMOd5utUWl1S7U5f8bdfOxDyvZXkU51ng== ------END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/tmpserver3.crt wget-1.20.1/tests/certs/tmpserver3.crt --- wget-1.19.5/tests/certs/tmpserver3.crt 2017-05-03 19:22:59.000000000 +0000 +++ wget-1.20.1/tests/certs/tmpserver3.crt 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHPTCCBSWgAwIBAgICESQwDQYJKoZIhvcNAQEFBQAwgZkxCzAJBgNVBAYTAlVT -MQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxIDAeBgNVBAoMF1dnZXQg -VGVzdGluZyBEZXBhcnRtZW50MRAwDgYDVQQLDAdUZXN0aW5nMRQwEgYDVQQDDAtX -Z2V0VGVzdGluZzEgMB4GCSqGSIb3DQEJARYRYnVncy13Z2V0QGdudS5vcmcwIhcR -MTcwNTA0MjEyMjU3KzAyMDAXDTE5MDUwMzE5MjI1OVowYjEaMBgGA1UEAwwRV2dl -dFRlc3RpbmdTZXJ2ZXIxCzAJBgNVBAgMAkNBMQswCQYDVQQGEwJVUzEbMBkGCSqG -SIb3DQEJARYMc2VydmVydGVzdGVyMQ0wCwYDVQQKDARTZXJ2MIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAuFsLoizEGC1W49LPotfOwz/MZIS5YKdwy82j -StW4r00qmKcS6oEu5qNNIyIQWMA8A1pdpkYHE0lc0JG5POq+HK4FhI/rCVHwnVQB -Uu7hETqMd1GI1U7u2vt4d+Pl4IqE0cjwqc03BrG3HnuGgr4Qm/hf/msubZR1I/HO -0LbvLKoMHd6PMywaZ466YXF8Bw4f09l3Mb4NBDvepyY32itet9XUwSQZb2xhAnbt -knFDOdVHrqB8tQFCcz592Vmhj211RRWulLfqOHEsUMl/LSj3O3gS4ryG3P1zuTq6 -rCoWEIs6EmJfGymGElyHK1W3r6rNu3OrmAMMTlUmHMAEWItn0Ka90Jgsf4llkKV/ -1QNBmZLYRhSZL/jN+nWLE1kMHPNgRcTT1FF4FClOVoVJ0E9HntNG/iSOVvURJas4 -yUDtxAIK5kDEu7erdb9TVfr8sTMrAnv5cVuMROZtzfS9SLHrzIj10wg6JQCRYllu -U74NFCki/FgtjYA/rhnTeLb7LKhL+RAgFvIa4Grwt9A3As8zSZ7D5L/eWJZf57BB -caeJ0Da5/mK4KDRs7kJafDcVw/N97i0ui2x9oczr2eMdhgNz7QvKoDanOyUe9atm -XgwjyxHAPtFQ1yermhQMvxQPj4N+mUBKKCuu6sw/sJqS+XSo0sZSHArvDudMtYun -+Euny1kCAwEAAaOCAb8wggG7MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFB6+ -afdPSR8T7qosYRrCq5LG+8thMB8GA1UdIwQYMBaAFBftk0OPp6YAddTotoINiDd+ -wG0IMAsGA1UdDwQEAwIBpjATBgNVHSUEDDAKBggrBgEFBQcDATBdBgNVHR8EVjBU -MCigJqAkhiJodHRwOi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMCigJqAk -hiJodHRwOi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMBwGA1UdEQQVMBOC -EVdnZXRUZXN0aW5nU2VydmVyMIHIBggrBgEFBQcBAQSBuzCBuDAuBggrBgEFBQcw -AoYiaHR0cDovL3Rlc3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAuBggrBgEFBQcw -AoYiaHR0cDovL3Rlc3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAqBggrBgEFBQcw -AYYeaHR0cDovL3Rlc3Qud2dldHRlc3QuY29tL29jc3AvMCoGCCsGAQUFBzABhh5o -dHRwOi8vdGVzdC53Z2V0dGVzdC5jb20vb2NzcC8wDQYJKoZIhvcNAQEFBQADggIB -AElsbN+NybTrwN6gWz7BcICxi27XkajRIuNcxA1S3Enc+9eVtfoWoS//x4LEEfLO -c6zNAUWJ8pMKzDGFc8z2KXiareTjuVfKFxk8F6RYv3nnpFmIHUS+jJlaVloTl3P/ -fqO7xNWKPQh9aHn8j2CNxlCoCBxgB0nI7TGX51XTlWjzyHDd6roGPm4PnpsyEsCv -p9AAXDE1CUUXZvG7UjuleBuOji1wphsR4q1zMtaDjVJ+VRX7RpWU+q/BnMDxQWeu -1TxJAROzyrAFgLkiiy25FUdhHmtHECRIZ4w5OrPjblyobAkgO32LwIYjG/2bOWbS -wVI1YWTS1gBvOf3EEopVKEWx27ehfaLqyLg7JuSSYtypd2GjCkeuEuvV8zsQpKBU -gh5AocK9FMzKEsN6A1MNm/fhGNEtjme8B8UtCn4qjVkcTVjooQgThmRoXTevSP0o -v+IB36m6hLMe2X5IJdJGDaLHCQIid31/ykpblSeMuPxoIq9fPQY2wLierzQpzCgI -rVeCVUbrx5ssvCZr3nPUNAPJLwwbGww9vec7Gor4tXmpS8HwsplAcNClomZ+y3MH -mxOzCPhkmd/3UgQSIJHXXNOH5Sz7aXPKAA0iORAcjbjp6NkJrCSybsbAy9zVRZQ6 -i2VFhFOmQ3kNhcPvLSxKqLYn7kSy0sJlUIhfPqWmEsxt ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/tmpserver3.csr wget-1.20.1/tests/certs/tmpserver3.csr --- wget-1.19.5/tests/certs/tmpserver3.csr 2017-05-03 19:22:59.000000000 +0000 +++ wget-1.20.1/tests/certs/tmpserver3.csr 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIExjCCAq4CAQAwgYAxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEcMBoGA1UE -BwwTU2VydmVyIE15c3RlcnkgU3BvdDENMAsGA1UECgwEU2VydjEaMBgGA1UEAwwR -V2dldFRlc3RpbmdTZXJ2ZXIxGzAZBgkqhkiG9w0BCQEWDHNlcnZlcnRlc3RlcjCC -AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALhbC6IsxBgtVuPSz6LXzsM/ -zGSEuWCncMvNo0rVuK9NKpinEuqBLuajTSMiEFjAPANaXaZGBxNJXNCRuTzqvhyu -BYSP6wlR8J1UAVLu4RE6jHdRiNVO7tr7eHfj5eCKhNHI8KnNNwaxtx57hoK+EJv4 -X/5rLm2UdSPxztC27yyqDB3ejzMsGmeOumFxfAcOH9PZdzG+DQQ73qcmN9orXrfV -1MEkGW9sYQJ27ZJxQznVR66gfLUBQnM+fdlZoY9tdUUVrpS36jhxLFDJfy0o9zt4 -EuK8htz9c7k6uqwqFhCLOhJiXxsphhJchytVt6+qzbtzq5gDDE5VJhzABFiLZ9Cm -vdCYLH+JZZClf9UDQZmS2EYUmS/4zfp1ixNZDBzzYEXE09RReBQpTlaFSdBPR57T -Rv4kjlb1ESWrOMlA7cQCCuZAxLu3q3W/U1X6/LEzKwJ7+XFbjETmbc30vUix68yI -9dMIOiUAkWJZblO+DRQpIvxYLY2AP64Z03i2+yyoS/kQIBbyGuBq8LfQNwLPM0me -w+S/3liWX+ewQXGnidA2uf5iuCg0bO5CWnw3FcPzfe4tLotsfaHM69njHYYDc+0L -yqA2pzslHvWrZl4MI8sRwD7RUNcnq5oUDL8UD4+DfplASigrrurMP7Cakvl0qNLG -UhwK7w7nTLWLp/hLp8tZAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEAE0OHNXQo -Ne6le+NrNbHFknVtSjrm5lmpR+pDRRiORnXJrQVI0zu98EiArD05CpYtIaJsX96u -QW4DXV5dz79wO2I+EPtZikxBj0hRm9dFePB6bqNsE/kI6tJY7W9H5pqLgk9/QcHl -8OtsU1mccradjcKTX/2pGeVKelNgAO13zqaztWo1vCjRwQXrY+tG64v3Uye6C4VF -MrFWCgmxdEaGJcces0GJ2aTRmIffmpayoaWTEYv5R6e4xTKbGQU3eMQAiL88wqr4 -5TRgLRPbsNRDVOhAGdA8i5UvJX8LOr3v1w9cPj5in/PwNFLW2+nWAI3x56qoIIzB -DjvFCWLnp8PjwilXKnh5vKFfMVEBIxjriqYOVPYX+havRpMJh/ezzFHSfPuJlS7k -bg6Rjx1BpYdMMZ1JHGTPBE8NMT64LbrViWQyl+sAgNbYCDUSzGQpDdbNumqyDprt -3LeVooi80ymeb0Wt7mNIH9ewluDf6pGySTdpCIugPKlXfN+c2IRqLMXUBUzFJhLl -60u4CTdeVLSaxJ6b8efg8GVT1iybk1/IzaU+6P4R1kGYAPLiIIZLJTladS80h7ED -Fyu2wqVa79Mj6mm9uKTftv0qJAvwuWKSH1d3IwJ+U6QPS3NKhM1qKsYM+j4EYUru -J+iXfCdvsLe3B50rlJ0bJe2ELv5OBg6FnTo= ------END CERTIFICATE REQUEST----- diff -Nru wget-1.19.5/tests/certs/tmpserver3.key wget-1.20.1/tests/certs/tmpserver3.key --- wget-1.19.5/tests/certs/tmpserver3.key 2017-05-03 19:22:59.000000000 +0000 +++ wget-1.20.1/tests/certs/tmpserver3.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKgIBAAKCAgEAuFsLoizEGC1W49LPotfOwz/MZIS5YKdwy82jStW4r00qmKcS -6oEu5qNNIyIQWMA8A1pdpkYHE0lc0JG5POq+HK4FhI/rCVHwnVQBUu7hETqMd1GI -1U7u2vt4d+Pl4IqE0cjwqc03BrG3HnuGgr4Qm/hf/msubZR1I/HO0LbvLKoMHd6P -MywaZ466YXF8Bw4f09l3Mb4NBDvepyY32itet9XUwSQZb2xhAnbtknFDOdVHrqB8 -tQFCcz592Vmhj211RRWulLfqOHEsUMl/LSj3O3gS4ryG3P1zuTq6rCoWEIs6EmJf -GymGElyHK1W3r6rNu3OrmAMMTlUmHMAEWItn0Ka90Jgsf4llkKV/1QNBmZLYRhSZ -L/jN+nWLE1kMHPNgRcTT1FF4FClOVoVJ0E9HntNG/iSOVvURJas4yUDtxAIK5kDE -u7erdb9TVfr8sTMrAnv5cVuMROZtzfS9SLHrzIj10wg6JQCRYlluU74NFCki/Fgt -jYA/rhnTeLb7LKhL+RAgFvIa4Grwt9A3As8zSZ7D5L/eWJZf57BBcaeJ0Da5/mK4 -KDRs7kJafDcVw/N97i0ui2x9oczr2eMdhgNz7QvKoDanOyUe9atmXgwjyxHAPtFQ -1yermhQMvxQPj4N+mUBKKCuu6sw/sJqS+XSo0sZSHArvDudMtYun+Euny1kCAwEA -AQKCAgAudaNk52szvJldKM9y9ngA9J8J5fjhxtDCS7yPK3UzmHrXpaM6vfuX3Ceg -ZwE/nJKDNc7MDHHUBnUBivfnxjDLAYAafDp7Ss8clwMOZ20I7nxfxYh6WT4Qqbce -X6ya/c2jIMSlxjXL1hWT9QVdBZEh/WITt+cnbnZm7JV2O+PimagcDu5/sumkl2+Z -BwR+sqyKsw861e5p1ryx2wvQS4W/RoArfHF8hw+bk2Ujtq9+b6V0+LT02LBqYqFM -mS4B+0/GbURl7kN0nfDRGzaVpvFHZ2c7BM/n+Wekkoxgvup4mN21rFzTd492KSNX -ZG66Mo1OZEQmNv5u7z5/mFSADAHJQfsyrwTVHiLP6I2hVYYCHyddR/yuzEhj9oN0 -k3Afz8C9DDoEsRSikuxIiQFvO62p5B4F7W+3XY5AYJdb6mc95hoZ0YqhQ5DzfAOe -YZ1/2rIItd7ISb85QcFIy5GXibKpqAzTvkMI0EMd/sD/LU8c9I4yn3G/5MH9UWae -noJYCUZi6smGHgj3Djzn4Az1yehOsdhcI88w/tmAoe6SyP46n8Ej2Ovs/oZpdDgp -zaZRfWihWBhXWIF4xlwNspMPW9yzLxLlILxLAwFZ8Akyg/byod17uljqNTam7zA9 -cxaYMDOC6CzsRAngAascNhIB4JUB63vpKOuvWYpv7TiHSIs/QQKCAQEA26My8ZpX -LyZB6bg8GZc85bLSk3FmGh00u7kAb4AEHtwPqNEC3m5VwEs+Wd2YlxxA3udcv252 -LeHbvPrz3EnZQYT3E6vlETakQCtPavlHVGp3SfGm4FzubcLBTXPces1p1A5qWCbZ -Rnqxvo+YsVjoZrH2RLvHTH4Uu94BtUFF7exb8h+iX1msC/Ai8MpAiomXaXQ1cKe7 -PFxlndBPd2m8pda3qk9Ylg6QnNBu9FNnlFqvcK+z8h1Gyvi9xVHWErX5m7Zvx2vF -U+gS0oT0wbfm15Q7dTjFfU/ETjNy/trdZtOBsVWIz0JnvCgRUeoI6SNX0jWVYFRD -D+DD/byK/bwpvQKCAQEA1uCC1QRMZAthp0uw64kioDonEWZtiUQ0qWZE5t7ROLNh -nmmZyXI4T1yRy2pam8JgOJNOofvIBSj/LQ1XYX3IMmsG/WllR3/OoTVhb6ajV3AT -iTYChXwMPdoxOHR3A6+pp7ip7SowNagbppqP7G2UTChfNQr82QU1niFcZBsj/Yti -ExU2JUasufUkBF068E9KQxcMLvvDgySvtpHL87iagqGfuJlT48GhABjOvHbbifJ4 -UtIOFltgKAFOmyYdsq24uhNBjWeL5nmVgtZV7bVChHJb5ii9EFYRFCsQ4f4lg3hD -9KOUvnm3pXcS5XycLyhw1wE8YIBBf9lp5xG8RsBLzQKCAQEAlmRSPsMLDbrpiSrg -5Dj9tt7Sd6k/W4RCFoRf+vkyWRsgEd1EVKBCUVB0Wj50/IuZE8hiZqYxf8tWljlT -/7QFcmqkcDDUwgujPlkpoTsdj3zzP4ubU6fujvO7Ptil0OSUoWJZiRDY1/ytdqmG -yXDyeVdEJN5bYlI2ykkC7GTMiFS+xLTKjvWs6+O7WRt0RChgqBGtgf0oJPWzkvMP -ZtndFcVHr/Ny2hURCn9iaiQuGZRa6xM0aQWI8vSNpO4bYmZ+ixPJyEhQLtsLAGGP -4pGVHGpgqCx+dgbHiTCLflzJG16aQJ4r9pcmxty8t1VEUrcjrEmKhhJMdTPXoAeZ -OJK+FQKCAQEAhTNzpv0dJb9wb7aaG8hM8Kpb4YtvR3JCeuhsuflSFSYN05d+v8PQ -aFHoBwMM3BVodGnMitl7qsc5OAJXMpY4bhiuopSdNe9idciTeBUCmIdfdOVINtso -84a4kFiSFnTkZJYysFRAwmJNkb+qjFN5ZKR6MHV5PEbgcAAaN+wjKV8oEtBJWl4v -YK83/oSUrrdYP7Kf2Ng04KzzR+elWJYNIgFy84oI2N0FIvw929KKUT8/m4efN/i4 -6NO2mLLOIh9SrfaV4kRYEy03o32ektaUP2ps0YZbfS79M1VnB9D2DEOXTKXC5Tiq -wSXJTv0qDImzOXUIqoGXGNv7rEPwRKOb2QKCAQEAyjSzocrJ2jge2NU/mEp6Kgao -kIT8S4Ic2+w3Ktsh73rj1tsncasOy0MZptfw4/LXiAYujDAB/TFuSEYHOOT8Coi4 -FABZfz6GJxTGMdbHSJzUEOSVtI/MS+UV/GeLqEKXIqjfWF1kihO5xCptkjgKMUJz -2uChFu/GqVLZ2XCK8Oda+AyhQCE4RKw7DH/zeCZYJptMOUEM/WQG/ZvNUt6UlC7+ -IeTz5JKad1vrsu/q781s91TzkWdGH5XybpQE0D5UmiHACTOeokNTv2XgByomrv5T -b7RAh91p+dSY/Qf94O5YbKpV5nzql/FG/adC3s3kUktkal4FAuXIe4yM1h5OSg== ------END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/tmpserver.crt wget-1.20.1/tests/certs/tmpserver.crt --- wget-1.19.5/tests/certs/tmpserver.crt 2017-05-03 19:04:15.000000000 +0000 +++ wget-1.20.1/tests/certs/tmpserver.crt 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHMTCCBRmgAwIBAgICESQwDQYJKoZIhvcNAQEFBQAwgZkxCzAJBgNVBAYTAlVT -MQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxIDAeBgNVBAoMF1dnZXQg -VGVzdGluZyBEZXBhcnRtZW50MRAwDgYDVQQLDAdUZXN0aW5nMRQwEgYDVQQDDAtX -Z2V0VGVzdGluZzEgMB4GCSqGSIb3DQEJARYRYnVncy13Z2V0QGdudS5vcmcwIhcR -MTcwNTA0MjEwNDEzKzAyMDAXDTE5MDUwMzE5MDQxNVowXDEUMBIGA1UEAwwLd2dl -dHRlc3RlcnIxCzAJBgNVBAgMAkNBMQswCQYDVQQGEwJVUzEbMBkGCSqGSIb3DQEJ -ARYMc2VydmVydGVzdGVyMQ0wCwYDVQQKDARTZXJ2MIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAwHBULWeqhlRmIWkW1C/Yz+fusfWaBXDuD7Zxov753iyZ -/jG0BAbfqnKxy4+kfq0DeQFv76jSi7ZKBHotURTOkJx9QxDYp/Xd1zoWjCRJunPF -tGk+/U9mpvbsTy85E1NVbaxO+XuxCW6GFNobUzsB2Ixnv7T6E2NnpjN37Yz/pIOP -WS3CAyZzovxM/wIxzKS9oeYrtHqEiqrKyoqRbHLzKUXBCJ821h96eGGvYpYQmj/V -cVx+22jsMkOoRD0jQCyOuC4+X1Hpp+qOSeeQncelxrRj0zxB6/h0FT1+CPTzSMPB -X0TwO8HFow1vdrMFdvNSsnTdT5VUFHJfyA7aaVieoMr7GD5MV3ajsoG2YU05enWc -5y1KoIceMzSbnJiPydkBYmZIjre3ABFVofXOOj8Oj++CclMHlbzeeIth84cUXiwx -ouin3xp9SDOW5a6h/s+jgCGfoPrAWNZRU+JhfylU6wZ14sXplsVt5AZ/aVLzWALh -tfocu0TLC0X8mc1RhqmvVc0NDAUH+sveu6uBCY0J0N9aJFM0xIpiwhEusxatlhO7 -74Xz9eejRdNDcotZ899lxhpv0eJVWLspIjVppkwma5i5Rsqm9NZlHWosFa8bYWsi -j2qJoEws4TDmUA9jO6pDHJkCFZZOl39IGbOzARqAoonQaum4AuWPTVkY4H1pxKMC -AwEAAaOCAbkwggG1MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJgWTxPosl8Z -t+1SbcZ9zPuQK7O6MB8GA1UdIwQYMBaAFBftk0OPp6YAddTotoINiDd+wG0IMAsG -A1UdDwQEAwIBpjATBgNVHSUEDDAKBggrBgEFBQcDATBdBgNVHR8EVjBUMCigJqAk -hiJodHRwOi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMCigJqAkhiJodHRw -Oi8vdGVzdC53Z2V0dGVzdC5vcmcvQm9ndXMuY3JsMBYGA1UdEQQPMA2CC3dnZXR0 -ZXN0ZXJyMIHIBggrBgEFBQcBAQSBuzCBuDAuBggrBgEFBQcwAoYiaHR0cDovL3Rl -c3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAuBggrBgEFBQcwAoYiaHR0cDovL3Rl -c3Qud2dldHRlc3QuY29tL0JvZ3VzLmNydDAqBggrBgEFBQcwAYYeaHR0cDovL3Rl -c3Qud2dldHRlc3QuY29tL29jc3AvMCoGCCsGAQUFBzABhh5odHRwOi8vdGVzdC53 -Z2V0dGVzdC5jb20vb2NzcC8wDQYJKoZIhvcNAQEFBQADggIBABnHAw3Ll35NbeT+ -vSrV2t84B1+NHQraHLM12ZebUIUcTP52xL/hlT/S2zFUlgl4UJHLyjcm7b6fxsNd -1RSkNvzKFvBE9K6Aq+N+PC8FzUKMIj1b05GcUEe52jcSkb1PZjGxjNwJBdpm+R4W -aC4+HfHqRfd54I6XLaEZD6ed6sfAb3Us6QFqUSQZW9XdbB5Rga8QhHAokjeS2+d2 -yTtNFppWdPfIgO7nOfGuu0HNCaNwwRZ9fVw09Xl3BynuXf/6BdaEhbkWkD2lPJSZ -8p3aOKab9JAj+LMxgu069t1NOKl8/16ZxESHUPn6eAHWs0nPUIasc/3bCU3F4DcO -TlMAHrW38tyJWHfck4ToVnBfu5TyaiS+V+gs4TV425gmmrMfnLAf2f6u8G4Qq8Im -KTYbv6NZIDDBXalfC0YQoumi3cpiHjwghiFOmQvU7LH/nTbY7+9xgFELD7ilQpFb -aOtZdm2LW0hdEQ7X1ajXw2MbHXLD8pS+I7utXkFz128HnCrl0Vo2g6/pMz4q2vIh -UIjUDRDJzFAiZ0lAp64f5BLIdPpjxV/DO7S8O77AOK+OmbGrmqYgKdC8L6SqJiYc -cAaLidXX70sqnYIj5lNTRyia4G2oDIwc+4yJawdhIzysZGCeEsDDNth+d4NL1aFA -kcz+jQfV3S/O4LxWsmgJp3w5R29O ------END CERTIFICATE----- diff -Nru wget-1.19.5/tests/certs/tmpserver.csr wget-1.20.1/tests/certs/tmpserver.csr --- wget-1.19.5/tests/certs/tmpserver.csr 2017-05-03 19:22:58.000000000 +0000 +++ wget-1.20.1/tests/certs/tmpserver.csr 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIExjCCAq4CAQAwgYAxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEcMBoGA1UE -BwwTU2VydmVyIE15c3RlcnkgU3BvdDENMAsGA1UECgwEU2VydjEaMBgGA1UEAwwR -V2dldFRlc3RpbmdTZXJ2ZXIxGzAZBgkqhkiG9w0BCQEWDHNlcnZlcnRlc3RlcjCC -AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJXQypUZsHt10K7HU66Sat/f -tQVdZdS32aSTjfFUF+MfZbVTK7DBXDi/EduvI98IEQmiwGEDBpYWtSCvwS7fKBOM -c/8A/JTfy0cFYtGe2UmHqwMNaXRaumcmBqdOKoNcA6b/XhQ6ROI1xE5kvlXG45rJ -04BgmvouGzVrpH4yaODpe8f5RsHMZy1X7KlGxiMEm0h0hnafuLhAr05ARve/pqYb -iBtBdTdQzTIdytSBGVDAmSw5xTKdafm4BRpcjBYVqTkGGA9ErHl73kzIsGfgzlq6 -Tn7n6rjKNj0mWVzMOw2hiA2KW3g6A0EFOCyMOcx6oRAnIT3PFRZ7JUCz4dNqJPRL -/whdDdjPEGTixjwm0JTr+pm/hhORihO4dbtDbNaEBfgyiSrhGafd6FmTErDbGvQV -CiMkdn0QspqH6OvBxIH6SNnmCV1E7m8fapg7ZYymY1oSxaJb605Mt4P/WRwxoyLo -bZeZQ54yJ8sCDuq7l/0VizQvjZ9MeTTnZg9L7RS3ZK8Gj08WqT8oOueyhxMpZGPt -pwiXpWRF2bRGUV4Bzttsan9WHBeIzgWu/7nM10v9zciXb/A2G87CDAROWoaN+gmJ -2bev9J4f17Auth8fDKS2zVAB6au+WX+d2jNEmBsN2z9vIToT2DoG/2x53zkrOOTQ -Jz/hdoaq6cFj2oiUYMTRAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEAfc3JC1c2 -6o70nlloxycr5VwItZtcjL0bisth3ojY65tDbDbC6IELamKL6JiKrAKva2xPs/li -CNhFb4afqylnE2FZJc5GG1uPt8GBHelqufuQSMSt/no+ngUeWyEyqDFKUqjvShYg -VYLr13sZ7TOvMEpvZn6d1XdK20HNqA7zcKxiTJmCMIHTBtR5izZymeMjcyMj4v0p -jVxEuZENHIa0SyaU1GF3hXpce8k49DtA+mQBUsGFUSCY4rlFXDIVBCnEaYCY17MO -ez00uvUOv2GTU1OliaS3lFRNLIHXuZxqQR8u3TckXdehJTPkDbWqR7P5uY9eFVOT -y4mNT+DuKrOPf4xdQUMmWQbPdNr8+c0L6XU4ugt1aioi8pwIaWCEBYjvMv4bG1V3 -pwuYGoZ4RaqrG0okoOErXAazv1phIS53r3dI+sEcooog2HUON+Wv4Zr4BrxZdY1S -OeJditPMYQrAGYhaLodvFF2e2BTB3Oz1VDNdIi9J9CuYKOsVGV4BT01HfbvUYKvL -zk98Rtl3iub/lPtUS6sSe271VllViCpBNVtbvqUBvxdOB5uyEi9shVqclTHpDEXg -pbnmQT0hgHqWY14ZTVMDdDAFS08G6og7WMMR99MiwwAiiqhjWN5/ZZZ2L2b1Wu4v -/gjMA9it9ASje+lNueLrOMHo+KiurMLodh8= ------END CERTIFICATE REQUEST----- diff -Nru wget-1.19.5/tests/certs/tmpserver.key wget-1.20.1/tests/certs/tmpserver.key --- wget-1.19.5/tests/certs/tmpserver.key 2017-05-03 19:04:15.000000000 +0000 +++ wget-1.20.1/tests/certs/tmpserver.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJJwIBAAKCAgEAwHBULWeqhlRmIWkW1C/Yz+fusfWaBXDuD7Zxov753iyZ/jG0 -BAbfqnKxy4+kfq0DeQFv76jSi7ZKBHotURTOkJx9QxDYp/Xd1zoWjCRJunPFtGk+ -/U9mpvbsTy85E1NVbaxO+XuxCW6GFNobUzsB2Ixnv7T6E2NnpjN37Yz/pIOPWS3C -AyZzovxM/wIxzKS9oeYrtHqEiqrKyoqRbHLzKUXBCJ821h96eGGvYpYQmj/VcVx+ -22jsMkOoRD0jQCyOuC4+X1Hpp+qOSeeQncelxrRj0zxB6/h0FT1+CPTzSMPBX0Tw -O8HFow1vdrMFdvNSsnTdT5VUFHJfyA7aaVieoMr7GD5MV3ajsoG2YU05enWc5y1K -oIceMzSbnJiPydkBYmZIjre3ABFVofXOOj8Oj++CclMHlbzeeIth84cUXiwxouin -3xp9SDOW5a6h/s+jgCGfoPrAWNZRU+JhfylU6wZ14sXplsVt5AZ/aVLzWALhtfoc -u0TLC0X8mc1RhqmvVc0NDAUH+sveu6uBCY0J0N9aJFM0xIpiwhEusxatlhO774Xz -9eejRdNDcotZ899lxhpv0eJVWLspIjVppkwma5i5Rsqm9NZlHWosFa8bYWsij2qJ -oEws4TDmUA9jO6pDHJkCFZZOl39IGbOzARqAoonQaum4AuWPTVkY4H1pxKMCAwEA -AQKCAgBezLdbKs+Bn0A0w01guDVprksTVfdLKOfNy8XNUyiKf5RY+elBdpVmpVva -+OdDFD46tS+Mc7FM7D8oV3vNjp938+9tQ3ZHv8JKTa5f2VyMwo2po5NJPH1IUSn2 -lD/culfCUHkTRBDhoZXh3dRKOy5cnEZb1W7AcF7WLFKvLp+dTsYmW3lRDfc3Wm0f -ztfzhVB52ia7oQN8QEjoYDzlnPcW5OsEMVLVRuqRNSYuPdjt8/ZVAwjnU5fP5y6U -dz3PVmP0bauCT5r4gn8X/0Bpyblr2t+2Zt/evCWLdSCKjwjuVqkDIrXp6jpPacX4 -Rpaxk4qwqQuBMgIalIGEz3RfIy35EyuldIEwJTHP7+LgOgA/TetHfaJOHW4QAW5z -FrZHXlp2GM6DXAraX+saGsrkj0ZKVI8XTzaJNe1XpGHlVCJ1avTiqF11Th/jXuv8 -u2v+HyYyhgLc5ZLk3lR/e5MgANkYLKMu1TBcHnFld2j4YOotoewtqwotB35NlOYI -MljNKgE+MlcwniHjOyatmpRnbDaoxx9mznjwNQLszUPzr3B03EvzxFv90pJHCVZS -6+36fi6FkVTO9jdFymnyC4Di6m5eCaYkSCvPqoixZP7R45wXuxyoQ/XnuuontRRJ -rVWOjcQaiP7m1FjVXdAjxvrJ9Kk+BpKRHdq4IXlgMMAK+7jPUQKCAQEA6bmHx7A3 -j2P+Hzyk9bNZtVd1E54VcP+CPJQLpWsA+Y/qM9lHGWZUodiOS/7UbCkwbeVNxSu/ -G/0EKTrDKWDA31pWL7qexLESS/NUcRjw+bxWbt/BBbPihGn7MX0qoBi/8hIgB5g1 -3fAfyRzXjYeihJmZdvhoxRCP8JPyBDpjpWknC9EzQQ6BbjtR3p4JTSZhISH/cGu9 -X9Zn+H8ZYNtkMtHqIxz3N57Saux0ZBBo+T4U2+4qcgAZHhfMYhFE1CTeXtQsX5hJ -U7WXx3G8aWe0TLfkW/BodMU+ELJMxbZQIeZiUaKHgW2aP0GI3VlD7n4ZJxMnPpd8 -dKJmtfwzs7qlawKCAQEA0sd+ltyJqY8BW4fnlO7nge8NR2eDGob3k3k2wHbQPfyQ -KE/cu+HQSwaITCHqfzHUzoqUxravlqO0O6LFRYbRJ655cSxCwcVAqJj38D3xUgTe -cmAxFlBn0Lkox/Yqr13cKyj39Fzt39PRIGZSWliOH4Tov1/rPsSxuDpQu9ksLTnl -/4YfHs85NXgEikWeX1HggCOHPCbBe7RTTq/czDBQbrNrOHuloNTy8l8gU7tz4v/B -CmhPN2HhQ6yKkXfvtBWwRhzY5zb79ZBJ7AaA3kFdFgIp9jrspgeNT2osJJiI1Ueo -KtT7iWdc34+MjfNpLCSktjkZk3ODn+kvSP4mIgrzqQKCAQBY/lXfCQ/+vzoxtqux -CltsGyLvF1BeuEtkuZI9qCK048FvgJn75+Ttw0FbWmqTzJMuJROZsfCQvaRp9n/9 -L2QBJ6qNfeeaSToIRVyvu6l1zeqzSOt8OmRTuu70hw5F62aay5/6hFBuc1IHB75j -m3OcPcgbbral4oqMNij+xyTOBN3jOALmEJnj2R5xP4eXIrf1H7bdnYh8B22LRwno -wWDDoP4f5JWVThocsHAY8c6mqKbUnzj2M2dc9/7QkHa+uFMblHpY4+l3wDtMq9fr -4praY2LGRyHe5IOfY+Srm6GjZs+k+dfSxmLnFxMABU9Cbi0xna9hu9idqICnZqJh -Gv6FAoIBAA+QKVmsSQHbDEec3k2R4kgmxX07OGPyCT+7WH6Xh0K8bkx7sRmyT7Xq -co/khTMFE+h4NQoDHS3rQniQyS4cCT970322vesezGpmeRAlErdyopYhYh56q1+u -/ELfe0Fdlc8eBEjnv6yiMDPLOlNvbHcJUkInK/CDh3fJ3oIwQ+HG/6OBXLTiqh+3 -j+ZBw7LYEdKETQz0855Vrz0FITF2c8not4cBIjag4ptgyLtGAQWGytMg5pB5Sq+7 -grPA/lL2swBKSv2vgqUcFUk3JbbDbsMcP8rtiOGtdxKhDUdad+f/lXwsI7J+jk33 -hHJKwb4/qmXGC4xmoBZjmlkyYtBqrJkCggEAZWvgl4+FOZIX0CTGRCYi1uIwBSpV -J0RTn0S91pW5Iw6LRlcEE9S2nLsraTvPBvvEg+iAk+p+9VpwnHgPraMPnhdm8kmQ -0Gyky+QeiBrXr+AKmS7kdzARme76frQ7aq6QdW9ahpsTKC5bVMTJrjp95+2JmuR9 -pccVfLVpbYx6VKeylcC3pDlMpdeICxqcGGmloOTCP41iXAhdPLjxzdlsMYZQT8YT -vyq4iW0DtOv7MbZaHy6lrEz/AYUxIP3oyivWEyZXXh9C2AmZpvzf3B9udLahvT+y -s34mrrFr5crjRNSf0XGhXZ/7qLspU1nn8maOx9XVWXgk9U9wmqgdxmAYBg== ------END RSA PRIVATE KEY----- diff -Nru wget-1.19.5/tests/certs/user.csr wget-1.20.1/tests/certs/user.csr --- wget-1.19.5/tests/certs/user.csr 2017-05-03 19:22:57.000000000 +0000 +++ wget-1.20.1/tests/certs/user.csr 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEwDCCAqgCAQAwezELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRowGAYDVQQH -DBFVc2VyIE15c3RlcnkgU3BvdDEMMAoGA1UECgwDSW50MRowGAYDVQQDDBFXZ2V0 -VGVzdGluZ1NlcnZlcjEZMBcGCSqGSIb3DQEJARYKdXNlcnRlc3RlcjCCAiIwDQYJ -KoZIhvcNAQEBBQADggIPADCCAgoCggIBAOav5ryxlHl9FYfqKDDWio3kIF7Z//0w -5qxD7p5dVFH1H1kV2gOV+3p4R/OJbqm5bfKJZU/rHTix9Q9mVrdURnWDP2KsL9zw -SEesVbYFGiLekcPsJwR0IkyTCb/K1dBb7brHqkj3exnKUwIhFW+pP1CMI3Bp4exL -yDWwfMpHhb8csgjW+JkNjraDpk7Lk8ioMi8RHknh6EP/Ms5DsarnYTyIcjAisCkV -V5HaFRXoM6TtKLxrEcpCWt4UyEb2OHG3U2Zc7YWXF0NlKmzQE9kNaE4BTpc+PqRk -pPogNZX7tLZ+iXpW1LRkECcfIh3MAQKDYLl3Ed0SutomDjstzUyQL/4w6f/UZ7/Z -QsrLZNmiaighs2D5aG61S4oa3+MxD3vEwcOvvkjbK3iDHNOTmYBj8kC3bKLsa0t6 -rAv7M6DMbHP1pOROdZ5hdSpOCYfO/XGYC4u38YGGcdvIvN8eP7vJRfEtpCrIQWFp -jn2dQTRimQdqLr3YWautimKSs+lEnsk5wLVQgXlnA6WCa3VU1tBsGLe8RE36SZVp -51zNCUqrwQXnqdQvd52bFlVavsBm3UN4KOPZu2W28LaSOWBSLIX2Xa3lyIt5YLFz -a0v1T/lLSgoRg5bPgg/FMMKdDK68bFDv0KPyytteHxfaf0ljTvTrDuS/17haNyF6 -id0UdXJbs4/TAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEAqaG9d32mWsiB+Xnc -EF4BvxJyHAqtDrQ/qJi62fbA6lAVb5+3Zoc41rcT+/clTscPbqMzti6QxQP6AcOt -6pMtH5dPV71IGBuk1XSg9i2AMdGEm3YCx3ON9lkdpKqyJFf+j2WQiC+hGWSOp0hI -U/pBMkpLtbDAkdvfAUgJpcch/Cz3ctkEoKLDZ/oA1UB0tFX2L+bPHo8huacQhBg7 -aqhJViO22axwo/TTh9Kllj1UcpBKhiPojI6j5n4sVP4zT8sSCVXseswQnoEAzg8y -8ZCBX2LZPPlMp2W9pOsKZQM+5XJtCf+0tOPZLK32PG2vl90ju3XSEbAl46p/xLVi -WUIdS1qpqFNWvp6O0xkofCYJiE+byPHdzc1zEsfiyyKfGip6gjKK3WonRz7e2Dmn -RJK6l+omxrSnaEuUlfwMaiFYoGMsoyveUFaPYdLbq1R6NQCwQB1SUnoCNzNQC4NK -YuJtaz+5xAZVu8r1LeXPe/271l84AQrQqUSbww3vU4Brvec5n5Qkb/zoBSh/pnQw -cNmkjovssO2EPrnnsEkFKdcJcPF6sUSRgIDAgUv0SMn0JKHirho8iMiRJD+of+/X -448/57W0cbXbhiu1PkBP5+86DWudGCnQJEdQsjSRlpiGP/6VyAGsfaeqK197r3gR -qdlOpPJh+J9MeYBFFhGBXcFjFQY= ------END CERTIFICATE REQUEST----- diff -Nru wget-1.19.5/tests/Makefile.in wget-1.20.1/tests/Makefile.in --- wget-1.19.5/tests/Makefile.in 2018-05-06 16:47:51.000000000 +0000 +++ wget-1.20.1/tests/Makefile.in 2018-12-26 20:09:02.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -105,6 +105,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -123,12 +124,13 @@ subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/arpa_inet_h.m4 \ + $(top_srcdir)/m4/__inline.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/af_alg.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 $(top_srcdir)/m4/base32.m4 \ $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ - $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \ + $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/clock_time.m4 \ + $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ @@ -137,9 +139,11 @@ $(top_srcdir)/m4/extern-inline.m4 \ $(top_srcdir)/m4/fatal-signal.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ - $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \ - $(top_srcdir)/m4/flock.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fseek.m4 \ + $(top_srcdir)/m4/fflush.m4 $(top_srcdir)/m4/flexmember.m4 \ + $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/flock.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fnmatch_h.m4 \ + $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fpurge.m4 \ + $(top_srcdir)/m4/freading.m4 $(top_srcdir)/m4/fseek.m4 \ $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/fstat.m4 \ $(top_srcdir)/m4/ftell.m4 $(top_srcdir)/m4/ftello.m4 \ $(top_srcdir)/m4/futimens.m4 $(top_srcdir)/m4/getaddrinfo.m4 \ @@ -152,7 +156,6 @@ $(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/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 \ @@ -197,29 +200,29 @@ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/sched_h.m4 \ $(top_srcdir)/m4/secure_getenv.m4 $(top_srcdir)/m4/select.m4 \ - $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sha1.m4 \ - $(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \ - $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sh-filename.m4 \ + $(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sha256.m4 \ + $(top_srcdir)/m4/sha512.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sigpipe.m4 \ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/snprintf.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/spawn-pipe.m4 $(top_srcdir)/m4/spawn_h.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \ - $(top_srcdir)/m4/strptime.m4 $(top_srcdir)/m4/strtok_r.m4 \ - $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_file_h.m4 \ - $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/std-gnu11.m4 \ + $(top_srcdir)/m4/stdalign.m4 $(top_srcdir)/m4/stdbool.m4 \ + $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strptime.m4 \ + $(top_srcdir)/m4/strtok_r.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_file_h.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ @@ -275,7 +278,8 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/unit-tests.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -521,7 +525,6 @@ $(top_srcdir)/build-aux/depcomp \ $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ @@ -540,6 +543,7 @@ BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +BYTESWAP_H = @BYTESWAP_H@ CARES_CFLAGS = @CARES_CFLAGS@ CARES_LIBS = @CARES_LIBS@ CC = @CC@ @@ -608,6 +612,7 @@ GNULIB_FGETC = @GNULIB_FGETC@ GNULIB_FGETS = @GNULIB_FGETS@ GNULIB_FLOCK = @GNULIB_FLOCK@ +GNULIB_FNMATCH = @GNULIB_FNMATCH@ GNULIB_FOPEN = @GNULIB_FOPEN@ GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ @@ -641,6 +646,7 @@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ +GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ @@ -665,6 +671,7 @@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALENAME = @GNULIB_LOCALENAME@ GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ @@ -735,6 +742,7 @@ GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT@ GNULIB_POSIX_SPAWNATTR_SETSIGMASK = @GNULIB_POSIX_SPAWNATTR_SETSIGMASK@ GNULIB_POSIX_SPAWNP = @GNULIB_POSIX_SPAWNP@ +GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -937,6 +945,7 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ @@ -959,6 +968,9 @@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FLOCK = @HAVE_FLOCK@ +HAVE_FNMATCH = @HAVE_FNMATCH@ +HAVE_FNMATCH_H = @HAVE_FNMATCH_H@ +HAVE_FREELOCALE = @HAVE_FREELOCALE@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ @@ -971,13 +983,16 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ +HAVE_GETPASS = @HAVE_GETPASS@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@ HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ @@ -1015,6 +1030,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NETDB_H = @HAVE_NETDB_H@ HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ +HAVE_NEWLOCALE = @HAVE_NEWLOCALE@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ @@ -1026,6 +1042,7 @@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@ HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@ +HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PSELECT = @HAVE_PSELECT@ @@ -1096,7 +1113,6 @@ 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@ @@ -1154,8 +1170,6 @@ 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@ @@ -1190,7 +1204,6 @@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1235,6 +1248,7 @@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ +NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1269,6 +1283,7 @@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ +NEXT_FNMATCH_H = @NEXT_FNMATCH_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1311,6 +1326,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCRE2_CFLAGS = @PCRE2_CFLAGS@ +PCRE2_LIBS = @PCRE2_LIBS@ PCRE_CFLAGS = @PCRE_CFLAGS@ PCRE_LIBS = @PCRE_LIBS@ PERL = @PERL@ @@ -1347,9 +1364,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ +REPLACE_FNMATCH = @REPLACE_FNMATCH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ REPLACE_FPURGE = @REPLACE_FPURGE@ +REPLACE_FREELOCALE = @REPLACE_FREELOCALE@ REPLACE_FREOPEN = @REPLACE_FREOPEN@ REPLACE_FSEEK = @REPLACE_FSEEK@ REPLACE_FSEEKO = @REPLACE_FSEEKO@ @@ -1368,6 +1387,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ +REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ @@ -1404,6 +1424,7 @@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@ REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ @@ -1412,6 +1433,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@ +REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -1568,7 +1590,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -1728,8 +1749,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1754,7 +1775,13 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit-tests.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit-tests.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1942,7 +1969,7 @@ fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1985,7 +2012,10 @@ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_PX_LOG_DRIVER_FLAGS) $(PX_LOG_DRIVER_FLAGS) -- $(PX_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -2060,7 +2090,7 @@ clean-am: clean-checkPROGRAMS clean-generic mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/unit-tests.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -2106,7 +2136,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/unit-tests.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2126,11 +2156,11 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic cscopelist-am ctags ctags-am \ - distclean distclean-compile distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ + check-am clean clean-checkPROGRAMS clean-generic cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ diff -Nru wget-1.19.5/tests/SSLTest.pm wget-1.20.1/tests/SSLTest.pm --- wget-1.19.5/tests/SSLTest.pm 2017-06-05 20:27:40.000000000 +0000 +++ wget-1.20.1/tests/SSLTest.pm 2018-12-26 19:58:39.000000000 +0000 @@ -18,8 +18,8 @@ } my %ssl_defaults = ( - _certfile => "$srcdir/certs/server.crt", - _keyfile => "$srcdir/certs/server.key", + _certfile => "$srcdir/certs/server-cert.pem", + _keyfile => "$srcdir/certs/server-key.pem", _cafile => "$srcdir/certs/test-ca-cert.pem", _ciphers => 'ALL', _lhostname => 'wgettestingserver', diff -Nru wget-1.19.5/tests/Test-204.px wget-1.20.1/tests/Test-204.px --- wget-1.19.5/tests/Test-204.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-204.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-auth-basic.px wget-1.20.1/tests/Test-auth-basic.px --- wget-1.19.5/tests/Test-auth-basic.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-auth-basic.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-auth-no-challenge.px wget-1.20.1/tests/Test-auth-no-challenge.px --- wget-1.19.5/tests/Test-auth-no-challenge.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-auth-no-challenge.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-auth-no-challenge-url.px wget-1.20.1/tests/Test-auth-no-challenge-url.px --- wget-1.19.5/tests/Test-auth-no-challenge-url.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-auth-no-challenge-url.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-auth-retcode.px wget-1.20.1/tests/Test-auth-retcode.px --- wget-1.19.5/tests/Test-auth-retcode.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-auth-retcode.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-auth-with-content-disposition.px wget-1.20.1/tests/Test-auth-with-content-disposition.px --- wget-1.19.5/tests/Test-auth-with-content-disposition.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-auth-with-content-disposition.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-c-full.px wget-1.20.1/tests/Test-c-full.px --- wget-1.19.5/tests/Test-c-full.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-c-full.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-cookies-401.px wget-1.20.1/tests/Test-cookies-401.px --- wget-1.19.5/tests/Test-cookies-401.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-cookies-401.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-cookies.px wget-1.20.1/tests/Test-cookies.px --- wget-1.19.5/tests/Test-cookies.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-cookies.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-c-partial.px wget-1.20.1/tests/Test-c-partial.px --- wget-1.19.5/tests/Test-c-partial.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-c-partial.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-c.px wget-1.20.1/tests/Test-c.px --- wget-1.19.5/tests/Test-c.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-c.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-c-shorter.px wget-1.20.1/tests/Test-c-shorter.px --- wget-1.19.5/tests/Test-c-shorter.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-c-shorter.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-E-k-K.px wget-1.20.1/tests/Test-E-k-K.px --- wget-1.19.5/tests/Test-E-k-K.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-E-k-K.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-E-k.px wget-1.20.1/tests/Test-E-k.px --- wget-1.19.5/tests/Test-E-k.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-E-k.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-ftp-bad-list.px wget-1.20.1/tests/Test-ftp-bad-list.px --- wget-1.19.5/tests/Test-ftp-bad-list.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-bad-list.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-ftp-iri-disabled.px wget-1.20.1/tests/Test-ftp-iri-disabled.px --- wget-1.19.5/tests/Test-ftp-iri-disabled.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-iri-disabled.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-ftp-iri-fallback.px wget-1.20.1/tests/Test-ftp-iri-fallback.px --- wget-1.19.5/tests/Test-ftp-iri-fallback.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-iri-fallback.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-ftp-iri.px wget-1.20.1/tests/Test-ftp-iri.px --- wget-1.19.5/tests/Test-ftp-iri.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-iri.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-ftp-iri-recursive.px wget-1.20.1/tests/Test-ftp-iri-recursive.px --- wget-1.19.5/tests/Test-ftp-iri-recursive.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-iri-recursive.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-ftp-list-Multinet.px wget-1.20.1/tests/Test-ftp-list-Multinet.px --- wget-1.19.5/tests/Test-ftp-list-Multinet.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-list-Multinet.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . # 2013-10-17 Andrea Urbani (matfanjol) diff -Nru wget-1.19.5/tests/Test-ftp-list-UNIX-hidden.px wget-1.20.1/tests/Test-ftp-list-UNIX-hidden.px --- wget-1.19.5/tests/Test-ftp-list-UNIX-hidden.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-list-UNIX-hidden.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . # 2013-10-17 Andrea Urbani (matfanjol) # In this ftp test: diff -Nru wget-1.19.5/tests/Test-ftp-list-Unknown-a.px wget-1.20.1/tests/Test-ftp-list-Unknown-a.px --- wget-1.19.5/tests/Test-ftp-list-Unknown-a.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-list-Unknown-a.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . # 2013-10-17 Andrea Urbani (matfanjol) # In this ftp test: diff -Nru wget-1.19.5/tests/Test-ftp-list-Unknown-hidden.px wget-1.20.1/tests/Test-ftp-list-Unknown-hidden.px --- wget-1.19.5/tests/Test-ftp-list-Unknown-hidden.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-list-Unknown-hidden.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . # 2013-10-17 Andrea Urbani (matfanjol) # In this ftp test: diff -Nru wget-1.19.5/tests/Test-ftp-list-Unknown-list-a-fails.px wget-1.20.1/tests/Test-ftp-list-Unknown-list-a-fails.px --- wget-1.19.5/tests/Test-ftp-list-Unknown-list-a-fails.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-list-Unknown-list-a-fails.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . # 2013-10-17 Andrea Urbani (matfanjol) diff -Nru wget-1.19.5/tests/Test-ftp-list-Unknown.px wget-1.20.1/tests/Test-ftp-list-Unknown.px --- wget-1.19.5/tests/Test-ftp-list-Unknown.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-list-Unknown.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . # 2013-10-17 Andrea Urbani (matfanjol) diff -Nru wget-1.19.5/tests/Test-ftp-pasv-fail.px wget-1.20.1/tests/Test-ftp-pasv-fail.px --- wget-1.19.5/tests/Test-ftp-pasv-fail.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-pasv-fail.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-ftp-pasv-not-supported.px wget-1.20.1/tests/Test-ftp-pasv-not-supported.px --- wget-1.19.5/tests/Test-ftp-pasv-not-supported.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-pasv-not-supported.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-ftp.px wget-1.20.1/tests/Test-ftp.px --- wget-1.19.5/tests/Test-ftp.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-ftp-recursive.px wget-1.20.1/tests/Test-ftp-recursive.px --- wget-1.19.5/tests/Test-ftp-recursive.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp-recursive.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-ftp--start-pos.px wget-1.20.1/tests/Test-ftp--start-pos.px --- wget-1.19.5/tests/Test-ftp--start-pos.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-ftp--start-pos.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-HTTP-Content-Disposition-1.px wget-1.20.1/tests/Test-HTTP-Content-Disposition-1.px --- wget-1.19.5/tests/Test-HTTP-Content-Disposition-1.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-HTTP-Content-Disposition-1.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-HTTP-Content-Disposition-2.px wget-1.20.1/tests/Test-HTTP-Content-Disposition-2.px --- wget-1.19.5/tests/Test-HTTP-Content-Disposition-2.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-HTTP-Content-Disposition-2.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-HTTP-Content-Disposition.px wget-1.20.1/tests/Test-HTTP-Content-Disposition.px --- wget-1.19.5/tests/Test-HTTP-Content-Disposition.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-HTTP-Content-Disposition.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-https-badcerts.px wget-1.20.1/tests/Test-https-badcerts.px --- wget-1.19.5/tests/Test-https-badcerts.px 2018-05-06 15:29:12.000000000 +0000 +++ wget-1.20.1/tests/Test-https-badcerts.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; @@ -21,13 +21,6 @@ }, ); -# Skip the test if openssl is not available -my $ossl = `openssl version`; -unless ($ossl =~ m/OpenSSL 1/) -{ - exit 77; -} - my $srcdir; if (@ARGV) { $srcdir = shift @ARGV; @@ -52,22 +45,11 @@ exit 77; } -my $caconf = "$srcdir/certs/rootca.conf"; my $cacrt = "$srcdir/certs/test-ca-cert.pem"; -my $cakey = "$srcdir/certs/test-ca-key.pem"; # Use expired server certificate -my $servercrt = "$srcdir/certs/expired.crt"; -my $serverkey = "$srcdir/certs/expired.key"; - -my $servercheck =`(openssl x509 -noout -modulus -in $servercrt | openssl md5 ; - openssl rsa -noout -modulus -in $serverkey | openssl md5) | - uniq | wc -l`; -# Check if certificate and key are made correctly. -unless(-e $servercrt && -e $serverkey && $servercheck == 1) -{ - exit 77; # skip -} +my $servercrt = "$srcdir/certs/expired.pem"; +my $serverkey = "$srcdir/certs/server-key.pem"; # Try Wget using SSL with expired cert. Expect Failure. my $port = 30443; @@ -99,18 +81,8 @@ print "Test successful.\n"; # Use certificate that is not yet valid -$servercrt = "$srcdir/certs/invalid.crt"; -$serverkey = "$srcdir/certs/invalid.key"; - -$servercheck =`(openssl x509 -noout -modulus -in $servercrt | openssl md5 ; - openssl rsa -noout -modulus -in $serverkey | openssl md5) | - uniq | wc -l`; -# Check if certificate and key are made correctly. -unless(-e $servercrt && -e $serverkey && $servercheck == 1) -{ - exit 77; # skip -} - +$servercrt = "$srcdir/certs/invalid.pem"; +$serverkey = "$srcdir/certs/server-key.pem"; # Retry the test with --no-check-certificate. expect success $port = 20443; diff -Nru wget-1.19.5/tests/Test-https-clientcert.px wget-1.20.1/tests/Test-https-clientcert.px --- wget-1.19.5/tests/Test-https-clientcert.px 2018-02-10 12:51:10.000000000 +0000 +++ wget-1.20.1/tests/Test-https-clientcert.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; @@ -20,13 +20,6 @@ }, ); -# Skip the test if openssl is not available -my $ossl = `openssl version`; -unless ($ossl =~ m/OpenSSL 1/) -{ - exit 77; -} - my $srcdir; if (@ARGV) { $srcdir = shift @ARGV; @@ -52,34 +45,15 @@ } my $cacrt = "$srcdir/certs/test-ca-cert.pem"; -my $cakey = "$srcdir/certs/test-ca-key.pem"; +#my $cakey = "$srcdir/certs/test-ca-key.pem"; # Prepare server certificate -my $servercrt = "$srcdir/certs/server.crt"; -my $serverkey = "$srcdir/certs/server.key"; - -my $servercheck =`(openssl x509 -noout -modulus -in $servercrt | openssl md5 ; - openssl rsa -noout -modulus -in $serverkey | openssl md5) | - uniq | wc -l`; -# Check if certificate and key are made correctly. -unless(-e $servercrt && -e $serverkey && $servercheck == 1) -{ - exit 77; # skip -} +my $servercrt = "$srcdir/certs/server-cert.pem"; +my $serverkey = "$srcdir/certs/server-key.pem"; # Use client certificate -my $clientcert = "$srcdir/certs/client.crt"; -my $clientkey = "$srcdir/certs/client.key"; - -my $clientcheck=`(openssl x509 -noout -modulus -in $clientcert | openssl md5 ; - openssl rsa -noout -modulus -in $clientkey | openssl md5) | - uniq | wc -l`; - -# Check if client certificate and key are made correctly. -unless(-e $clientcert && -e $clientkey && $clientcheck == 1) -{ - exit 77; # skip -} +my $clientcert = "$srcdir/certs/client-cert.pem"; +my $clientkey = "$srcdir/certs/client-key.pem"; # Try Wget using SSL with mismatched client cert & key . Expect error my $port = 21443; diff -Nru wget-1.19.5/tests/Test-https-crl.px wget-1.20.1/tests/Test-https-crl.px --- wget-1.19.5/tests/Test-https-crl.px 2018-05-06 15:29:30.000000000 +0000 +++ wget-1.20.1/tests/Test-https-crl.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; @@ -20,13 +20,6 @@ }, ); -# Skip the test if openssl is not available -my $ossl = `openssl version`; -unless ($ossl =~ m/OpenSSL 1/) -{ - exit 77; -} - my $srcdir; if (@ARGV) { $srcdir = shift @ARGV; @@ -52,20 +45,10 @@ } my $cacrt = "$srcdir/certs/test-ca-cert.pem"; -my $cakey = "$srcdir/certs/test-ca-key.pem"; # Use a revoked certificate -my $servercrt = "$srcdir/certs/server.crt"; -my $serverkey = "$srcdir/certs/server.key"; - -my $servercheck =`(openssl x509 -noout -modulus -in $servercrt | openssl md5 ; - openssl rsa -noout -modulus -in $serverkey | openssl md5) | - uniq | wc -l`; -# Check if certificate and key are correct. -unless(-e $servercrt && -e $serverkey && $servercheck == 1) -{ - exit 77; # skip -} +my $servercrt = "$srcdir/certs/server-cert.pem"; +my $serverkey = "$srcdir/certs/server-key.pem"; # Try Wget using SSL first without --no-check-certificate. Expect Success. my $port = 32443; @@ -96,16 +79,7 @@ } # Revoke the certificate -my $crlfile = "$srcdir/certs/revokedcrl.pem"; - -# Check if CRL file is generated. -unless(-e $crlfile) -{ - exit 77; # skip -} - -# To read a CRL file use the following command: -# openssl crl -text -in $srcdir/certs/root.crl.pem +my $crlfile = "$srcdir/certs/revoked-crl.pem"; # Retry the test with CRL. Expect Failure. $port = 23443; diff -Nru wget-1.19.5/tests/Test--httpsonly-r.px wget-1.20.1/tests/Test--httpsonly-r.px --- wget-1.19.5/tests/Test--httpsonly-r.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--httpsonly-r.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-https-pfs.px wget-1.20.1/tests/Test-https-pfs.px --- wget-1.19.5/tests/Test-https-pfs.px 2018-02-10 12:51:10.000000000 +0000 +++ wget-1.20.1/tests/Test-https-pfs.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; @@ -20,13 +20,6 @@ }, ); -# Skip the test if openssl is not available -my $ossl = `openssl version`; -unless ($ossl =~ m/OpenSSL 1/) -{ - exit 77; -} - my $srcdir; if (@ARGV) { $srcdir = shift @ARGV; diff -Nru wget-1.19.5/tests/Test-https-selfsigned.px wget-1.20.1/tests/Test-https-selfsigned.px --- wget-1.19.5/tests/Test-https-selfsigned.px 2018-02-10 12:51:10.000000000 +0000 +++ wget-1.20.1/tests/Test-https-selfsigned.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; @@ -20,13 +20,6 @@ }, ); -# Skip the test if openssl is not available -my $ossl = `openssl version`; -unless ($ossl =~ m/OpenSSL 1/) -{ - exit 77; -} - my $srcdir; if (@ARGV) { $srcdir = shift @ARGV; @@ -55,16 +48,6 @@ my $certfile="$srcdir/certs/selfsigned.crt"; my $keyfile="$srcdir/certs/selfsigned.key"; -my $sscheck=`(openssl x509 -noout -modulus -in $certfile | openssl md5 ; - openssl rsa -noout -modulus -in $keyfile | openssl md5) | - uniq|wc -l`; - -# Check if Self signed certificate and key are made correctly. -unless(-e $certfile && -e $keyfile && $sscheck == 1) -{ - exit 77; # skip -} - # Try Wget using SSL first without --no-check-certificate. expect error my $port = 26443; my $cmdline = $WgetTest::WGETPATH . " --ca-certificate=$srcdir/certs/test-ca-cert.pem". diff -Nru wget-1.19.5/tests/Test-https-tlsv1.px wget-1.20.1/tests/Test-https-tlsv1.px --- wget-1.19.5/tests/Test-https-tlsv1.px 2018-02-10 12:51:10.000000000 +0000 +++ wget-1.20.1/tests/Test-https-tlsv1.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; @@ -20,13 +20,6 @@ }, ); -# Skip the test if openssl is not available -my $ossl = `openssl version`; -unless ($ossl =~ m/OpenSSL 1/) -{ - exit 77; -} - my $srcdir; if (@ARGV) { $srcdir = shift @ARGV; diff -Nru wget-1.19.5/tests/Test-https-tlsv1x.px wget-1.20.1/tests/Test-https-tlsv1x.px --- wget-1.19.5/tests/Test-https-tlsv1x.px 2018-02-10 12:51:10.000000000 +0000 +++ wget-1.20.1/tests/Test-https-tlsv1x.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; @@ -21,13 +21,6 @@ }, ); -# Skip the test if openssl is not available -my $ossl = `openssl version`; -unless ($ossl =~ m/OpenSSL 1/) -{ - exit 77; -} - my $srcdir; if (@ARGV) { $srcdir = shift @ARGV; diff -Nru wget-1.19.5/tests/Test-https-weboftrust.px wget-1.20.1/tests/Test-https-weboftrust.px --- wget-1.19.5/tests/Test-https-weboftrust.px 2018-05-06 16:19:08.000000000 +0000 +++ wget-1.20.1/tests/Test-https-weboftrust.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-idn-cmd.px wget-1.20.1/tests/Test-idn-cmd.px --- wget-1.19.5/tests/Test-idn-cmd.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-idn-cmd.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-idn-cmd-utf8.px wget-1.20.1/tests/Test-idn-cmd-utf8.px --- wget-1.19.5/tests/Test-idn-cmd-utf8.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-idn-cmd-utf8.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-idn-headers.px wget-1.20.1/tests/Test-idn-headers.px --- wget-1.19.5/tests/Test-idn-headers.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-idn-headers.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-idn-meta.px wget-1.20.1/tests/Test-idn-meta.px --- wget-1.19.5/tests/Test-idn-meta.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-idn-meta.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-idn-robots.px wget-1.20.1/tests/Test-idn-robots.px --- wget-1.19.5/tests/Test-idn-robots.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-idn-robots.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-idn-robots-utf8.px wget-1.20.1/tests/Test-idn-robots-utf8.px --- wget-1.19.5/tests/Test-idn-robots-utf8.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-idn-robots-utf8.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-i-ftp.px wget-1.20.1/tests/Test-i-ftp.px --- wget-1.19.5/tests/Test-i-ftp.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-i-ftp.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-i-http.px wget-1.20.1/tests/Test-i-http.px --- wget-1.19.5/tests/Test-i-http.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-i-http.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-iri-disabled.px wget-1.20.1/tests/Test-iri-disabled.px --- wget-1.19.5/tests/Test-iri-disabled.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-iri-disabled.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-iri-forced-remote.px wget-1.20.1/tests/Test-iri-forced-remote.px --- wget-1.19.5/tests/Test-iri-forced-remote.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-iri-forced-remote.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-iri-list.px wget-1.20.1/tests/Test-iri-list.px --- wget-1.19.5/tests/Test-iri-list.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-iri-list.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-iri-percent.px wget-1.20.1/tests/Test-iri-percent.px --- wget-1.19.5/tests/Test-iri-percent.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-iri-percent.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-iri.px wget-1.20.1/tests/Test-iri.px --- wget-1.19.5/tests/Test-iri.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-iri.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-k.px wget-1.20.1/tests/Test-k.px --- wget-1.19.5/tests/Test-k.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-k.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-meta-robots.px wget-1.20.1/tests/Test-meta-robots.px --- wget-1.19.5/tests/Test-meta-robots.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-meta-robots.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-N-current.px wget-1.20.1/tests/Test-N-current.px --- wget-1.19.5/tests/Test-N-current.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-N-current.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-N-HTTP-Content-Disposition.px wget-1.20.1/tests/Test-N-HTTP-Content-Disposition.px --- wget-1.19.5/tests/Test-N-HTTP-Content-Disposition.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-N-HTTP-Content-Disposition.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-N--no-content-disposition.px wget-1.20.1/tests/Test-N--no-content-disposition.px --- wget-1.19.5/tests/Test-N--no-content-disposition.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-N--no-content-disposition.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-N--no-content-disposition-trivial.px wget-1.20.1/tests/Test-N--no-content-disposition-trivial.px --- wget-1.19.5/tests/Test-N--no-content-disposition-trivial.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-N--no-content-disposition-trivial.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-N-no-info.px wget-1.20.1/tests/Test-N-no-info.px --- wget-1.19.5/tests/Test-N-no-info.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-N-no-info.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--no-content-disposition.px wget-1.20.1/tests/Test--no-content-disposition.px --- wget-1.19.5/tests/Test--no-content-disposition.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--no-content-disposition.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--no-content-disposition-trivial.px wget-1.20.1/tests/Test--no-content-disposition-trivial.px --- wget-1.19.5/tests/Test--no-content-disposition-trivial.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--no-content-disposition-trivial.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-N-old.px wget-1.20.1/tests/Test-N-old.px --- wget-1.19.5/tests/Test-N-old.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-N-old.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-nonexisting-quiet.px wget-1.20.1/tests/Test-nonexisting-quiet.px --- wget-1.19.5/tests/Test-nonexisting-quiet.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-nonexisting-quiet.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-noop.px wget-1.20.1/tests/Test-noop.px --- wget-1.19.5/tests/Test-noop.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-noop.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-np.px wget-1.20.1/tests/Test-np.px --- wget-1.19.5/tests/Test-np.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-np.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-N.px wget-1.20.1/tests/Test-N.px --- wget-1.19.5/tests/Test-N.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-N.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-N-smaller.px wget-1.20.1/tests/Test-N-smaller.px --- wget-1.19.5/tests/Test-N-smaller.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-N-smaller.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-O-HTTP-Content-Disposition.px wget-1.20.1/tests/Test-O-HTTP-Content-Disposition.px --- wget-1.19.5/tests/Test-O-HTTP-Content-Disposition.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-O-HTTP-Content-Disposition.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-O-nc.px wget-1.20.1/tests/Test-O-nc.px --- wget-1.19.5/tests/Test-O-nc.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-O-nc.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-O--no-content-disposition.px wget-1.20.1/tests/Test-O--no-content-disposition.px --- wget-1.19.5/tests/Test-O--no-content-disposition.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-O--no-content-disposition.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-O--no-content-disposition-trivial.px wget-1.20.1/tests/Test-O--no-content-disposition-trivial.px --- wget-1.19.5/tests/Test-O--no-content-disposition-trivial.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-O--no-content-disposition-trivial.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-O-nonexisting.px wget-1.20.1/tests/Test-O-nonexisting.px --- wget-1.19.5/tests/Test-O-nonexisting.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-O-nonexisting.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-O.px wget-1.20.1/tests/Test-O.px --- wget-1.19.5/tests/Test-O.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-O.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--post-file.px wget-1.20.1/tests/Test--post-file.px --- wget-1.19.5/tests/Test--post-file.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--post-file.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-proxied-https-auth-keepalive.px wget-1.20.1/tests/Test-proxied-https-auth-keepalive.px --- wget-1.19.5/tests/Test-proxied-https-auth-keepalive.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-proxied-https-auth-keepalive.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . # Simulate a tunneling proxy to a HTTPS URL that needs authentication. # Use a persistent connection (Connection: keep-alive) diff -Nru wget-1.19.5/tests/Test-proxied-https-auth.px wget-1.20.1/tests/Test-proxied-https-auth.px --- wget-1.19.5/tests/Test-proxied-https-auth.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-proxied-https-auth.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . # Simulate a tunneling proxy to a HTTPS URL that needs authentication. # Use two connections (Connection: close) diff -Nru wget-1.19.5/tests/Test-proxy-auth-basic.px wget-1.20.1/tests/Test-proxy-auth-basic.px --- wget-1.19.5/tests/Test-proxy-auth-basic.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-proxy-auth-basic.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-restrict-ascii.px wget-1.20.1/tests/Test-restrict-ascii.px --- wget-1.19.5/tests/Test-restrict-ascii.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-restrict-ascii.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-Restrict-Lowercase.px wget-1.20.1/tests/Test-Restrict-Lowercase.px --- wget-1.19.5/tests/Test-Restrict-Lowercase.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-Restrict-Lowercase.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-Restrict-Uppercase.px wget-1.20.1/tests/Test-Restrict-Uppercase.px --- wget-1.19.5/tests/Test-Restrict-Uppercase.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-Restrict-Uppercase.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--spider-fail.px wget-1.20.1/tests/Test--spider-fail.px --- wget-1.19.5/tests/Test--spider-fail.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--spider-fail.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--spider.px wget-1.20.1/tests/Test--spider.px --- wget-1.19.5/tests/Test--spider.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--spider.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--spider-r-HTTP-Content-Disposition.px wget-1.20.1/tests/Test--spider-r-HTTP-Content-Disposition.px --- wget-1.19.5/tests/Test--spider-r-HTTP-Content-Disposition.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--spider-r-HTTP-Content-Disposition.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--spider-r--no-content-disposition.px wget-1.20.1/tests/Test--spider-r--no-content-disposition.px --- wget-1.19.5/tests/Test--spider-r--no-content-disposition.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--spider-r--no-content-disposition.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--spider-r--no-content-disposition-trivial.px wget-1.20.1/tests/Test--spider-r--no-content-disposition-trivial.px --- wget-1.19.5/tests/Test--spider-r--no-content-disposition-trivial.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--spider-r--no-content-disposition-trivial.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--spider-r.px wget-1.20.1/tests/Test--spider-r.px --- wget-1.19.5/tests/Test--spider-r.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--spider-r.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--start-pos--continue.px wget-1.20.1/tests/Test--start-pos--continue.px --- wget-1.19.5/tests/Test--start-pos--continue.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--start-pos--continue.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test--start-pos.px wget-1.20.1/tests/Test--start-pos.px --- wget-1.19.5/tests/Test--start-pos.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test--start-pos.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/tests/Test-stdouterr.px wget-1.20.1/tests/Test-stdouterr.px --- wget-1.19.5/tests/Test-stdouterr.px 2017-10-30 19:18:54.000000000 +0000 +++ wget-1.20.1/tests/Test-stdouterr.px 2018-12-26 19:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env -S perl -I . use strict; use warnings; diff -Nru wget-1.19.5/util/Makefile.in wget-1.20.1/util/Makefile.in --- wget-1.19.5/util/Makefile.in 2018-05-06 16:47:51.000000000 +0000 +++ wget-1.20.1/util/Makefile.in 2018-12-26 20:09:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -104,6 +104,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -121,12 +122,13 @@ subdir = util ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/arpa_inet_h.m4 \ + $(top_srcdir)/m4/__inline.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/af_alg.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/arpa_inet_h.m4 \ $(top_srcdir)/m4/asm-underscore.m4 $(top_srcdir)/m4/base32.m4 \ $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ - $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \ + $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/clock_time.m4 \ + $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ @@ -135,9 +137,11 @@ $(top_srcdir)/m4/extern-inline.m4 \ $(top_srcdir)/m4/fatal-signal.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ - $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \ - $(top_srcdir)/m4/flock.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fseek.m4 \ + $(top_srcdir)/m4/fflush.m4 $(top_srcdir)/m4/flexmember.m4 \ + $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/flock.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fnmatch_h.m4 \ + $(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fpurge.m4 \ + $(top_srcdir)/m4/freading.m4 $(top_srcdir)/m4/fseek.m4 \ $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/fstat.m4 \ $(top_srcdir)/m4/ftell.m4 $(top_srcdir)/m4/ftello.m4 \ $(top_srcdir)/m4/futimens.m4 $(top_srcdir)/m4/getaddrinfo.m4 \ @@ -150,7 +154,6 @@ $(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/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 \ @@ -195,29 +198,29 @@ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/sched_h.m4 \ $(top_srcdir)/m4/secure_getenv.m4 $(top_srcdir)/m4/select.m4 \ - $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sha1.m4 \ - $(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \ - $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/sh-filename.m4 \ + $(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sha256.m4 \ + $(top_srcdir)/m4/sha512.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sigpipe.m4 \ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/snprintf.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/spawn-pipe.m4 $(top_srcdir)/m4/spawn_h.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \ - $(top_srcdir)/m4/strptime.m4 $(top_srcdir)/m4/strtok_r.m4 \ - $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_file_h.m4 \ - $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/std-gnu11.m4 \ + $(top_srcdir)/m4/stdalign.m4 $(top_srcdir)/m4/stdbool.m4 \ + $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strptime.m4 \ + $(top_srcdir)/m4/strtok_r.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_file_h.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ @@ -269,7 +272,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ @@ -288,6 +290,7 @@ BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +BYTESWAP_H = @BYTESWAP_H@ CARES_CFLAGS = @CARES_CFLAGS@ CARES_LIBS = @CARES_LIBS@ CC = @CC@ @@ -356,6 +359,7 @@ GNULIB_FGETC = @GNULIB_FGETC@ GNULIB_FGETS = @GNULIB_FGETS@ GNULIB_FLOCK = @GNULIB_FLOCK@ +GNULIB_FNMATCH = @GNULIB_FNMATCH@ GNULIB_FOPEN = @GNULIB_FOPEN@ GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ @@ -389,6 +393,7 @@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ +GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ @@ -413,6 +418,7 @@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALENAME = @GNULIB_LOCALENAME@ GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ @@ -483,6 +489,7 @@ GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT@ GNULIB_POSIX_SPAWNATTR_SETSIGMASK = @GNULIB_POSIX_SPAWNATTR_SETSIGMASK@ GNULIB_POSIX_SPAWNP = @GNULIB_POSIX_SPAWNP@ +GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -685,6 +692,7 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ @@ -707,6 +715,9 @@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FLOCK = @HAVE_FLOCK@ +HAVE_FNMATCH = @HAVE_FNMATCH@ +HAVE_FNMATCH_H = @HAVE_FNMATCH_H@ +HAVE_FREELOCALE = @HAVE_FREELOCALE@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ @@ -719,13 +730,16 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ +HAVE_GETPASS = @HAVE_GETPASS@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@ HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ @@ -763,6 +777,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NETDB_H = @HAVE_NETDB_H@ HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ +HAVE_NEWLOCALE = @HAVE_NEWLOCALE@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ @@ -774,6 +789,7 @@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@ HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@ +HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PSELECT = @HAVE_PSELECT@ @@ -844,7 +860,6 @@ 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@ @@ -902,8 +917,6 @@ 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@ @@ -938,7 +951,6 @@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -983,6 +995,7 @@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ +NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1017,6 +1030,7 @@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ +NEXT_FNMATCH_H = @NEXT_FNMATCH_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1059,6 +1073,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCRE2_CFLAGS = @PCRE2_CFLAGS@ +PCRE2_LIBS = @PCRE2_LIBS@ PCRE_CFLAGS = @PCRE_CFLAGS@ PCRE_LIBS = @PCRE_LIBS@ PERL = @PERL@ @@ -1095,9 +1111,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ +REPLACE_FNMATCH = @REPLACE_FNMATCH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ REPLACE_FPURGE = @REPLACE_FPURGE@ +REPLACE_FREELOCALE = @REPLACE_FREELOCALE@ REPLACE_FREOPEN = @REPLACE_FREOPEN@ REPLACE_FSEEK = @REPLACE_FSEEK@ REPLACE_FSEEKO = @REPLACE_FSEEKO@ @@ -1116,6 +1134,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ +REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ @@ -1152,6 +1171,7 @@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@ REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ @@ -1160,6 +1180,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@ +REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ @@ -1316,7 +1337,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -1360,8 +1380,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1379,7 +1399,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru wget-1.19.5/.version wget-1.20.1/.version --- wget-1.19.5/.version 2018-05-06 16:42:11.000000000 +0000 +++ wget-1.20.1/.version 2018-12-26 20:10:46.000000000 +0000 @@ -1 +1 @@ -1.19.5-dirty +1.20.1