diff -ruN lftp-3.1.0/ChangeLog lftp-3.1.1/ChangeLog --- lftp-3.1.0/ChangeLog Fri Jan 21 18:00:23 2005 +++ lftp-3.1.1/ChangeLog Tue Mar 1 17:39:30 2005 @@ -1,3 +1,7 @@ +2005-03-01 lav + + * configure.ac: check for netinet/in_systm.h, netinet/ip.h. + 2005-01-21 lav * configure.ac: check for declaration of dn_expand. diff -ruN lftp-3.1.0/NEWS lftp-3.1.1/NEWS --- lftp-3.1.0/NEWS Fri Feb 25 11:05:35 2005 +++ lftp-3.1.1/NEWS Wed Mar 23 00:42:00 2005 @@ -1,3 +1,12 @@ +Version 3.1.1 - 2005-03-23 + +* new setting ftp:ignore-pasv-address. +* use IP TOS for ftp connections. +* new `quote' command extentions for http: `quote move' and `quote copy' + for DAV operations. E.g. `quote copy index.html http://x.org/index2.html'. +* fixed timeout handling when waiting for FXP source confirmation. +* fixed http DAV method MOVE (use full URL in Destination; fixed stall). + Version 3.1.0 - 2005-02-25 * http DAV support added (PROPFIND, MKCOL, DELETE, MOVE). diff -ruN lftp-3.1.0/README lftp-3.1.1/README --- lftp-3.1.0/README Fri Apr 23 23:19:31 2004 +++ lftp-3.1.1/README Thu Mar 10 15:00:23 2005 @@ -1,4 +1,4 @@ -** lftp-3.0.x +** lftp-3.1.x This package `lftp' contains the following components: @@ -14,58 +14,57 @@ lftp ~~~~ -lftp is command line file transfer program. It supports FTP, HTTP, -FISH, SFTP and FILE (local FS) protocols. GNU Readline library is used -for input. - -Low level stuff supported: ftp proxy, http proxy, ftp over http, -opie/skey, fxp transfers, automatic retrying on non-fatal errors and -timeouts, ipv6, socks, http/1.1, sftp v3-4. See FEATURES for more -detailed list of features. - -Every operation in lftp is reliable, that is any non-fatal error is -ignored and the operation is retried. So if downloading breaks, it -will be restarted from the point automatically. Even if ftp server -does not support REST command, lftp will try to retrieve the file from -the very beginning until the file is transferred completely. - -lftp has shell-like command syntax allowing you to launch several -commands in parallel in background (&). It is also possible to group -commands within () and execute them in background. All background jobs -are executed in the same single process. You can bring a foreground -job to background with ^Z (c-z) and back with command `wait' (or `fg' which -is alias to `wait'). To list running jobs, use command `jobs'. Some -commands allow redirecting their output (cat, ls, ...) to file or via -pipe to external command. Commands can be executed conditionally based -on termination status of previous command (&&, ||). - -If you exit lftp when some jobs are not finished yet, lftp will move -itself to nohup mode in background. The same happens when you have a -real modem hangup or when you close an xterm. +lftp is sophisticated file transfer program with command line interface. It +supports FTP, HTTP, FISH, SFTP and FILE (local FS) protocols. GNU Readline +library is used for input. + +Low level stuff supported: ftp proxy, http proxy, ftp over http, opie/skey, +fxp transfers, automatic retrying on non-fatal errors and timeouts, ipv6, +socks, http/1.1, sftp v3-4. See FEATURES for more detailed list of +features. + +Every operation in lftp is reliable, that is any non-fatal error is ignored +and the operation is retried. So if downloading breaks, it will be +restarted from the point automatically. Even if ftp server does not support +REST command, lftp will try to retrieve the file from the very beginning +until the file is transferred completely. + +lftp has shell-like command syntax allowing you to launch several commands +in parallel in background (&). It is also possible to group commands within +() and execute them in background. All background jobs are executed in the +same single process. You can bring a foreground job to background with ^Z +(c-z) and back with command `wait' (or `fg' which is alias to `wait'). To +list running jobs, use command `jobs'. Some commands allow redirecting +their output (cat, ls, ...) to file or via pipe to external command. +Commands can be executed conditionally based on termination status of +previous command (&&, ||). + +If you exit lftp when some jobs are not finished yet, lftp will move itself +to nohup mode in background. The same happens when you have a real modem +hangup or when you close an xterm. lftp has builtin mirror which can download or update a whole directory -tree. There is also reverse mirror (mirror -R) which uploads or -updates a directory tree on server. +tree. There is also reverse mirror (mirror -R) which uploads or updates a +directory tree on server. -There is command `at' to launch a job at specified time in current -context, command `queue' to queue commands for sequential execution -for current server, and much more. - -On startup, lftp executes /etc/lftp.conf and then ~/.lftprc and -~/.lftp/rc. You can place aliases and `set' commands there. Some -people prefer to see full protocol debug, use `debug' to turn the -debug on. Use `debug 3' to see only greeting messages and error -messages. - -lftp has a number of settable variables. You can use `set -a' to see -all variables and their values or `set -d' to see list of defaults. -Variable names can be abbreviated and prefix can be omitted unless the -rest becomes ambiguous. +There is command `at' to launch a job at specified time in current context, +command `queue' to queue commands for sequential execution for current +server, and much more. + +On startup, lftp executes /etc/lftp.conf and then ~/.lftprc and ~/.lftp/rc. +You can place aliases and `set' commands there. Some people prefer to see +full protocol debug, use `debug' to turn the debug on. Use `debug 3' to see +only greeting messages and error messages. + +lftp has a number of settable variables. You can use `set -a' to see all +variables and their values or `set -d' to see list of defaults. Variable +names can be abbreviated and prefix can be omitted unless the rest becomes +ambiguous. Use command `help' or read documentation (man lftp) to learn more. -If lftp was compiled with ssl support, then it includes software -developed by the OpenSSL Project for use in the OpenSSL Toolkit. +If lftp was compiled with ssl support, then it includes software developed +by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/) Where to get @@ -88,8 +87,8 @@ Internals ~~~~~~~~~ All this is based on SMTask class which implements non-preemptive -multitasking via Do method. The method Do does a little bit of work, -sets wake up condition (block member) and returns. +multitasking via Do method. The method Do does a little bit of work, sets +wake up condition (block member) and returns. The class Ftp allows reliable deliver of files via ftp protocol, it hides all the details from application and allows asynchronous operation. @@ -99,38 +98,37 @@ default. To turn it on, use `set sync-mode n' in lftp or --async-mode for ftpget. -Note that sending several commands is considered as violation or -protocol, but RFC959 says: ``The user-process sending another command -before the completion reply would be in violation of protocol; but -server-FTP processes should queue any commands that arrive while a -preceding command is in progress.'' - -It is known that some network software dealing with address -translation works incorrectly in case of several FTP commands in one -network packet. +Note that sending several commands is considered as violation or protocol, +but RFC959 says: ``The user-process sending another command before the +completion reply would be in violation of protocol; but server-FTP +processes should queue any commands that arrive while a preceding command +is in progress.'' + +It is known that some network software dealing with address translation +works incorrectly in case of several FTP commands in one network packet. Systems ~~~~~~~ -The package is known to compile on Solaris2.5(gcc), Linux, FreeBSD, -NetBSD, SCO v5.0(gcc), IRIX(gcc), Tru64(gcc) and other systems. If you -can't compile it on your system, let me know. It is possible that lftp -version 2.0 can be compiled with non-gcc compilers since it does not -have gcc-isms, and it was successfully compiled by Sun C++ v5.0 -compiler using CXXFLAGS="-compat=4 -features=bool". +The package is known to compile on Solaris2.5(gcc), Linux, FreeBSD, NetBSD, +SCO v5.0(gcc), IRIX(gcc), Tru64(gcc) and other systems. If you can't +compile it on your system, let me know. It is possible that lftp version +2.0 can be compiled with non-gcc compilers since it does not have gcc-isms, +and it was successfully compiled by Sun C++ v5.0 compiler using +CXXFLAGS="-compat=4 -features=bool". Mailing list ~~~~~~~~~~~~ -There is a mailing list for discussion of lftp and announcements. It -is managed by majordomo; to subscribe, send mail to -majordomo@uniyar.ac.ru with `subscribe lftp' in body of message; to -send letters to the list, send them to lftp@uniyar.ac.ru; to -unsubscribe, send mail to majordomo@uniyar.ac.ru with `unsubscribe -lftp' in body of message. This is low volume list. +There is a mailing list for discussion of lftp and announcements. It is +managed by majordomo; to subscribe, send mail to majordomo@uniyar.ac.ru +with `subscribe lftp' in body of message; to send letters to the list, send +them to lftp@uniyar.ac.ru; to unsubscribe, send mail to +majordomo@uniyar.ac.ru with `unsubscribe lftp' in body of message. This is +low volume list. -There is also list lftp-devel@uniyar.ac.ru for snapshot announcements -and other development. +There is also list lftp-devel@uniyar.ac.ru for snapshot announcements and +other development. These lists are archived at http://www.mail-archive.com/lftp%40uniyar.ac.ru/ @@ -142,15 +140,15 @@ Author: Alexander V. Lukyanov My home page: http://www.yars.free.net/~lav/ -Other people have contributed to lftp development, see THANKS and -ChangeLog files. +Other people have contributed to lftp development, see THANKS and ChangeLog +files. Comments and bug reports are welcome. Please send them to the list: . License ~~~~~~~ -Copyright (c) 1996-2002 by Alexander V. Lukyanov (lav@yars.free.net) +Copyright (c) 1996-2005 by Alexander V. Lukyanov (lav@yars.free.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -ruN lftp-3.1.0/configure lftp-3.1.1/configure --- lftp-3.1.0/configure Thu Feb 24 10:33:13 2005 +++ lftp-3.1.1/configure Wed Mar 23 00:44:05 2005 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for lftp 3.1.0. +# Generated by GNU Autoconf 2.59 for lftp 3.1.1. # # Report bugs to . # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='lftp' PACKAGE_TARNAME='lftp' -PACKAGE_VERSION='3.1.0' -PACKAGE_STRING='lftp 3.1.0' +PACKAGE_VERSION='3.1.1' +PACKAGE_STRING='lftp 3.1.1' PACKAGE_BUGREPORT='lftp-bugs@lftp.yar.ru' ac_config_libobj_dir=lib @@ -956,7 +956,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 lftp 3.1.0 to adapt to many kinds of systems. +\`configure' configures lftp 3.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1022,7 +1022,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lftp 3.1.0:";; + short | recursive ) echo "Configuration of lftp 3.1.1:";; esac cat <<\_ACEOF @@ -1179,7 +1179,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -lftp configure 3.1.0 +lftp configure 3.1.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1193,7 +1193,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lftp $as_me 3.1.0, which was +It was created by lftp $as_me 3.1.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1836,7 +1836,7 @@ # Define the identity of the package. PACKAGE='lftp' - VERSION='3.1.0' + VERSION='3.1.1' cat >>confdefs.h <<_ACEOF @@ -27066,9 +27066,12 @@ + + for ac_header in fcntl.h sys/time.h errno.h stdlib.h varargs.h dirent.h\ termios.h termio.h sys/select.h sys/poll.h sys/stropts.h string.h memory.h\ strings.h sys/ioctl.h dlfcn.h arpa/inet.h arpa/nameser.h netinet/in.h netinet/tcp.h\ + netinet/in_systm.h netinet/ip.h\ resolv.h langinfo.h endian.h regex.h locale.h expat.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -27091,6 +27094,9 @@ #ifdef HAVE_NETINET_IN_H # include #endif +#ifdef HAVE_NETINET_IN_SYSTM_H +# include +#endif #include <$ac_header> @@ -33043,7 +33049,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by lftp $as_me 3.1.0, which was +This file was extended by lftp $as_me 3.1.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -33109,7 +33115,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -lftp config.status 3.1.0 +lftp config.status 3.1.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -ruN lftp-3.1.0/configure.ac lftp-3.1.1/configure.ac --- lftp-3.1.0/configure.ac Thu Feb 24 10:32:23 2005 +++ lftp-3.1.1/configure.ac Wed Mar 23 00:04:12 2005 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT([lftp], [3.1.0], [lftp-bugs@lftp.yar.ru]) +AC_INIT([lftp], [3.1.1], [lftp-bugs@lftp.yar.ru]) AM_INIT_AUTOMAKE AC_CONFIG_LIBOBJ_DIR(lib) AC_CONFIG_SRCDIR([src/ftpclass.cc]) @@ -283,6 +283,7 @@ AC_CHECK_HEADERS(fcntl.h sys/time.h errno.h stdlib.h varargs.h dirent.h\ termios.h termio.h sys/select.h sys/poll.h sys/stropts.h string.h memory.h\ strings.h sys/ioctl.h dlfcn.h arpa/inet.h arpa/nameser.h netinet/in.h netinet/tcp.h\ + netinet/in_systm.h netinet/ip.h\ resolv.h langinfo.h endian.h regex.h locale.h expat.h,,,[ #include #ifdef HAVE_ARPA_NAMESER_H @@ -290,6 +291,9 @@ #endif #ifdef HAVE_NETINET_IN_H # include +#endif +#ifdef HAVE_NETINET_IN_SYSTM_H +# include #endif ]) diff -ruN lftp-3.1.0/doc/ChangeLog lftp-3.1.1/doc/ChangeLog --- lftp-3.1.0/doc/ChangeLog Fri Feb 25 16:12:02 2005 +++ lftp-3.1.1/doc/ChangeLog Sat Mar 5 10:06:06 2005 @@ -1,5 +1,9 @@ 2005-02-25 Alexander V. Lukyanov + * lftp.1: document ftp:ignore-pasv-address. + +2005-02-25 Alexander V. Lukyanov + * lftp.1: document use-mkcol and use-propfind options; add short cls description; use boolean instead of bool. diff -ruN lftp-3.1.0/doc/lftp.1 lftp-3.1.1/doc/lftp.1 --- lftp-3.1.0/doc/lftp.1 Fri Feb 25 16:12:12 2005 +++ lftp-3.1.1/doc/lftp.1 Sat Mar 5 10:06:15 2005 @@ -17,7 +17,7 @@ .\" along with this program; see the file COPYING. If not, write to .\" the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. .\" -.\" $Id: lftp.1,v 1.98 2005/02/25 13:12:12 lav Exp $ +.\" $Id: lftp.1,v 1.99 2005/03/05 07:06:15 lav Exp $ .\" .\"------- .\" Sp space down the interparagraph distance @@ -42,7 +42,7 @@ .fi .in .. -.TH lftp 1 "25 Feb 2005" +.TH lftp 1 "05 Mar 2005" .SH NAME lftp \- Sophisticated file transfer program .SH SYNTAX @@ -59,7 +59,7 @@ .B lftp \-\-help .SH VERSION -This man page documents lftp version 3.1.0. +This man page documents lftp version 3.1.1. .SH "DESCRIPTION" \fBlftp\fR is a file transfer program that allows sophisticated ftp, http @@ -952,6 +952,11 @@ Initial directory. Default is empty string which means auto. Set this to `/' if you don't like the look of %2F in ftp URLs. The closure for this setting has format \fIuser@host\fP. +.TP +.BR ftp:ignore-pasv-address \ (boolean) +If true, lftp uses control connection address instead of the one returned in +PASV reply for data connection. This can be useful for broken NATs. +Default is false. .TP .BR ftp:list-empty-ok \ (boolean) if set to false, empty lists from LIST command will be treated as incorrect, diff -ruN lftp-3.1.0/include/config.h.in lftp-3.1.1/include/config.h.in --- lftp-3.1.0/include/config.h.in Thu Feb 24 10:37:26 2005 +++ lftp-3.1.1/include/config.h.in Wed Mar 23 00:49:54 2005 @@ -249,6 +249,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_IN_H +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_SYSTM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IP_H + /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_TCP_H diff -ruN lftp-3.1.0/lftp.lsm lftp-3.1.1/lftp.lsm --- lftp-3.1.0/lftp.lsm Fri Feb 25 16:16:04 2005 +++ lftp-3.1.1/lftp.lsm Wed Mar 23 01:04:26 2005 @@ -1,8 +1,8 @@ Begin3 Title: LFTP command line file transfer program -Version: 3.1.0 -Entered-date: 2005-02-25 -Description: LFTP is a shell-like command line ftp client. It is +Version: 3.1.1 +Entered-date: 2005-03-23 +Description: LFTP is a shell-like command line file transfer program. It is reliable: can retry operations and does reget automatically. It can do several transfers simultaneously in background. You can start a transfer in background and continue browsing @@ -22,7 +22,7 @@ Author: lav@yars.free.net (Alexander V. Lukyanov) Maintained-by: lav@yars.free.net (Alexander V. Lukyanov) Primary-site: ftp.yars.free.net /pub/software/unix/net/ftp/client/lftp - 1628 kB lftp-3.1.0.tar.gz + 1629 kB lftp-3.1.1.tar.gz Alternate-site: metalab.unc.edu /pub/Linux/system/network/file-transfer Platforms: Unix, G++ Copying-policy: GNU GPL diff -ruN lftp-3.1.0/lftp.spec lftp-3.1.1/lftp.spec --- lftp-3.1.0/lftp.spec Fri Feb 25 16:16:01 2005 +++ lftp-3.1.1/lftp.spec Wed Mar 23 01:04:16 2005 @@ -1,4 +1,4 @@ -%define version 3.1.0 +%define version 3.1.1 %define release 1 %define use_modules 0 Binary files lftp-3.1.0/po/de.gmo and lftp-3.1.1/po/de.gmo differ diff -ruN lftp-3.1.0/po/de.po lftp-3.1.1/po/de.po --- lftp-3.1.0/po/de.po Fri Feb 25 16:13:40 2005 +++ lftp-3.1.1/po/de.po Wed Mar 16 00:15:36 2005 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 2004-05-21 12:53+0200\n" "Last-Translator: Moritz Moeller-Herrmann \n" "Language-Team: deutsch \n" @@ -106,46 +106,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "Socket Fehler (%s) - erneutes Verbinden" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "Zugriff nicht möglich: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "Zugriff auf Datei nicht möglich" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "Keine Verbindung" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "Fataler Fehler: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "Fataler Fehler" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "Speichern fehlgeschlagen - erneutes Hochladen notwendig" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "Login fehlgeschlagen" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "Operation wird nicht unterstützt" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "Datei verschoben: %s" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "Datei verschoben nach »%s«" @@ -351,8 +351,8 @@ msgid "invalid pair of numbers" msgstr "Unzulässiges Zahlenpaar" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "Löse Hostadresse auf..." @@ -1788,169 +1788,169 @@ msgid "assuming failed host name lookup" msgstr "nehme fehlgeschlagene Auflösung des Hostnamens an" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "Kann EPSV Antwort nicht auswerten" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "Schließe den Kontroll - Socket" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "Schließe unbenutzte Verbindung" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "SITE CHMOD abgeschaltet durch ftp:use-site-chmod" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 msgid "MLSD is disabled by ftp:use-mlsd" msgstr "MLSD wird abgeschaltet durch ftp:use-mlsd" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "Kann kein Socket für die Adressfamilie %d anlegen" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "SITE CHMOD wird von dieser Gegenstelle nicht unterstützt" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 msgid "MLST and MLSD are not supported by this site" msgstr "MLST und MLSD werden von dieser Gegenstelle nicht unterstützt" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 msgid "unsupported network protocol" msgstr "nicht unterstütztes Netzwerkprotokoll" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "Verbinde Daten Socket mit (%s) Port %u" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Datenverbindung mit Proxy %s (%s) Port %u" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "Schalte Passivmodus ab" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 #, fuzzy msgid "Data connection established" msgstr "Data connection peer hat nicht übereinstimmende Adresse" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" "ftp:ssl-force ist gesetzt und Gegenstelle unterstützt oder erlaubt kein SSL" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "Gegenüber hat Verbindung beendet" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "Verbleibe und versuche es weiter" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "Schließe den Daten Socket" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 msgid "Closing aborted data socket" msgstr "Schließe die Datenverbindung" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "Dateigröße in Antwort empfangen" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "zusätzliche Server Antwort" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "sync - Modus eingeschaltet" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "Schalte Passivmodus ein" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 msgid "FEAT negotiation..." msgstr "FEAT Verbindungsaufbau..." -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "Schicke Befehle..." -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "Warte auf Antwort..." -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 msgid "Delaying before retry" msgstr "Pausiere vor erneuter Verbindung" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "Verbindung ruht" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "Verbinde..." -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "TLS Verbindungsaufbau..." -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 msgid "Connected" msgstr "Verbunden" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "Logge ein..." -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "Stelle Datenverbindung her..." -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "Wechsle nichtlokales Verzeichnis..." -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 msgid "Waiting for other copy peer..." msgstr "Warte auf die Gegenstelle für die andere Kopie..." -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "Warte auf Übertragungsende" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "Warte auf Datenverbindung..." -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 msgid "Sending data/TLS" msgstr "Sende Daten/TLS" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 msgid "Receiving data/TLS" msgstr "Empfange Daten/TLS" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "Sende Daten" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "Empfange Daten" @@ -1994,7 +1994,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s OK, %d Verzeichnis$|se$ angelegt\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "Umbenennung erfolgreich\n" @@ -2044,51 +2044,51 @@ msgid "POST method failed" msgstr "POST - Methode fehlgeschlagen" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "FTP über HTTP funktioniert nur mit Proxy, hftp:proxy Option angeben." -#: src/Http.cc:1129 +#: src/Http.cc:1142 msgid "Sending request..." msgstr "Schicke Anforderung..." -#: src/Http.cc:1176 +#: src/Http.cc:1189 msgid "Hit EOF while fetching headers" msgstr "Dateiende beim Lesen der Kopfzeilen erhalten" -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "Konnte HTTP Statusanzeige nicht auswerten" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 msgid "Receiving body..." msgstr "Empfange BODY..." -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "Dateiende (EOF) angetroffen" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "Nicht genug Daten erhalten, neuer Versuch" -#: src/Http.cc:1599 +#: src/Http.cc:1612 msgid "Received all" msgstr "alles empfangen" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "Alles empfangen (insgesamt)" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "Blockformatierung verletzt" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "Hole Kopfzeilen..." @@ -2117,7 +2117,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Hole Dateiliste (%lld) [%s]" @@ -2258,48 +2258,48 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "ftp:fxp-force ist eingeschaltet, aber FXP ist nicht verfügbar" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, c-format msgid "pipe() failed: %s" msgstr "pip() fehlgeschlagen: %s" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, c-format msgid "chdir(%s) failed: %s\n" msgstr "chdir(%s) fehlgeschlagen: %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "execl(/bin/sh) fehlgeschlagen: %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "Verbinde mit %s%s (%s) Port %u" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "Zeitablauf - neu verbinden" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 msgid "Connection limit reached" msgstr "Zahl der Verbindungen hat Grenze erreicht" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "Pausiere vor erneuter Verbindung" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "max-retries überschritten" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "Lese Verzeichnisinhalt (%lld) %s[%s] aus" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, c-format msgid "Getting files information (%d%%) [%s]" msgstr "Lese Dateiinformationen (%d%%) [%s]" Binary files lftp-3.1.0/po/es.gmo and lftp-3.1.1/po/es.gmo differ diff -ruN lftp-3.1.0/po/es.po lftp-3.1.1/po/es.po --- lftp-3.1.0/po/es.po Fri Feb 25 16:13:41 2005 +++ lftp-3.1.1/po/es.po Wed Mar 16 00:15:36 2005 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lftp 2.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 2002-08-08 19:01+0000\n" "Last-Translator: Nicolás Lichtmaier \n" "Language-Team: Spanish \n" @@ -101,46 +101,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "Error de socket (%s) - reconectando" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "Falló el acceso: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "El archivo no puede ser accedido" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "No conectado" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "Error fatal: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "Error fatal" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "El envío falló - tiene que usar reput" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "Falló la identificación con el servidor" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "Operación no soportada" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "Archivo movido: %s" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "Archivo movido a `%s'" @@ -345,8 +345,8 @@ msgid "invalid pair of numbers" msgstr "par de números inválido" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "Resolviendo dirección del servidor..." @@ -1685,174 +1685,174 @@ msgid "assuming failed host name lookup" msgstr "asumiendo falla en la búsqueda del nombre de servidor" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "no se pudo interpretar la respuesta EPSV" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "Cerrando socket de control" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "Cerrando conexión ociosa" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "SITE CHMOD está desabilitado por ftp:use-site-chmod" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 #, fuzzy msgid "MLSD is disabled by ftp:use-mlsd" msgstr "SITE CHMOD está desabilitado por ftp:use-site-chmod" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "no se pudo crear un socket de la familia %d de direcciones" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "El servidor no soporta el comando SITE CHMOD" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 #, fuzzy msgid "MLST and MLSD are not supported by this site" msgstr "El servidor no soporta el comando SITE CHMOD" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 msgid "unsupported network protocol" msgstr "protocolo de red no soportado" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "Conectando socket de datos a (%s) puerto %u" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, fuzzy, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Conectando socket de datos a (%s) puerto %u" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "Desconectando modo pasivo" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 #, fuzzy msgid "Data connection established" msgstr "Conexión de datos abierta" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" "Está asignado el parámetro ssl-force y el sistema no soporta o no permite SSL" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "El otro extremo cerró la conexión" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "Persistir y reintentar" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "Cerrando socket de datos" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 #, fuzzy msgid "Closing aborted data socket" msgstr "Cerrando socket de datos" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "vi tamaño del archivo en la respuesta" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "respuesta extra del servidor" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "Activando sync-mode" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "Conectando modo pasivo" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 #, fuzzy msgid "FEAT negotiation..." msgstr "Negociando TLS..." -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "Enviando comandos..." -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "Esperando respuesta..." -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 #, fuzzy msgid "Delaying before retry" msgstr "Esperando antes de reintentar" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "Conexión ociosa" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "Conectándose..." -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "Negociando TLS..." -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 msgid "Connected" msgstr "Conectado" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "Identificándose..." -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "Estableciendo la conexión de datos..." -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "Cambiando el directorio remoto..." -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 msgid "Waiting for other copy peer..." msgstr "Esperando al otro extremo para copiar..." -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "Esperando que finalice la transferencia" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "Esperando la conexión de datos..." -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 msgid "Sending data/TLS" msgstr "Enviando datos/TLS" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 msgid "Receiving data/TLS" msgstr "Recibiendo datos/TLS" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "Enviando datos" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "Recibiendo datos" @@ -1896,7 +1896,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s ok, %d directorio$|s$ creado$|s$\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "renombrado exitoso\n" @@ -1946,51 +1946,51 @@ msgid "POST method failed" msgstr "falló el método POST" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "ftp no funciona sobre http sin usar un proxy, configure hftp:proxy." -#: src/Http.cc:1129 +#: src/Http.cc:1142 msgid "Sending request..." msgstr "Enviando requerimiento..." -#: src/Http.cc:1176 +#: src/Http.cc:1189 msgid "Hit EOF while fetching headers" msgstr "Encontré EOF mientras traía encabezados" -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "No se pudo interpretar la línea de estado HTTP" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 msgid "Receiving body..." msgstr "Recibiendo cuerpo..." -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "Encontré EOF" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "No se recibió suficiente, reintentando" -#: src/Http.cc:1599 +#: src/Http.cc:1612 msgid "Received all" msgstr "Se recibió todo" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "Se recibió todo (total)" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "formato `chunked' violado" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "Trayendo encabezados..." @@ -2019,7 +2019,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Obteniendo lista de archivos (%lld) [%s]" @@ -2160,48 +2160,48 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "ftp:fxp-force está activado pero FXP no está disponible" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, c-format msgid "pipe() failed: %s" msgstr "falló pipe(): %s" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, c-format msgid "chdir(%s) failed: %s\n" msgstr "falló chdir(%s): %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "falló execl(/bin/sh): %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "Conectándose a %s%s (%s) port %u" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "Tiempo fuera - reconectando" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 msgid "Connection limit reached" msgstr "Límite de conexiones alcanzado" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "Esperando antes de reintentar" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "variable max-retries excedida" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "Obteniendo el contenido del directorio (%lld) %s[%s]" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, c-format msgid "Getting files information (%d%%) [%s]" msgstr "Obteniendo información sobre los archivos (%d%%) [%s]" Binary files lftp-3.1.0/po/fr.gmo and lftp-3.1.1/po/fr.gmo differ diff -ruN lftp-3.1.0/po/fr.po lftp-3.1.1/po/fr.po --- lftp-3.1.0/po/fr.po Fri Feb 25 16:13:41 2005 +++ lftp-3.1.1/po/fr.po Wed Mar 16 00:15:36 2005 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lftp 2.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 2003-06-08 00:26+0200\n" "Last-Translator: Nicolas Noble \n" "Language-Team: Français \n" @@ -102,46 +102,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "Erreur de socket (%s) - reconnexion" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "L'accès a échoué: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "Le fichier ne peut être adressé" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "Non connecté" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "Erreur fatale: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "Erreur fatale" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "L'émission a échoué - vous devez renvoyer (reput)" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "Login incorrect." -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "Opération non supportée" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "Fichier déplacé: %s" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "Fichier déplacé vers `%s'" @@ -344,8 +344,8 @@ msgid "invalid pair of numbers" msgstr "paire de nombre invalide" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "Résolution de l'adresse..." @@ -1751,173 +1751,173 @@ msgid "assuming failed host name lookup" msgstr "la résolution du nom du host a échouée" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "ne peut analyser la réponse EPSV" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "Fermeture du socket de contrôle" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "Fermeture de la connexion inutile" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "SITE CHMOD est désactivé par ftp:use-site-chmod" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 #, fuzzy msgid "MLSD is disabled by ftp:use-mlsd" msgstr "SITE CHMOD est désactivé par ftp:use-site-chmod" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "ne peut créer un socket de la famille %d" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "SITE CHMOD n'est pas supportée par ce site" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 #, fuzzy msgid "MLST and MLSD are not supported by this site" msgstr "SITE CHMOD n'est pas supportée par ce site" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 msgid "unsupported network protocol" msgstr "protocole non supporté" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "Connexion du socket de données à (%s) port %u" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, fuzzy, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Connexion du socket de données à (%s) port %u" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "Désactivation du mode passif" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 #, fuzzy msgid "Data connection established" msgstr "La connexion de données du tiers a une adresse incorrecte" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "ftp:ssl-force est défini et le serveur ne supporte pas SSL" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "Connexion interrompue par un tiers" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "Persiste et réessaye" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "Fermeture du socket de données" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 #, fuzzy msgid "Closing aborted data socket" msgstr "Fermeture du socket de données" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "taille du fichier détectée dans la réponse" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "réponse du serveur supplémentaire" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "Activation de sync-mode" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "Activation du mode passif" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 #, fuzzy msgid "FEAT negotiation..." msgstr "négociation TLS..." -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "Émission des commandes..." -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "En attente de réponse..." -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 #, fuzzy msgid "Delaying before retry" msgstr "Attente avant reconnexion" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "Connexion stagnante" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "Connexion..." -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "négociation TLS..." -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 msgid "Connected" msgstr "Connecté" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "Login en cours..." -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "Établissement de la connexion de données..." -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "Changement de répertoire distant..." -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 msgid "Waiting for other copy peer..." msgstr "En attente de la copie distante..." -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "En attente de la fin du transfert" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "En attente de la connexion de données..." -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 msgid "Sending data/TLS" msgstr "Émission des données/TLS" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 msgid "Receiving data/TLS" msgstr "Réception des données/TLS" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "Émission des données" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "Réception des données" @@ -1961,7 +1961,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s ok, %d répertoire$ créé|s créés$\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "fichier renommé\n" @@ -2011,52 +2011,52 @@ msgid "POST method failed" msgstr "échec de la méthode POST" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "" "ftp à travers http ne peut travailler sans proxy, définissez hftp:proxy." -#: src/Http.cc:1129 +#: src/Http.cc:1142 msgid "Sending request..." msgstr "Émission des requêtes..." -#: src/Http.cc:1176 +#: src/Http.cc:1189 msgid "Hit EOF while fetching headers" msgstr "Reçu une fin de fichier en lisant les entêtes" -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "Ne peut analyser la ligne d'état HTTP" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 msgid "Receiving body..." msgstr "Réception du corps..." -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "Fin de fichier atteinte" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "Pas assez de données reçues, recommence" -#: src/Http.cc:1599 +#: src/Http.cc:1612 msgid "Received all" msgstr "Tout reçu" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "Tout reçu (total)" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "format en 'chunk' violé" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "Réception des entêtes..." @@ -2085,7 +2085,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Récupération de la liste des fichiers (%lld) [%s]" @@ -2227,48 +2227,48 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "ftp:fxp-force est actif mais l'FXP n'est pas disponible" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, c-format msgid "pipe() failed: %s" msgstr "pipe() a échouée: %s" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, c-format msgid "chdir(%s) failed: %s\n" msgstr "chdir(%s) a échouée: %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "execl(/bin/sh) a échouée: %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "Connexion à %s%s (%s) port %u" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "Temps écoulé - reconnexion" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 msgid "Connection limit reached" msgstr "Limite de connexions atteinte" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "Attente avant reconnexion" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "max-retries atteint" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "Récupération du contenu du répertoire (%lld) %s[%s]" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, c-format msgid "Getting files information (%d%%) [%s]" msgstr "Lecture des informations de fichiers (%d%%) [%s]" Binary files lftp-3.1.0/po/it.gmo and lftp-3.1.1/po/it.gmo differ diff -ruN lftp-3.1.0/po/it.po lftp-3.1.1/po/it.po --- lftp-3.1.0/po/it.po Fri Feb 25 16:13:42 2005 +++ lftp-3.1.1/po/it.po Wed Mar 16 00:15:37 2005 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: lftp 2.2.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 2000-06-18 10:46+02:00\n" "Last-Translator: Giovanni Bortolozzo \n" "Language-Team: Italian \n" @@ -100,46 +100,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "Errore di socket (%s) - riconnessione in corso" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "Accesso fallito: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "Impossibile accedere al file" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "Non connesso" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "Errore fatale: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "Errore fatale" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "Salvataggio fallito - si deve fare reput" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "Login fallito" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "Operazione non supportata" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "" @@ -344,8 +344,8 @@ msgid "invalid pair of numbers" msgstr "numero non valido" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "Risoluzione dell'indirizzo dell'host..." @@ -1676,178 +1676,178 @@ msgid "assuming failed host name lookup" msgstr "dò per fallita la ricerca del nome host" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "Chiusura del socket di controllo" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "Chiusura della connessione inattiva" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 #, fuzzy msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "SITE CHMOD non è supportato da questo sito" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 #, fuzzy msgid "MLSD is disabled by ftp:use-mlsd" msgstr "SITE CHMOD non è supportato da questo sito" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "SITE CHMOD non è supportato da questo sito" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 #, fuzzy msgid "MLST and MLSD are not supported by this site" msgstr "SITE CHMOD non è supportato da questo sito" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 #, fuzzy msgid "unsupported network protocol" msgstr "- protocollo non supportato" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "Connessione del socket dei dati a (%s) porta %u" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, fuzzy, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Connessione del socket dei dati a (%s) porta %u" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "Metto ad off (disabilito) la modalità passiva" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 #, fuzzy msgid "Data connection established" msgstr "" "L'altro estremo della connesione dati ha un indirizzo che non corrisponde" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "Connessione chiusa dal peer" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "Chiusura del socket dati" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 #, fuzzy msgid "Closing aborted data socket" msgstr "Chiusura del socket dati" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "ottenuta in risposta la dimensione del file" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "risposta extra del server" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "Abilito la modalità passiva" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 msgid "FEAT negotiation..." msgstr "" -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "Invio comandi..." -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "In attesa della risposta..." -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 msgid "Delaying before retry" msgstr "" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "Connessione inattiva" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "Connessione in corso..." -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "" -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 #, fuzzy msgid "Connected" msgstr "Non connesso" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "Accesso al server..." -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "Creo la connessione dati..." -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "Cambio la directory remota..." -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 #, fuzzy msgid "Waiting for other copy peer..." msgstr "In attesa della risposta..." -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "Attendo la fine del trasferimento" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "In attesa della connessione dati..." -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 #, fuzzy msgid "Sending data/TLS" msgstr "Sto inviando i dati" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 #, fuzzy msgid "Receiving data/TLS" msgstr "Sto ricevendo i dati" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "Sto inviando i dati" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "Sto ricevendo i dati" @@ -1891,7 +1891,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s ok, create %d directory$|$\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "rinominazione riuscita\n" @@ -1942,55 +1942,55 @@ msgid "POST method failed" msgstr "" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "" -#: src/Http.cc:1129 +#: src/Http.cc:1142 #, fuzzy msgid "Sending request..." msgstr "Invio comandi..." -#: src/Http.cc:1176 +#: src/Http.cc:1189 #, fuzzy msgid "Hit EOF while fetching headers" msgstr "Scarico gli header..." -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 #, fuzzy msgid "Receiving body..." msgstr "Sto ricevendo i dati" -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "" -#: src/Http.cc:1599 +#: src/Http.cc:1612 #, fuzzy msgid "Received all" msgstr "Sto ricevendo i dati" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "violato il formato chunked" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "Scarico gli header..." @@ -2019,7 +2019,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, fuzzy, c-format msgid "Getting file list (%lld) [%s]" msgstr "Scarico la lista dei file (%ld) [%s]" @@ -2159,49 +2159,49 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, fuzzy, c-format msgid "pipe() failed: %s" msgstr "execlp(%s) fallita: %s\n" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, fuzzy, c-format msgid "chdir(%s) failed: %s\n" msgstr "Attenzione: chdir(%s) fallita: %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, fuzzy, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "execlp(%s) fallita: %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, fuzzy, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "Connessione del socket dei dati a (%s) porta %u" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "Timeout - riconnessione in corso" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 #, fuzzy msgid "Connection limit reached" msgstr "Connessione inattiva" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, fuzzy, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "Scarico il contenuto della directory (%ld)" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, fuzzy, c-format msgid "Getting files information (%d%%) [%s]" msgstr "Scarico le informazioni sui file (%d%%)" Binary files lftp-3.1.0/po/ja.gmo and lftp-3.1.1/po/ja.gmo differ diff -ruN lftp-3.1.0/po/ja.po lftp-3.1.1/po/ja.po --- lftp-3.1.0/po/ja.po Fri Feb 25 16:13:42 2005 +++ lftp-3.1.1/po/ja.po Wed Mar 16 00:15:37 2005 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: lftp 2.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 2002-04-12 00:06+0900\n" "Last-Translator: Masayuki Hatta \n" "Language-Team: Japanese \n" @@ -100,46 +100,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "¥½¥±¥Ã¥È¥¨¥é¡¼ (%s) - ºÆÀܳÃæ" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "¥¢¥¯¥»¥¹¼ºÇÔ: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "Àܳ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "Ã×̿Ū¥¨¥é¡¼: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "Ã×̿Ū¥¨¥é¡¼" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "Êݸ¼ºÇÔ - reput ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "¥í¥°¥¤¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "¤½¤ÎÁàºî¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "°ÜÆ°¤µ¤ì¤¿¥Õ¥¡¥¤¥ë: %s" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "¥Õ¥¡¥¤¥ë¤ò `%s' ¤Ø°ÜÆ°¤·¤Þ¤·¤¿" @@ -350,8 +350,8 @@ msgid "invalid pair of numbers" msgstr "ÉÔÀµ¤Ê¿ô" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "¥Û¥¹¥È¥¢¥É¥ì¥¹¤ò²ò·è¤·¤Æ¤¤¤Þ¤¹..." @@ -1709,178 +1709,178 @@ msgid "assuming failed host name lookup" msgstr "¥Û¥¹¥È̾¸¡º÷¤Ë¼ºÇÔ¤·¤¿¤È²¾Äꤷ¤Þ¤¹" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "EPSV ¥ì¥¹¥Ý¥ó¥¹¤ò²òÀϤǤ­¤Þ¤»¤ó" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "¥³¥ó¥È¥í¡¼¥ë¥½¥±¥Ã¥È¤òÊĤ¸¤Æ¤¤¤Þ¤¹" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "¥¢¥¤¥É¥ë¾õÂÖ¤ÎÀܳ¤òÊĤ¸¤Þ¤¹" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 #, fuzzy msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "SITE CHMOD ¤Ï¤³¤Î¥µ¥¤¥È¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 #, fuzzy msgid "MLSD is disabled by ftp:use-mlsd" msgstr "SITE CHMOD ¤Ï¤³¤Î¥µ¥¤¥È¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "¥¢¥É¥ì¥¹¥Õ¥¡¥ß¥ê %d ¤Î¥½¥±¥Ã¥È¤òºî¤ì¤Þ¤»¤ó" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "SITE CHMOD ¤Ï¤³¤Î¥µ¥¤¥È¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 #, fuzzy msgid "MLST and MLSD are not supported by this site" msgstr "SITE CHMOD ¤Ï¤³¤Î¥µ¥¤¥È¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 msgid "unsupported network protocol" msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Í¥Ã¥È¥ï¡¼¥¯¥×¥í¥È¥³¥ë¤Ç¤¹" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "¥Ç¡¼¥¿¥½¥±¥Ã¥È¤ò (%s) ¤Î¥Ý¡¼¥È %u ¤ËÀܳÃæ" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, fuzzy, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "¥Ç¡¼¥¿¥½¥±¥Ã¥È¤ò (%s) ¤Î¥Ý¡¼¥È %u ¤ËÀܳÃæ" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "¥Ñ¥Ã¥·¥ô¥â¡¼¥É¤ò¥ª¥Õ¤ËÀÚ¤êÂؤ¨¤Þ¤·¤¿" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 #, fuzzy msgid "Data connection established" msgstr "¥Ç¡¼¥¿Àܳ¥Ô¥¢¤Î¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Þ¤»¤ó" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" "ftp:ssl-force ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥µ¡¼¥Ð¤Ï SSL ¤ò¥µ¥Ý¡¼¥È¤¢¤ë¤¤¤Ïµö²Ä¤·¤Æ" "¤¤¤Þ¤»¤ó" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "¥Ô¥¢¤¬Àܳ¤òÊĤ¸¤Þ¤·¤¿" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "»ý³Ū¤ËºÆ»î¹Ô¤·¤Þ¤¹" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "¥Ç¡¼¥¿¥½¥±¥Ã¥È¤òÊĤ¸¤Æ¤¤¤Þ¤¹" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 #, fuzzy msgid "Closing aborted data socket" msgstr "¥Ç¡¼¥¿¥½¥±¥Ã¥È¤òÊĤ¸¤Æ¤¤¤Þ¤¹" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "¥ì¥¹¥Ý¥ó¥¹Ãæ¤Ë¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤¬¤¢¤ê¤Þ¤·¤¿" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr ";ʬ¤Ê¥µ¡¼¥Ð¥ì¥¹¥Ý¥ó¥¹¤Ç¤¹" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "sync ¥â¡¼¥É¤òÍ­¸ú¤Ë¤·¤Þ¤·¤¿" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "¥Ñ¥Ã¥·¥ô¥â¡¼¥É¤ò¥ª¥ó¤ËÀÚ¤êÂؤ¨¤Þ¤·¤¿" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 #, fuzzy msgid "FEAT negotiation..." msgstr "TLS ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó..." -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "¥³¥Þ¥ó¥É¤òÁ÷¿®Ãæ..." -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "±þÅú¤òÂԤäƤ¤¤Þ¤¹..." -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 #, fuzzy msgid "Delaying before retry" msgstr "ºÆÀܳ¤òÃٱ䤷¤Æ¤¤¤Þ¤¹" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "Àܳ¥¢¥¤¥É¥ë" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "ÀܳÃæ..." -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "TLS ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó..." -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 msgid "Connected" msgstr "Àܳ¤·¤Þ¤·¤¿" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "¥í¥°¥¤¥ó¤·¤Æ¤¤¤Þ¤¹..." -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "¥Ç¡¼¥¿Àܳ¤ò³ÎΩÃæ..." -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "¥ê¥â¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹Ãæ..." -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 msgid "Waiting for other copy peer..." msgstr "¾¤Î¥³¥Ô¡¼Áê¼ê¤òÂԤäƤ¤¤Þ¤¹..." -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "Á÷¼õ¿®¤Î´°Î»¤òÂԤäƤ¤¤Þ¤¹" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "¥Ç¡¼¥¿Àܳ¤òÂԤäƤ¤¤Þ¤¹..." -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 #, fuzzy msgid "Sending data/TLS" msgstr "¥Ç¡¼¥¿Á÷¿®Ãæ" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 #, fuzzy msgid "Receiving data/TLS" msgstr "¥Ç¡¼¥¿¼õ¿®Ãæ" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "¥Ç¡¼¥¿Á÷¿®Ãæ" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "¥Ç¡¼¥¿¼õ¿®Ãæ" @@ -1924,7 +1924,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s À®¸ù¡¢%d ¸Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¤Þ¤·¤¿\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "¥ê¥Í¡¼¥à¤ËÀ®¸ù¤·¤Þ¤·¤¿\n" @@ -1974,53 +1974,53 @@ msgid "POST method failed" msgstr "POST ¥á¥½¥Ã¥É¼ºÇÔ" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "" "ftp over http ¤Ï¥×¥í¥­¥·Ìµ¤·¤Ç¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£hftp:proxy ¤ò¥»¥Ã¥È¤·¤Æ¤¯¤À¤µ" "¤¤¡£" -#: src/Http.cc:1129 +#: src/Http.cc:1142 msgid "Sending request..." msgstr "¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®Ãæ..." -#: src/Http.cc:1176 +#: src/Http.cc:1189 msgid "Hit EOF while fetching headers" msgstr "¥Ø¥Ã¥À¤Î¼èÆÀÃæ¤Ë EOF ¤Ë㤷¤Þ¤·¤¿" -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "HTTP ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤ò²òÀϤǤ­¤Þ¤»¤ó¤Ç¤·¤¿" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 msgid "Receiving body..." msgstr "¥Ü¥Ç¥£¤ò¼õ¿®Ãæ..." -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "EOF ¤Ë㤷¤Þ¤·¤¿" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "½½Ê¬¤Ê¥Ç¡¼¥¿¤ò¼õ¿®¤Ç¤­¤Ê¤«¤Ã¤¿¤Î¤Ç¡¢ºÆ»î¹Ô¤·¤Þ¤¹" -#: src/Http.cc:1599 +#: src/Http.cc:1612 msgid "Received all" msgstr "¤¹¤Ù¤Æ¼õ¿®¤·¤Þ¤·¤¿" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "¤¹¤Ù¤Æ¼õ¿®¤·¤Þ¤·¤¿ (¹ç·×)" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "chunked ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë°ãÈ¿¤·¤Æ¤¤¤Þ¤¹" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "¥Ø¥Ã¥À¤ò¼èÆÀÃæ..." @@ -2050,7 +2050,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È (%lld) [%s] ¤ò¼èÆÀÃæ" @@ -2198,49 +2198,49 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, c-format msgid "pipe() failed: %s" msgstr "pipe() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, c-format msgid "chdir(%s) failed: %s\n" msgstr "chdir(%s) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "execl (/bin/sh) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "%s%s (%s) ¥Ý¡¼¥È %u ¤ËÀܳÃæ" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "¥¿¥¤¥à¥¢¥¦¥È - ºÆÀܳÃæ" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 #, fuzzy msgid "Connection limit reached" msgstr "Àܳ¿ôÀ©¸Â¤Ë㤷¤Þ¤·¤¿" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "ºÆÀܳ¤òÃٱ䤷¤Æ¤¤¤Þ¤¹" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "ºÇÂçºÆ»î¹Ô²ó¿ô¤òĶ¤¨¤Þ¤·¤¿" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, fuzzy, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "¥Ç¥£¥ì¥¯¥È¥êÆâÍÆ (%lld) ¤ò¼èÆÀÃæ" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, fuzzy, c-format msgid "Getting files information (%d%%) [%s]" msgstr "¥Õ¥¡¥¤¥ë¾ðÊó (%d%%)¤ò¼èÆÀÃæ" Binary files lftp-3.1.0/po/ko.gmo and lftp-3.1.1/po/ko.gmo differ diff -ruN lftp-3.1.0/po/ko.po lftp-3.1.1/po/ko.po --- lftp-3.1.0/po/ko.po Fri Feb 25 16:13:43 2005 +++ lftp-3.1.1/po/ko.po Wed Mar 16 00:15:37 2005 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: lftp 2.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 2001-05-27 KST\n" "Last-Translator: Dojip Kim \n" "Language-Team: \n" @@ -100,46 +100,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "(%s) ¼ÒÄÏ ¿À·ù - ÀçÁ¢¼ÓÁß" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "Á¢¼Ó ½ÇÆÐ: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "ÆÄÀÏÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "Á¢¼ÓµÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "Ä¡¸íÀû ¿À·ù: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "Ä¡¸íÀû ¿À·ù" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "ÀúÀå ½ÇÆÐ - ´Ù½Ã ÀÔ·ÂÇϽʽÿÀ" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "·Î±×ÀÎ ½ÇÆÐ" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "Áö¿øµÇÁö ¾Ê´Â ¿ÀÆÛ·¹À̼ÇÀÔ´Ï´Ù" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "ÆÄÀÏ À̵¿: %s" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "`%s'·Î ÆÄÀÏ À̵¿" @@ -344,8 +344,8 @@ msgid "invalid pair of numbers" msgstr "À߸øµÈ ¼öÀÔ´Ï´Ù" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "È£½ºÆ® ÁÖ¼Ò¸¦ ã½À´Ï´Ù..." @@ -1637,176 +1637,176 @@ msgid "assuming failed host name lookup" msgstr "È£½ºÆ® À̸§À» ã´Âµ¥ ½ÇÆÐÇÑ µí ÇÕ´Ï´Ù" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "Á¦¾î ¼ÒÄÏ ´ÝÀ½" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "»ç¿ëÇÏÁö ¾Ê´Â Á¢¼ÓÀ» ²÷½À´Ï´Ù" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 msgid "MLSD is disabled by ftp:use-mlsd" msgstr "" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "ÁÖ¼Ò %dÀÇ ¼ÒÄÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 #, fuzzy msgid "MLST and MLSD are not supported by this site" msgstr "¸ðµâÀº ÀÌ ½Ã½ºÅÛ¿¡¼­ Áö¿øµÇÁö ¾ÊÀ½" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 msgid "unsupported network protocol" msgstr "Áö¿øÇÏÁö ¾Ê´Â ³×Æ®¿öÅ© ÇÁ·ÎÅäÄÝÀÔ´Ï´Ù" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "(%s) Æ÷Æ® %u¿¡ ÀÚ·á ¼ÒÄÏÀ» ¿¬°áÇÕ´Ï´Ù" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, fuzzy, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "(%s) Æ÷Æ® %u¿¡ ÀÚ·á ¼ÒÄÏÀ» ¿¬°áÇÕ´Ï´Ù" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "Æнúê(passive) ¸ðµå ²û" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 #, fuzzy msgid "Data connection established" msgstr "Á¢¼ÓÀÌ À߸øµÈ ÁÖ¼Ò·Î µÈ µí ÇÕ´Ï´Ù" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" "ftp:ssl-force°¡ ¼³Á¤µÇ¾îÀÖÁö¸¸ ¼­¹ö°¡ Áö¿øÇÏÁö ¾Ê°Å³ª SSLÀ» Çã¿ëÇÏÁö ¾ÊÀ½" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "Á¢¼ÓÀÌ ²÷°å½À´Ï´Ù" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "°è¼Ó Àç½ÃµµÇÔ" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "µ¥ÀÌÅÍ ¼ÒÄÏ ´ÝÀ½" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 #, fuzzy msgid "Closing aborted data socket" msgstr "µ¥ÀÌÅÍ ¼ÒÄÏ ´ÝÀ½" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "ÀÀ´ä¿¡¼­ ÆÄÀÏ Å©±â¸¦ º¾´Ï´Ù" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "Àӽà ¼­¹ö ÀÀ´ä" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "µ¿±â ¸ðµå·Î Àüȯ" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "Æнúê(passive) ¸ðµå·Î Àüȯ" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 #, fuzzy msgid "FEAT negotiation..." msgstr "TLS Çù»óÁß..." -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "¸í·É¾î Àü¼ÛÁß..." -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "ÀÀ´äÀ» ±â´Ù¸³´Ï´Ù..." -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 #, fuzzy msgid "Delaying before retry" msgstr "ÀçÁ¢¼ÓÇϱâ À§ÇÏ¿© ±â´Ù¸³´Ï´Ù" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "»ç¿ëÇÏÁö ¾Ê´Â Á¢¼Ó" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "Á¢¼ÓÁß..." -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "TLS Çù»óÁß..." -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 msgid "Connected" msgstr "Á¢¼ÓµÇ¾úÀ½" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "·Î±×ÀÎ Áß..." -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "Á¢¼Ó ÇÏ´Â Áß..." -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "¿ø°Å¸® µð·ºÅ丮 º¯°æÁß..." -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 #, fuzzy msgid "Waiting for other copy peer..." msgstr "ÀÀ´äÀ» ±â´Ù¸³´Ï´Ù..." -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "Àü¼Û ¿Ï·á¸¦ ±â´Ù¸³´Ï´Ù" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "Á¢¼ÓÀ» ±â´Ù¸®´Â Áß..." -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 #, fuzzy msgid "Sending data/TLS" msgstr "ÀÚ·á º¸³»´Â Áß" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 #, fuzzy msgid "Receiving data/TLS" msgstr "ÀÚ·á ¹Þ´Â Áß" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "ÀÚ·á º¸³»´Â Áß" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "ÀÚ·á ¹Þ´Â Áß" @@ -1850,7 +1850,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s ¼º°ø, %d director$y|ies$ »ý¼º\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "À̸§º¯°æ ¼º°ø\n" @@ -1900,52 +1900,52 @@ msgid "POST method failed" msgstr "POST ¸Þ¼Òµå ½ÇÆÐ" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "" "http»óÀÇ ftp´Â ÇÁ¶ô½Ã ¾øÀÌ´Â µ¿ÀÛÇÒ ¼ö ¾ø½À´Ï´Ù, http:proxy¸¦ ¼³Á¤Çϼ¼¿ä" -#: src/Http.cc:1129 +#: src/Http.cc:1142 msgid "Sending request..." msgstr "request º¸³»´Â Áß..." -#: src/Http.cc:1176 +#: src/Http.cc:1189 msgid "Hit EOF while fetching headers" msgstr "Çì´õ¸¦ ÀÐ¾î ¿À´Â µ¿¾È EOF¸¦ ÀÔ·Â" -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "HTTP »óŸ¦ ÆĽÌÇÒ ¼ö ¾øÀ½" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 msgid "Receiving body..." msgstr "body¸¦ ¹ÞÀº Áß..." -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "ÃæºÐÇÑ ÀڷḦ ¹ÞÁö ¸øÇØ ´Ù½Ã ½ÃµµÁß" -#: src/Http.cc:1599 +#: src/Http.cc:1612 msgid "Received all" msgstr "¸ðµÎ ¹Þ¾ÒÀ½" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "¸ðµÎ(Àüü) ¹ÞÀ½" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "¾²Áö ¾Ê´Â ¾ç½ÄÀÌ ¹®Á¦°¡ µË´Ï´Ù" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "Çì´õ¸¦ Àаí ÀÖ´ÂÁß.." @@ -1974,7 +1974,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "ÆÄÀÏ ¸ñ·ÏÀ» °¡Á®¿É´Ï´Ù (%lld) [%s]" @@ -2116,49 +2116,49 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, c-format msgid "pipe() failed: %s" msgstr "pipe() ½ÇÆÐ: %s" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, c-format msgid "chdir(%s) failed: %s\n" msgstr "chdir(%s) ½ÇÆÐ: %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "execl(/bin/sh) ½ÇÆÐ: %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "%s%s (%s) Æ÷Æ® %u¿¡ ¿¬°á Áß" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "½Ã°£ÃÊ°ú - ÀçÁ¢¼Ó" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 #, fuzzy msgid "Connection limit reached" msgstr "Á¢¼Ó Á¦ÇѱîÁö °¬½À´Ï´Ù" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "ÀçÁ¢¼ÓÇϱâ À§ÇÏ¿© ±â´Ù¸³´Ï´Ù" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "ÃÖ´ë-Àç½Ãµµ¸¦ ÃÊ°úÇß½À´Ï´Ù" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, fuzzy, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "µð·ºÅ丮 Á¤º¸¸¦ °¡Á®¿À´Â Áß (%lld)" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, fuzzy, c-format msgid "Getting files information (%d%%) [%s]" msgstr "ÆÄÀÏ Á¤º¸¸¦ °¡Á®¿À´Â Áß (%d%%)" diff -ruN lftp-3.1.0/po/lftp.pot lftp-3.1.1/po/lftp.pot --- lftp-3.1.0/po/lftp.pot Fri Feb 25 16:13:38 2005 +++ lftp-3.1.1/po/lftp.pot Wed Mar 16 00:15:35 2005 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -102,46 +102,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "" @@ -343,8 +343,8 @@ msgid "invalid pair of numbers" msgstr "" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "" @@ -1443,167 +1443,167 @@ msgid "assuming failed host name lookup" msgstr "" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 msgid "MLSD is disabled by ftp:use-mlsd" msgstr "" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 msgid "MLST and MLSD are not supported by this site" msgstr "" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 msgid "unsupported network protocol" msgstr "" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 msgid "Data connection established" msgstr "" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 msgid "Closing aborted data socket" msgstr "" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 msgid "FEAT negotiation..." msgstr "" -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "" -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "" -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 msgid "Delaying before retry" msgstr "" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "" -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "" -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 msgid "Connected" msgstr "" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "" -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "" -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "" -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 msgid "Waiting for other copy peer..." msgstr "" -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "" -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 msgid "Sending data/TLS" msgstr "" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 msgid "Receiving data/TLS" msgstr "" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "" @@ -1647,7 +1647,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "" @@ -1697,51 +1697,51 @@ msgid "POST method failed" msgstr "" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "" -#: src/Http.cc:1129 +#: src/Http.cc:1142 msgid "Sending request..." msgstr "" -#: src/Http.cc:1176 +#: src/Http.cc:1189 msgid "Hit EOF while fetching headers" msgstr "" -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 msgid "Receiving body..." msgstr "" -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "" -#: src/Http.cc:1599 +#: src/Http.cc:1612 msgid "Received all" msgstr "" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "" @@ -1770,7 +1770,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "" @@ -1909,48 +1909,48 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, c-format msgid "pipe() failed: %s" msgstr "" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, c-format msgid "chdir(%s) failed: %s\n" msgstr "" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 msgid "Connection limit reached" msgstr "" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, c-format msgid "Getting files information (%d%%) [%s]" msgstr "" Binary files lftp-3.1.0/po/pl.gmo and lftp-3.1.1/po/pl.gmo differ diff -ruN lftp-3.1.0/po/pl.po lftp-3.1.1/po/pl.po --- lftp-3.1.0/po/pl.po Fri Feb 25 16:13:43 2005 +++ lftp-3.1.1/po/pl.po Wed Mar 16 00:15:38 2005 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: lftp 3.0.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 2004-12-04 17:20+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -103,46 +103,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "B³±d po³±czenia (%s) - powtórne ³±czenie" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "Brak dostêpu: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "Brak dostêpu do pliku" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "Nie po³±czony" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "B³±d krytyczny: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "B³±d krytyczny" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "Zapis siê nie powiód³ - trzeba u¿yæ reput" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "Logowanie nie uda³o siê" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "Operacja jest niedostêpna" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "Plik przeniesiony: %s" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "Plik przeniesiony do `%s'" @@ -356,8 +356,8 @@ msgid "invalid pair of numbers" msgstr "nieprawid³owa para liczb" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "Uzyskiwanie adresu hosta..." @@ -1765,170 +1765,170 @@ msgid "assuming failed host name lookup" msgstr "przypuszczalnie nie powiod³o siê wyszukiwanie IP hosta" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "nie mo¿na przeanalizowaæ odpowiedzi EPSV" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "Zamykanie gniazda steruj±cego" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "Zamykanie bezczynnego po³±czenia" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "SITE CHMOD jest zablokowane przez ftp:use-site-chmod" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 msgid "MLSD is disabled by ftp:use-mlsd" msgstr "MLSD jest zablokowane przez ftp:use-mlsd" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "nie mo¿na utworzyæ gniazda dla rodziny adresu %d" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "SITE CHMOD nie jest obs³ugiwane przez ten serwer" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 msgid "MLST and MLSD are not supported by this site" msgstr "MLST i MLSD nie s± obs³ugiwane przez ten serwer" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 msgid "unsupported network protocol" msgstr "protokó³ nie jest obs³ugiwany" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "£±czenie siê (gniazdo danych) z (%s) port %u" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "£±czenie siê (gniazdo danych) z proxy %s (%s) port %u" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "Wy³±czam tryb pasywny" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 #, fuzzy msgid "Data connection established" msgstr "Po³±czenie dla danych ma nieprawid³owy adres" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" "ftp:ssl-force jest ustawione i serwer nie wspiera lub nie zezwala\n" "na po³±czenia SSL" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "Komputer po drugiej stronie zamkn±³ po³±czenie" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "Ponowne wznawianie" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "Zamykanie gniazda danych" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 msgid "Closing aborted data socket" msgstr "Zamykanie gniazda danych po przerwaniu" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "w odpowiedzi pojawi³ siê rozmiar pliku" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "dodatkowa odpowied¼ serwera" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "W³±czanie trybu sync" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "W³±czam tryb pasywny" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 msgid "FEAT negotiation..." msgstr "Negocjacja FEAT..." -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "Wysy³anie komend..." -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "Czekanie na odpowied¼..." -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 msgid "Delaying before retry" msgstr "Opó¼nienie przed ponownym po³±czeniem" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "Po³±czenie bezczynne" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "£±czenie siê..." -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "Negocjacja TLS..." -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 msgid "Connected" msgstr "Po³±czono" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "Logowanie siê..." -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "Ustanawianie po³±czenia dla danych..." -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "Zmiana zdalnego katalogu..." -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 msgid "Waiting for other copy peer..." msgstr "Oczekiwanie na inne kopiowanie..." -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "Oczekiwanie na zakoñczenie transferu" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "Czekam na po³±czenie dla danych..." -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 msgid "Sending data/TLS" msgstr "Wysy³am dane/TLS" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 msgid "Receiving data/TLS" msgstr "Otrzymujê dane/TLS" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "Wysy³am dane" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "Otrzymujê dane" @@ -1972,7 +1972,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s ok, utworzono %d katalog$|i|ów$\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "zmiana nazwy powiod³a siê\n" @@ -2022,51 +2022,51 @@ msgid "POST method failed" msgstr "nie powiod³a siê metoda POST" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "ftp poprzez http mo¿e nie dzia³aæ bez proxy, ustaw hftp:proxy" -#: src/Http.cc:1129 +#: src/Http.cc:1142 msgid "Sending request..." msgstr "Wysy³anie ¿±dania..." -#: src/Http.cc:1176 +#: src/Http.cc:1189 msgid "Hit EOF while fetching headers" msgstr "Natrafiono na EOF podczas przesy³ania nag³ówków" -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "Nie mo¿na zanalizowaæ linii statusu HTTP" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "Obiekt nie jest zapamiêtany a http:cache-control ma only-if-cache" -#: src/Http.cc:1459 +#: src/Http.cc:1472 msgid "Receiving body..." msgstr "Otrzymujê dane..." -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "Natrafiono na EOF" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "Przes³anie nie wystarczaj±c± ilo¶æ danych, próbujê ponownie" -#: src/Http.cc:1599 +#: src/Http.cc:1612 msgid "Received all" msgstr "Przes³ano wszystko" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "Przes³ano wszystko (ca³o¶æ)" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "naruszony format" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "Przesy³am nag³ówki..." @@ -2095,7 +2095,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "musi byæ jednym z: C, S, E, P lub puste" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Pobieranie listy plików (%lld) [%s]" @@ -2237,48 +2237,48 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "ftp:fxp-force jest ustawione, ale FXP jest niedostêpne" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, c-format msgid "pipe() failed: %s" msgstr "pipe() nie powiod³o siê: %s" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, c-format msgid "chdir(%s) failed: %s\n" msgstr "chdir(%s) nie powiod³o siê: %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "execlp(/bin/sh) nieudane: %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "£±czenie siê z %s%s (%s) port %u" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "Przekroczony limit czasu - ³±czê siê ponownie" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 msgid "Connection limit reached" msgstr "Osi±gniêto limit po³±czeñ" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "Przerwa przed ponownym po³±czeniem" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "przekroczona maksymalna liczba prób" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "Pobieranie informacji o zawarto¶ci katalogu (%lld) %s[%s]" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, c-format msgid "Getting files information (%d%%) [%s]" msgstr "Pobieranie informacji o plikach (%d%%) [%s]" Binary files lftp-3.1.0/po/pt_BR.gmo and lftp-3.1.1/po/pt_BR.gmo differ diff -ruN lftp-3.1.0/po/pt_BR.po lftp-3.1.1/po/pt_BR.po --- lftp-3.1.0/po/pt_BR.po Fri Feb 25 16:13:44 2005 +++ lftp-3.1.1/po/pt_BR.po Wed Mar 16 00:15:38 2005 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: lftp 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 1999-07-12 00:00+0400\n" "Last-Translator: Arnaldo Carvalho de Melo \n" "Language-Team: pt_BR \n" @@ -99,46 +99,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "Erro no socket (%s) - reconectando" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "Falha no acesso: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "Arquivo não pode ser acessado" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "Não conectado" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "Erro fatal: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "Erro fatal" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "Falha no armazenamento - você terá que reenviar" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "Falha na conexão" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "Operação não suportada" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "" @@ -345,8 +345,8 @@ msgid "invalid pair of numbers" msgstr "número inválido" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "" @@ -1556,169 +1556,169 @@ msgid "assuming failed host name lookup" msgstr "" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 msgid "MLSD is disabled by ftp:use-mlsd" msgstr "" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 msgid "MLST and MLSD are not supported by this site" msgstr "" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 #, fuzzy msgid "unsupported network protocol" msgstr "%s: %s - protocolo não suportado\n" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 msgid "Data connection established" msgstr "" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 msgid "Closing aborted data socket" msgstr "" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 msgid "FEAT negotiation..." msgstr "" -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "" -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "" -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 msgid "Delaying before retry" msgstr "" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "" -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "" -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 #, fuzzy msgid "Connected" msgstr "Não conectado" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "" -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "" -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "" -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 msgid "Waiting for other copy peer..." msgstr "" -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "" -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 msgid "Sending data/TLS" msgstr "" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 msgid "Receiving data/TLS" msgstr "" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "" @@ -1762,7 +1762,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s: nenhum arquivo encontrado\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "" @@ -1813,51 +1813,51 @@ msgid "POST method failed" msgstr "" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "" -#: src/Http.cc:1129 +#: src/Http.cc:1142 msgid "Sending request..." msgstr "" -#: src/Http.cc:1176 +#: src/Http.cc:1189 msgid "Hit EOF while fetching headers" msgstr "" -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 msgid "Receiving body..." msgstr "" -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "" -#: src/Http.cc:1599 +#: src/Http.cc:1612 msgid "Received all" msgstr "" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "" @@ -1886,7 +1886,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, fuzzy, c-format msgid "Getting file list (%lld) [%s]" msgstr "\tExecutando comando embutido `%s' [%s]\n" @@ -2026,48 +2026,48 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, fuzzy, c-format msgid "pipe() failed: %s" msgstr "falha em execlp(%s): %s\n" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, fuzzy, c-format msgid "chdir(%s) failed: %s\n" msgstr "Atenção: chdir() falhou: %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, fuzzy, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "falha em execlp(%s): %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 msgid "Connection limit reached" msgstr "" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, fuzzy, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "Buscando conteúdo do diretório (%ld)" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, fuzzy, c-format msgid "Getting files information (%d%%) [%s]" msgstr "Buscando informações dos arquivos (%d%%)" Binary files lftp-3.1.0/po/ru.gmo and lftp-3.1.1/po/ru.gmo differ diff -ruN lftp-3.1.0/po/ru.po lftp-3.1.1/po/ru.po --- lftp-3.1.0/po/ru.po Fri Feb 25 16:13:44 2005 +++ lftp-3.1.1/po/ru.po Wed Mar 16 00:15:38 2005 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lftp 2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 2000-09-07 09:36+08:00\n" "Last-Translator: Alexander V. Lukyanov \n" "Language-Team: Russian \n" @@ -101,46 +101,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "ïÛÉÂËÁ ÎÁ ÓÏËÅÔÅ (%s) - ÐÏ×ÔÏÒÎÏÅ ÓÏÅÄÉÎÅÎÉÅ" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "ïÛÉÂËÁ ÄÏÓÔÕÐÁ: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "äÏÓÔÕÐ Ë ÆÁÊÌÕ ÎÅ×ÏÚÍÏÖÅÎ" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "îÅÔ ÓÏÅÄÉÎÅÎÉÑ" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "æÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "æÁÔÁÌØÎÁÑ ÏÛÉÂËÁ" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "ðÅÒÅÄÁÞÁ ÆÁÊÌÁ ÎÅ ×ÙÐÏÌÎÅÎÁ - ÔÒÅÂÕÅÔÓÑ ×ÏÚÏÂÎÏ×ÌÅÎÉÅ (reput)" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "ïÛÉÂËÁ ÒÅÇÉÓÔÒÁÃÉÉ" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "ïÐÅÒÁÃÉÑ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "æÁÊÌ ÐÅÒÅÍÅÓÔÉÌÓÑ: %s" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "æÁÊÌ ÐÅÒÅÍÅÓÔÉÌÓÑ × `%s'" @@ -347,8 +347,8 @@ msgid "invalid pair of numbers" msgstr "ÎÅ×ÅÒÎÏ ÕËÁÚÁÎÁ ÐÁÒÁ ÞÉÓÅÌ" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÁÄÒÅÓÁ ÓÅÒ×ÅÒÁ..." @@ -1680,175 +1680,175 @@ msgid "assuming failed host name lookup" msgstr "ÐÏÄÒÁÚÕÍÅ×ÁÅÔÓÑ ÏÛÉÂËÁ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ÁÄÒÅÓÁ ÍÁÛÉÎÙ" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÏÔ×ÅÔ ÎÁ EPSV" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "úÁËÒÙÔÉÅ ÕÐÒÁ×ÌÑÀÝÅÇÏ ÓÏÅÄÉÎÅÎÉÑ" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "úÁËÒÙÔÉÅ ÎÅÉÓÐÏÌØÚÕÅÍÏÇÏ ÓÏÅÄÉÎÅÎÉÑ" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "SITE CHMOD ÚÁÐÒÅÝÅÎÏ ÎÁÓÔÒÏÊËÏÊ ftp:use-site-chmod" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 #, fuzzy msgid "MLSD is disabled by ftp:use-mlsd" msgstr "SITE CHMOD ÚÁÐÒÅÝÅÎÏ ÎÁÓÔÒÏÊËÏÊ ftp:use-site-chmod" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÏËÅÔ ÄÌÑ ÓÅÍÅÊÓÔ×Á ÁÄÒÅÓÏ× %d" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "SITE CHMOD ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÜÔÉÍ ÓÅÒ×ÅÒÏÍ" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 #, fuzzy msgid "MLST and MLSD are not supported by this site" msgstr "SITE CHMOD ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÜÔÉÍ ÓÅÒ×ÅÒÏÍ" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 msgid "unsupported network protocol" msgstr "ÓÅÔÅ×ÏÊ ÐÒÏÔÏËÏÌ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "óÏÅÄÉÎÅÎÉÅ ÓÏËÅÔÁ ÄÁÎÎÙÈ Ó (%s), ÐÏÒÔ %u" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, fuzzy, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "óÏÅÄÉÎÅÎÉÅ ÓÏËÅÔÁ ÄÁÎÎÙÈ Ó (%s), ÐÏÒÔ %u" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "ïÔËÌÀÞÅÎÉÅ ÐÁÓÓÉ×ÎÏÇÏ ÒÅÖÉÍÁ" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 #, fuzzy msgid "Data connection established" msgstr "ëÁÎÁÌ ÄÁÎÎÙÈ ÉÍÅÅÔ ÕÄÁÌÅÎÎÙÊ ÁÄÒÅÓ, ÎÅ ÓÏ×ÐÁÄÁÀÝÉÊ Ó ÏÖÉÄÁÅÍÙÍ" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" "ftp:ssl-force ÕÓÔÁÎÏ×ÌÅÎÏ, Á ÓÅÒ×ÅÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÉÌÉ ÎÅ ÐÏÚ×ÏÌÑÅÔ " "ÉÓÐÏÌØÚÏ×ÁÔØ SSL" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "óÏÅÄÉÎÅÎÉÅ ÚÁËÒÙÔÏ ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÏÊ" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "îÁÚÏÊÌÉ×Ï ÐÏÐÒÏÂÕÅÍ ÅÝÅ ÒÁÚ" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "úÁËÒÙÔÉÅ ÓÏÅÄÉÎÅÎÉÑ ÄÁÎÎÙÈ" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 #, fuzzy msgid "Closing aborted data socket" msgstr "úÁËÒÙÔÉÅ ÓÏÅÄÉÎÅÎÉÑ ÄÁÎÎÙÈ" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "ÚÁÍÅÞÅÎ ÒÁÚÍÅÒ ÆÁÊÌÁ × ÏÔ×ÅÔÅ ÓÅÒ×ÅÒÁ" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "ÎÅÐÒÅÄ×ÉÄÅÎÎÙÊ ÏÔ×ÅÔ ÓÅÒ×ÅÒÁ" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "÷ËÌÀÞÅÎÉÅ ÓÉÎÈÒÏÎÎÏÇÏ ÒÅÖÉÍÁ" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "÷ËÌÀÞÅÎÉÅ ÐÁÓÓÉ×ÎÏÇÏ ÒÅÖÉÍÁ" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 #, fuzzy msgid "FEAT negotiation..." msgstr "óÏÇÌÁÓÏ×ÁÎÉÅ TLS..." -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "ðÅÒÅÄÁÞÁ ËÏÍÁÎÄ..." -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "ïÖÉÄÁÎÉÅ ÏÔ×ÅÔÁ..." -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 #, fuzzy msgid "Delaying before retry" msgstr "úÁÄÅÒÖËÁ ÐÅÒÅÄ ÐÏ×ÔÏÒÎÙÍ ÓÏÅÄÉÎÅÎÉÅÍ" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "óÏÅÄÉÎÅÎÉÅ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "õÓÔÁÎÏ×ËÁ ÓÏÅÄÉÎÅÎÉÑ..." -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "óÏÇÌÁÓÏ×ÁÎÉÅ TLS..." -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 msgid "Connected" msgstr "óÏÅÄÉÎÅÎ" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "òÅÇÉÓÔÒÁÃÉÑ..." -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "õÓÔÁÎÏ×ËÁ ÓÏÅÄÉÎÅÎÉÑ ÄÁÎÎÙÈ..." -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "óÍÅÎÁ ËÁÔÁÌÏÇÁ ÎÁ ÓÅÒ×ÅÒÅ..." -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 msgid "Waiting for other copy peer..." msgstr "ïÖÉÄÁÎÉÅ ÇÏÔÏ×ÎÏÓÔÉ ÄÒÕÇÏÊ ÓÔÏÒÏÎÙ..." -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "ïÖÉÄÁÎÉÅ ÏËÏÎÞÁÎÉÑ ÐÅÒÅÓÙÌËÉ" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "ïÖÉÄÁÎÉÅ ÕÓÔÁÎÏ×ËÉ ÓÏÅÄÉÎÅÎÉÑ ÄÁÎÎÙÈ..." -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 msgid "Sending data/TLS" msgstr "ïÔÐÒÁ×ËÁ ÄÁÎÎÙÈ/TLS" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 msgid "Receiving data/TLS" msgstr "ðÏÌÕÞÅÎÉÅ ÄÁÎÎÙÈ/TLS" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "ïÔÐÒÁ×ËÁ ÄÁÎÎÙÈ" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "ðÏÌÕÞÅÎÉÅ ÄÁÎÎÙÈ" @@ -1892,7 +1892,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s ok, %d ËÁÔÁÌÏÇ$|Á|Ï×$ ÓÏÚÄÁÎÏ\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "ÐÅÒÅÉÍÅÎÏ×ÁÎÉÅ ×ÙÐÏÌÎÅÎÏ ÕÓÐÅÛÎÏ\n" @@ -1942,52 +1942,52 @@ msgid "POST method failed" msgstr "íÅÔÏÄ POST ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "" "ftp ÞÅÒÅÚ http ÐÒÏËÓÉ ÎÅ ÍÏÖÅÔ ÒÁÂÏÔÁÔØ ÂÅÚ ÐÒÏËÓÉ, ÕÓÔÁÎÏ×ÉÔÅ hftp:proxy." -#: src/Http.cc:1129 +#: src/Http.cc:1142 msgid "Sending request..." msgstr "ðÅÒÅÄÁÞÁ ÚÁÐÒÏÓÁ..." -#: src/Http.cc:1176 +#: src/Http.cc:1189 msgid "Hit EOF while fetching headers" msgstr "ðÏÌÕÞÉÌ ËÏÎÅà ÆÁÊÌÁ (EOF) ÐÒÉ ÞÔÅÎÉÉ ÚÁÇÏÌÏ×ËÏ×" -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÓÔÒÏËÕ ÓÔÁÔÕÓÁ HTTP" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 msgid "Receiving body..." msgstr "ðÏÌÕÞÅÎÉÅ ÔÅÌÁ ÏÔ×ÅÔÁ..." -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "ëÏÎÅà ÆÁÊÌÁ" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "ðÏÌÕÞÅÎÏ ÎÅ ÄÏÓÔÁÔÏÞÎÏ ÄÁÎÎÙÈ - ÐÏ×ÔÏÒÎÁÑ ÐÏÐÙÔËÁ." -#: src/Http.cc:1599 +#: src/Http.cc:1612 msgid "Received all" msgstr "÷ÓÅ ÄÁÎÎÙÅ ÐÏÌÕÞÅÎÙ" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "÷ÓÅ ÄÁÎÎÙÅ ÐÏÌÕÞÅÎÙ (ÓÏ×ÓÅÍ ×ÓÅ)" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "ÆÏÒÍÁÔ ÄÁÎÎÙÈ `chunked' ÎÁÒÕÛÅÎ" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "ðÏÌÕÞÅÎÉÅ ÚÁÇÏÌÏ×ËÏ× HTTP..." @@ -2016,7 +2016,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÆÁÊÌÏ× (%lld) [%s]" @@ -2157,48 +2157,48 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "ftp:fxp-force ÕÓÔÁÎÏ×ÌÅÎ, ÎÏ FXP ÎÅ ÕÄÁÌÏÓØ ÉÓÐÏÌØÚÏ×ÁÔØ" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, c-format msgid "pipe() failed: %s" msgstr "ÆÕÎËÃÉÑ pipe() ÎÅ ×ÙÐÏÌÎÅÎÁ: %s" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, c-format msgid "chdir(%s) failed: %s\n" msgstr "ÆÕÎËÃÉÑ chdir(%s) ÎÅ ×ÙÐÏÌÎÅÎÁ: %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "ÆÕÎËÃÉÑ execl(/bin/sh) ÎÅ ×ÙÐÏÌÎÅÎÁ: %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "óÏÅÄÉÎÅÎÉÅ Ó %s%s (%s), ÐÏÒÔ %u" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "ðÒÅ×ÙÛÅÎÉÅ ÌÉÍÉÔÁ ×ÒÅÍÅÎÉ ÏÖÉÄÁÎÉÑ - ÐÏ×ÔÏÒÎÏÅ ÓÏÅÄÉÎÅÎÉÅ" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 msgid "Connection limit reached" msgstr "äÏÓÔÉÇÎÕÔ ÐÒÅÄÅÌ ËÏÌÉÞÅÓÔ×Á ÓÏÅÄÉÎÅÎÉÊ" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "úÁÄÅÒÖËÁ ÐÅÒÅÄ ÐÏ×ÔÏÒÎÙÍ ÓÏÅÄÉÎÅÎÉÅÍ" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "ÐÒÅ×ÙÛÅÎ ÌÉÍÉÔ ËÏÌÉÞÅÓÔ×Á ÐÏÐÙÔÏË (max-retries)" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "ðÏÌÕÞÅÎÉÅ ÓÏÄÅÒÖÉÍÏÇÏ ËÁÔÁÌÏÇÁ (%lld) %s[%s]" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, c-format msgid "Getting files information (%d%%) [%s]" msgstr "ðÏÌÕÞÅÎÉÅ ÉÎÆÏÒÍÁÃÉÉ Ï ÆÁÊÌÁÈ (%d%%) [%s]" Binary files lftp-3.1.0/po/zh_CN.gmo and lftp-3.1.1/po/zh_CN.gmo differ diff -ruN lftp-3.1.0/po/zh_CN.po lftp-3.1.1/po/zh_CN.po --- lftp-3.1.0/po/zh_CN.po Fri Feb 25 16:13:44 2005 +++ lftp-3.1.1/po/zh_CN.po Wed Mar 16 00:15:39 2005 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lftp-2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 1999-09-10 00:50+0800\n" "Last-Translator: Wang Jian \n" "Language-Team: zh \n" @@ -101,46 +101,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "Socket ´íÎó (%s) - ÖØÐÂÁ¬½Ó" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "·ÃÎÊʧ°Ü: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "²»ÄÜ·ÃÎÊÎļþ" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "ûÓÐÁ¬½ÓÉÏ" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "ÑÏÖØ´íÎó: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "ÑÏÖØ´íÎó" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "±£´æʧ°Ü - Äã±ØÐëÖØÐÂÉÏ´«" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "µÇ¼ʧ°Ü" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "²»Ö§³ÖµÄ²Ù×÷" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "" @@ -347,8 +347,8 @@ msgid "invalid pair of numbers" msgstr "ÎÞЧµÄÊý×Ö" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "ÕýÔÚ½âÎöÖ÷»úµØÖ·..." @@ -1621,176 +1621,176 @@ msgid "assuming failed host name lookup" msgstr "Ãû×Ö²éѯʧ°Ü" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "¹Ø±Õ¿ØÖÆÁ¬½Ó" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "¹Ø±Õ·¢´ôµÄÁ¬½Ó" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 msgid "MLSD is disabled by ftp:use-mlsd" msgstr "" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 msgid "MLST and MLSD are not supported by this site" msgstr "" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 #, fuzzy msgid "unsupported network protocol" msgstr "%s: %s - ²»Ö§³ÖµÄЭÒé\n" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "ÕýÔÚ½¨Á¢Êý¾ÝÁ¬½Óµ½ (%s) ¶Ë¿Ú %u" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, fuzzy, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "ÕýÔÚ½¨Á¢Êý¾ÝÁ¬½Óµ½ (%s) ¶Ë¿Ú %u" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "ÕýÔڹرձ»¶¯Ä£Ê½" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 #, fuzzy msgid "Data connection established" msgstr "Êý¾ÝÁ¬½Ó¶Ô¶ËµÄµØÖ·²»¶Ô" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "¶Ô¶Ë¹Ø±ÕÁ¬½Ó" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "¹Ø±ÕÊý¾ÝÁ¬½Ó" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 #, fuzzy msgid "Closing aborted data socket" msgstr "¹Ø±ÕÊý¾ÝÁ¬½Ó" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "¿´µ½Ó¦´ðÖеÄÎļþ´óС" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "¶îÍâµÄ·þÎñÆ÷Ó¦´ð" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 #, fuzzy msgid "Switching passive mode on" msgstr "ÕýÔڹرձ»¶¯Ä£Ê½" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 msgid "FEAT negotiation..." msgstr "" -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "ÕýÔÚ·¢ËÍÃüÁî..." -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "ÕýµÈ´ýÓ¦´ð..." -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 #, fuzzy msgid "Delaying before retry" msgstr "ÖØÐÂÁ¬½ÓÇ°ÑÓʱ" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "Á¬½Ó¿ÕÏÐ" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "ÕýÔÚÁ¬½Ó..." -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "" -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 #, fuzzy msgid "Connected" msgstr "ûÓÐÁ¬½ÓÉÏ" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "ÕýÔڵǼ..." -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "ÕýÔÚ½¨Á¢Êý¾ÝÁ¬½Ó..." -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "ÕýÔڸıäÔ¶³ÌĿ¼..." -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 #, fuzzy msgid "Waiting for other copy peer..." msgstr "ÕýµÈ´ýÓ¦´ð..." -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "ÕýµÈ´ý´«ÊäÍê³É" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "ÕýµÈ´ýÊý¾ÝÁ¬½Ó..." -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 #, fuzzy msgid "Sending data/TLS" msgstr "Õý·¢ËÍÊý¾Ý" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 #, fuzzy msgid "Receiving data/TLS" msgstr "Õý½ÓÊÕÊý¾Ý" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "Õý·¢ËÍÊý¾Ý" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "Õý½ÓÊÕÊý¾Ý" @@ -1834,7 +1834,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s ³É¹¦, ½¨Á¢ %d ¸öĿ¼\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "ÖØÃüÃû³É¹¦\n" @@ -1885,55 +1885,55 @@ msgid "POST method failed" msgstr "" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "" -#: src/Http.cc:1129 +#: src/Http.cc:1142 #, fuzzy msgid "Sending request..." msgstr "ÕýÔÚ·¢ËÍÃüÁî..." -#: src/Http.cc:1176 +#: src/Http.cc:1189 #, fuzzy msgid "Hit EOF while fetching headers" msgstr "ÕýÔÚÈ¡µÃÍ·..." -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 #, fuzzy msgid "Receiving body..." msgstr "Õý½ÓÊÕÊý¾Ý" -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "" -#: src/Http.cc:1599 +#: src/Http.cc:1612 #, fuzzy msgid "Received all" msgstr "Õý½ÓÊÕÊý¾Ý" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "¿é¸ñʽ³åÍ»" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "ÕýÔÚÈ¡µÃÍ·..." @@ -1962,7 +1962,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, fuzzy, c-format msgid "Getting file list (%lld) [%s]" msgstr "ÕýÔÚ»ñÈ¡ÎļþÁбí (%ld) [%s]" @@ -2103,49 +2103,49 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, fuzzy, c-format msgid "pipe() failed: %s" msgstr "execlp(%s) ʧ°Ü: %s\n" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, fuzzy, c-format msgid "chdir(%s) failed: %s\n" msgstr "¾¯¸æ: chdir(%s) ʧ°Ü: %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, fuzzy, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "execlp(%s) ʧ°Ü: %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "ÕýÔÚÁ¬½Óµ½ %s%s (%s) ¶Ë¿Ú %u" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "³¬Ê± - ÖØÐÂÁ¬½Ó" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 #, fuzzy msgid "Connection limit reached" msgstr "Á¬½Ó¿ÕÏÐ" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "ÖØÐÂÁ¬½ÓÇ°ÑÓʱ" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "´ïµ½×î´óÖØÊÔ´ÎÊý" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, fuzzy, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "ÕýÔÚ¶ÁȡĿ¼ÄÚÈÝ (%ld)" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, fuzzy, c-format msgid "Getting files information (%d%%) [%s]" msgstr "ÕýÔÚ¶ÁÈ¡ÎļþÐÅÏ¢ (%d%%)" Binary files lftp-3.1.0/po/zh_TW.gmo and lftp-3.1.1/po/zh_TW.gmo differ diff -ruN lftp-3.1.0/po/zh_TW.po lftp-3.1.1/po/zh_TW.po --- lftp-3.1.0/po/zh_TW.po Fri Feb 25 16:13:45 2005 +++ lftp-3.1.1/po/zh_TW.po Wed Mar 16 00:15:39 2005 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: lftp-2.3.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 16:13+0300\n" +"POT-Creation-Date: 2005-03-16 00:15+0300\n" "PO-Revision-Date: 2001-04-22 06:01+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Traditional Chinese \n" @@ -100,46 +100,46 @@ msgid "Socket error (%s) - reconnecting" msgstr "Socket ¿ù»~ (%s) - ­«·s³s½u" -#: src/FileAccess.cc:291 +#: src/FileAccess.cc:292 #, c-format msgid "Access failed: %s" msgstr "¦s¨ú¥¢±Ñ: %s" -#: src/FileAccess.cc:294 +#: src/FileAccess.cc:295 msgid "File cannot be accessed" msgstr "¤£¯à¦s¨úÀÉ®×" -#: src/FileAccess.cc:296 src/ftpclass.cc:3926 src/ftpclass.cc:3935 +#: src/FileAccess.cc:297 src/ftpclass.cc:3930 src/ftpclass.cc:3939 msgid "Not connected" msgstr "¨Ã¥¼³s½u" -#: src/FileAccess.cc:300 +#: src/FileAccess.cc:301 #, c-format msgid "Fatal error: %s" msgstr "ÄY­«¿ù»~: %s" -#: src/FileAccess.cc:303 +#: src/FileAccess.cc:304 msgid "Fatal error" msgstr "ÄY­«¿ù»~" -#: src/FileAccess.cc:305 +#: src/FileAccess.cc:306 msgid "Store failed - you have to reput" msgstr "Àx¦s¥¢±Ñ - »Ý­n­«·s¤W¶Ç(reput)" -#: src/FileAccess.cc:309 src/FileAccess.cc:312 +#: src/FileAccess.cc:310 src/FileAccess.cc:313 msgid "Login failed" msgstr "µn¤J¿ù»~" -#: src/FileAccess.cc:316 src/FileAccess.cc:319 +#: src/FileAccess.cc:317 src/FileAccess.cc:320 msgid "Operation not supported" msgstr "¤£¤ä´©¦¹¶µ¾Þ§@" -#: src/FileAccess.cc:323 +#: src/FileAccess.cc:324 #, c-format msgid "File moved: %s" msgstr "Àɮפw²¾°Ê: %s" -#: src/FileAccess.cc:329 +#: src/FileAccess.cc:330 #, c-format msgid "File moved to `%s'" msgstr "Àɮ׳Q²¾°Ê¨ì `%s'" @@ -344,8 +344,8 @@ msgid "invalid pair of numbers" msgstr "¤£¥¿½Tªº¼Æ¦r" -#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3931 -#: src/Http.cc:1801 +#: src/Resolver.cc:187 src/Resolver.cc:229 src/ftpclass.cc:3935 +#: src/Http.cc:1817 msgid "Resolving host address..." msgstr "¥¿¦b¸ÑªR¥D¾÷¦a§}..." @@ -1628,177 +1628,177 @@ msgid "assuming failed host name lookup" msgstr "°²³]¬d¬Ý¥D¾÷¦WºÙ¤w¥¢±Ñ" -#: src/ftpclass.cc:719 +#: src/ftpclass.cc:720 msgid "cannot parse EPSV response" msgstr "¤£¯à¤ÀªR EPSV ¦^À³¤º®e" -#: src/ftpclass.cc:974 +#: src/ftpclass.cc:975 msgid "Closing control socket" msgstr "¥¿¦bÃö³¬±±¨î socket" -#: src/ftpclass.cc:1137 src/Http.cc:897 +#: src/ftpclass.cc:1138 src/Http.cc:905 msgid "Closing idle connection" msgstr "Ãö³¬¤F¶¢¸mªº³s½u" -#: src/ftpclass.cc:1176 +#: src/ftpclass.cc:1177 #, fuzzy msgid "SITE CHMOD is disabled by ftp:use-site-chmod" msgstr "³o­Ó¯¸¥x¤£¤ä´© SITE CHMOD" -#: src/ftpclass.cc:1181 +#: src/ftpclass.cc:1182 #, fuzzy msgid "MLSD is disabled by ftp:use-mlsd" msgstr "³o­Ó¯¸¥x¤£¤ä´© SITE CHMOD" -#: src/ftpclass.cc:1244 src/Http.cc:1025 +#: src/ftpclass.cc:1245 src/Http.cc:1038 #, c-format msgid "cannot create socket of address family %d" msgstr "¤£¯à«Ø¥ß¦a§}±Ú¸s %d ªº socket" -#: src/ftpclass.cc:1479 +#: src/ftpclass.cc:1481 msgid "SITE CHMOD is not supported by this site" msgstr "³o­Ó¯¸¥x¤£¤ä´© SITE CHMOD" -#: src/ftpclass.cc:1484 +#: src/ftpclass.cc:1486 #, fuzzy msgid "MLST and MLSD are not supported by this site" msgstr "³o­Ó¯¸¥x¤£¤ä´© SITE CHMOD" -#: src/ftpclass.cc:1904 src/ftpclass.cc:1954 +#: src/ftpclass.cc:1907 src/ftpclass.cc:1957 msgid "unsupported network protocol" msgstr "¤£¨ü¤ä´©ªººôµ¸¨ó©w" -#: src/ftpclass.cc:2067 +#: src/ftpclass.cc:2071 #, c-format msgid "Connecting data socket to (%s) port %u" msgstr "³s±µ¸ê®Æ socket ¨ì (%s) ³s±µ°ð %u" -#: src/ftpclass.cc:2074 +#: src/ftpclass.cc:2078 #, fuzzy, c-format msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "³s±µ¸ê®Æ socket ¨ì (%s) ³s±µ°ð %u" -#: src/ftpclass.cc:2099 src/ftpclass.cc:3768 +#: src/ftpclass.cc:2103 src/ftpclass.cc:3772 msgid "Switching passive mode off" msgstr "Ãö³¬¤F passive ¼Ò¦¡" -#: src/ftpclass.cc:2107 +#: src/ftpclass.cc:2111 #, fuzzy msgid "Data connection established" msgstr "¹ï¤è¨Ï¥Î¤F¤£¤Ç°tªº¦a§}" -#: src/ftpclass.cc:2357 src/ftpclass.cc:3886 +#: src/ftpclass.cc:2361 src/ftpclass.cc:3890 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "¤w³]©w ftp:ssl-force ¦ý¦øªA¾¹¤£¤ä´©/¤£¨Ï¥Î SSL" -#: src/ftpclass.cc:2565 src/ftpclass.cc:2700 src/Http.cc:1113 +#: src/ftpclass.cc:2569 src/ftpclass.cc:2704 src/Http.cc:1126 msgid "Peer closed connection" msgstr "¹ï¤è¸`ÂIÃö³¬¤F³s½u" -#: src/ftpclass.cc:2645 +#: src/ftpclass.cc:2649 msgid "Persist and retry" msgstr "Ä~Äò­«¸Õ" -#: src/ftpclass.cc:2917 +#: src/ftpclass.cc:2921 msgid "Closing data socket" msgstr "¥¿¦bÃö³¬¸ê®Æ socket" -#: src/ftpclass.cc:2933 +#: src/ftpclass.cc:2937 #, fuzzy msgid "Closing aborted data socket" msgstr "¥¿¦bÃö³¬¸ê®Æ socket" -#: src/ftpclass.cc:3606 +#: src/ftpclass.cc:3610 msgid "saw file size in response" msgstr "¦^À³¥]¬AÀɮתº¤j¤p" -#: src/ftpclass.cc:3621 +#: src/ftpclass.cc:3625 msgid "extra server response" msgstr "ÃB¥~ªº¦øªA¾¹¦^À³" -#: src/ftpclass.cc:3635 src/ftpclass.cc:3658 +#: src/ftpclass.cc:3639 src/ftpclass.cc:3662 msgid "Turning on sync-mode" msgstr "±Ò°Ê sync-mode" -#: src/ftpclass.cc:3785 +#: src/ftpclass.cc:3789 msgid "Switching passive mode on" msgstr "¶}±Ò passive ¼Ò¦¡" -#: src/ftpclass.cc:3912 +#: src/ftpclass.cc:3916 #, fuzzy msgid "FEAT negotiation..." msgstr "¨Ï¥Î TLS ¨ó©w³q°T¤¤¡K" -#: src/ftpclass.cc:3919 +#: src/ftpclass.cc:3923 msgid "Sending commands..." msgstr "¥¿¦b°e¥X«ü¥O..." -#: src/ftpclass.cc:3921 src/ftpclass.cc:3949 src/ftpclass.cc:3962 -#: src/Http.cc:1816 +#: src/ftpclass.cc:3925 src/ftpclass.cc:3953 src/ftpclass.cc:3966 +#: src/Http.cc:1832 msgid "Waiting for response..." msgstr "¥¿¦bµ¥«Ý¦^À³..." -#: src/ftpclass.cc:3923 +#: src/ftpclass.cc:3927 #, fuzzy msgid "Delaying before retry" msgstr "­«·s³s±µ«e©µ¿ð(¬í)" -#: src/ftpclass.cc:3924 src/Http.cc:1809 +#: src/ftpclass.cc:3928 src/Http.cc:1825 msgid "Connection idle" msgstr "³s½u¶¢¸m¤F" -#: src/ftpclass.cc:3938 src/Http.cc:1807 src/Http.cc:1814 +#: src/ftpclass.cc:3942 src/Http.cc:1823 src/Http.cc:1830 msgid "Connecting..." msgstr "¥¿¦b³s½u..." -#: src/ftpclass.cc:3942 +#: src/ftpclass.cc:3946 msgid "TLS negotiation..." msgstr "¨Ï¥Î TLS ¨ó©w³q°T¤¤¡K" -#: src/ftpclass.cc:3944 +#: src/ftpclass.cc:3948 msgid "Connected" msgstr "¤w¸g³s±µ" -#: src/ftpclass.cc:3946 +#: src/ftpclass.cc:3950 msgid "Logging in..." msgstr "¥¿¦bµn¤J..." -#: src/ftpclass.cc:3950 +#: src/ftpclass.cc:3954 msgid "Making data connection..." msgstr "¥¿¦b«Ø¥ß¸ê®Æ¶Ç°eªº³s½u..." -#: src/ftpclass.cc:3953 +#: src/ftpclass.cc:3957 msgid "Changing remote directory..." msgstr "§ïÅÜ»·ºÝ¥Ø¿ý..." -#: src/ftpclass.cc:3959 +#: src/ftpclass.cc:3963 #, fuzzy msgid "Waiting for other copy peer..." msgstr "¥¿¦bµ¥«Ý¦^À³..." -#: src/ftpclass.cc:3961 src/ftpclass.cc:3982 +#: src/ftpclass.cc:3965 src/ftpclass.cc:3986 msgid "Waiting for transfer to complete" msgstr "µ¥«Ý¶Ç°e§¹¦¨" -#: src/ftpclass.cc:3964 +#: src/ftpclass.cc:3968 msgid "Waiting for data connection..." msgstr "µ¥«Ý¸ê®Æ¶Ç°eªº³s½u..." -#: src/ftpclass.cc:3970 +#: src/ftpclass.cc:3974 #, fuzzy msgid "Sending data/TLS" msgstr "¥¿¦b¶Ç°e¸ê®Æ" -#: src/ftpclass.cc:3972 +#: src/ftpclass.cc:3976 #, fuzzy msgid "Receiving data/TLS" msgstr "¥¿¦b±µ¦¬¸ê®Æ" -#: src/ftpclass.cc:3978 src/Http.cc:1812 +#: src/ftpclass.cc:3982 src/Http.cc:1828 msgid "Sending data" msgstr "¥¿¦b¶Ç°e¸ê®Æ" -#: src/ftpclass.cc:3980 src/Http.cc:1819 +#: src/ftpclass.cc:3984 src/Http.cc:1835 msgid "Receiving data" msgstr "¥¿¦b±µ¦¬¸ê®Æ" @@ -1842,7 +1842,7 @@ msgid "%s ok, %d director$y|ies$ created\n" msgstr "%s ¦¨¥\¡A«Ø¥ß¤F %d ­Ó¥Ø¿ý\n" -#: src/mvJob.cc:72 +#: src/mvJob.cc:80 #, c-format msgid "rename successful\n" msgstr "§ó§ï¦WºÙ¦¨¥\\n" @@ -1892,52 +1892,52 @@ msgid "POST method failed" msgstr "¨Ï¥Î POST ¤èªk¥¢±Ñ" -#: src/Http.cc:981 +#: src/Http.cc:994 msgid "ftp over http cannot work without proxy, set hftp:proxy." msgstr "" "­Y¨S¦³¥N²z¦øªA¾¹¡A¬O¤£¥i¯à¦b http ³s½u¤W¨Ï¥Î ftp ªº¡A½Ð³]©w http:proxy¡C" -#: src/Http.cc:1129 +#: src/Http.cc:1142 msgid "Sending request..." msgstr "¥¿¦b°e¥X­n¨D..." -#: src/Http.cc:1176 +#: src/Http.cc:1189 msgid "Hit EOF while fetching headers" msgstr "Ū¨ú¼ÐÀY®ÉÀɮפw²×µ²¤F" -#: src/Http.cc:1292 +#: src/Http.cc:1305 msgid "Could not parse HTTP status line" msgstr "¤£¯à¤ÀªR HTTP ª¬ºA" -#: src/Http.cc:1323 +#: src/Http.cc:1336 msgid "Object is not cached and http:cache-control has only-if-cached" msgstr "" -#: src/Http.cc:1459 +#: src/Http.cc:1472 msgid "Receiving body..." msgstr "¥¿¦b±µ¦¬¤º®e¡K" -#: src/Http.cc:1588 +#: src/Http.cc:1601 msgid "Hit EOF" msgstr "Àɮײ׵²" -#: src/Http.cc:1591 +#: src/Http.cc:1604 msgid "Received not enough data, retrying" msgstr "±µ¦¬ªº¸ê®Æ¤£¨¬¡AÄ~Äò¹Á¸Õ" -#: src/Http.cc:1599 +#: src/Http.cc:1612 msgid "Received all" msgstr "¤w±µ¦¬©Ò¦³¸ê®Æ" -#: src/Http.cc:1604 +#: src/Http.cc:1617 msgid "Received all (total)" msgstr "¤w±µ¦¬©Ò¦³¸ê®Æ" -#: src/Http.cc:1627 src/Http.cc:1648 +#: src/Http.cc:1640 src/Http.cc:1661 msgid "chunked format violated" msgstr "¸ê®Æ®æ¦¡¿ù»~" -#: src/Http.cc:1817 +#: src/Http.cc:1833 msgid "Fetching headers..." msgstr "¥¿¦bŪ¨ú¼ÐÀY¡K" @@ -1966,7 +1966,7 @@ msgid "must be one of: C, S, E, P, or empty" msgstr "" -#: src/HttpDir.cc:1327 src/FtpDirList.cc:136 +#: src/HttpDir.cc:1356 src/FtpDirList.cc:136 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "¥¿¦bÂ^¨úÀɮצCªí (%lld) [%s]" @@ -2107,49 +2107,49 @@ msgid "ftp:fxp-force is set but FXP is not available" msgstr "" -#: src/Filter.cc:152 +#: src/Filter.cc:154 #, c-format msgid "pipe() failed: %s" msgstr "pipe() ¥¢±Ñ: %s" -#: src/Filter.cc:174 +#: src/Filter.cc:176 #, c-format msgid "chdir(%s) failed: %s\n" msgstr "chdir(%s) ¥¢±Ñ: %s\n" -#: src/Filter.cc:182 +#: src/Filter.cc:184 #, c-format msgid "execl(/bin/sh) failed: %s\n" msgstr "execl(/bin/sh) ¥¢±Ñ: %s\n" -#: src/NetAccess.cc:324 +#: src/NetAccess.cc:346 #, c-format msgid "Connecting to %s%s (%s) port %u" msgstr "³s½u¨ì %s%s (%s) ³s±µ°ð %u" -#: src/NetAccess.cc:380 +#: src/NetAccess.cc:402 msgid "Timeout - reconnecting" msgstr "¹O®É - ­«·s³s½u" -#: src/NetAccess.cc:587 +#: src/NetAccess.cc:609 #, fuzzy msgid "Connection limit reached" msgstr "¨ì¹F³s½u¼Æ¥Øªº¤W­­" -#: src/NetAccess.cc:591 +#: src/NetAccess.cc:613 msgid "Delaying before reconnect" msgstr "­«·s³s±µ«e©µ¿ð(¬í)" -#: src/NetAccess.cc:600 +#: src/NetAccess.cc:622 msgid "max-retries exceeded" msgstr "¶W¹L max-retries ¤W­­" -#: src/NetAccess.cc:900 +#: src/NetAccess.cc:922 #, fuzzy, c-format msgid "Getting directory contents (%lld) %s[%s]" msgstr "¥¿¦bÂ^¨ú¥Ø¿ý¤º®e (%lld)" -#: src/NetAccess.cc:907 +#: src/NetAccess.cc:929 #, fuzzy, c-format msgid "Getting files information (%d%%) [%s]" msgstr "¥¿¦bÂ^¨úÀɮ׸ê°T (%d%%)" diff -ruN lftp-3.1.0/src/ChangeLog lftp-3.1.1/src/ChangeLog --- lftp-3.1.0/src/ChangeLog Fri Feb 25 15:47:24 2005 +++ lftp-3.1.1/src/ChangeLog Sun Mar 13 15:17:52 2005 @@ -1,3 +1,37 @@ +2005-03-13 Alexander V. Lukyanov + + * buffer.cc: prevent spinning when disk is full in IOBufferFDStream; + better saving of errno. + * Filter.cc, Filter.h: allow passing errno value to MakeErrorText. + +2005-03-11 Alexander V. Lukyanov + + * HttpDir.cc: extract listing info for HttpListInfo. + +2005-03-09 Alexander V. Lukyanov + + * FileCopyFtp.cc, ftpclass.h: handle timeout when waiting for ack. + * misc.cc: (strip_trailing_slashes) don't strip last slash in root directory. + +2005-03-05 Alexander V. Lukyanov + + * FileAccess.cc: don't strip trailing slash in OptimizePath. + * Http.cc: send full URL in Destination header; fix Done for a number + of methods. + * misc.cc, misc.h: (strip_trailing_slashes) new function. + * mvJob.cc: append basename of target ends with a slash. + * ftpclass.cc, resource.cc: (ftp:ignore-pasv-address) new setting. + * Http.cc, Http.h: add support for `quote MOVE/COPY'. + * FileAccess.cc: set event_time in Open to prevent false timeout. + +2005-03-01 Alexander V. Lukyanov + + * NetAccess.cc: make TOS changes compile on solaris. + +2005-03-01 Mark Schreiber + + * ftpclass.cc, NetAccess.cc, NetAccess.h: use TOS on ftp connections. + 2005-02-25 Alexander V. Lukyanov * Http.cc: set C locale before time conversion (fixes Last-Modified diff -ruN lftp-3.1.0/src/FileAccess.cc lftp-3.1.1/src/FileAccess.cc --- lftp-3.1.0/src/FileAccess.cc Thu Feb 10 16:37:16 2005 +++ lftp-3.1.1/src/FileAccess.cc Wed Mar 9 10:22:36 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: FileAccess.cc,v 1.117 2005/02/10 13:37:16 lav Exp $ */ +/* $Id: FileAccess.cc,v 1.119 2005/03/09 07:22:36 lav Exp $ */ #include @@ -66,7 +66,7 @@ mode=CLOSED; try_time=0; retries=0; - time(&event_time); + event_time=now; opt_date=0; opt_size=0; error=0; @@ -231,6 +231,7 @@ if(IsOpen()) Close(); Resume(); + event_time=now; file=xstrdup(fn); real_pos=-1; pos=offs; @@ -613,8 +614,8 @@ { if(in[0]=='/') { - // double slash or a slash on the end - if(in[1]=='/' || in[1]=='\0') + // double slash + if(in[1]=='/') // || (strip_trailing_slash && in[1]=='\0')) { in++; continue; @@ -686,6 +687,7 @@ } OptimizePath(newcwd); + strip_trailing_slashes(newcwd); if(verify) Open(newcwd,CHANGE_DIR); diff -ruN lftp-3.1.0/src/FileCopyFtp.cc lftp-3.1.1/src/FileCopyFtp.cc --- lftp-3.1.0/src/FileCopyFtp.cc Mon May 31 17:27:36 2004 +++ lftp-3.1.1/src/FileCopyFtp.cc Wed Mar 9 10:54:09 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: FileCopyFtp.cc,v 1.21 2004/05/31 13:27:36 lav Exp $ */ +/* $Id: FileCopyFtp.cc,v 1.22 2005/03/09 07:54:09 lav Exp $ */ #include @@ -185,6 +185,10 @@ m=MOVED; RateReset(); } + + // check for timeout when target is done, and source is stale + if(dst_res==FA::OK && src_res==FA::IN_PROGRESS) + ftp_src->CopyCheckTimeout(ftp_dst); off_t add=ftp_dst->GetPos()-put->GetRealPos(); if(add>0) diff -ruN lftp-3.1.0/src/Filter.cc lftp-3.1.1/src/Filter.cc --- lftp-3.1.0/src/Filter.cc Tue Feb 17 13:42:56 2004 +++ lftp-3.1.1/src/Filter.cc Sun Mar 13 14:59:55 2005 @@ -58,11 +58,13 @@ status=0; close_fd=false; } -void FDStream::MakeErrorText() +void FDStream::MakeErrorText(int e) { - if(NonFatalError(errno)) + if(!e) + e=errno; + if(NonFatalError(e)) return; // not a serious error - can be retried - char *syserr=strerror(errno); + char *syserr=strerror(e); error_text=(char*)xmalloc(strlen(name)+strlen(syserr)+3); sprintf(error_text,"%s: %s",name,syserr); } diff -ruN lftp-3.1.0/src/Filter.h lftp-3.1.1/src/Filter.h --- lftp-3.1.0/src/Filter.h Wed Jul 10 12:48:52 2002 +++ lftp-3.1.1/src/Filter.h Sun Mar 13 15:17:59 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: Filter.h,v 1.17 2002/07/10 08:48:52 lav Exp $ */ +/* $Id: Filter.h,v 1.18 2005/03/13 12:17:59 lav Exp $ */ #ifndef FILTER_H #define FILTER_H @@ -45,7 +45,7 @@ FDStream(int new_fd,const char *new_name); virtual ~FDStream(); - void MakeErrorText(); + void MakeErrorText(int e=0); bool NonFatalError(int err); void set_status(const char *str) { status=str; } void clear_status() { status=0; } diff -ruN lftp-3.1.0/src/Http.cc lftp-3.1.1/src/Http.cc --- lftp-3.1.0/src/Http.cc Fri Feb 25 15:47:41 2005 +++ lftp-3.1.1/src/Http.cc Sat Mar 5 12:57:25 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: Http.cc,v 1.187 2005/02/25 12:47:41 lav Exp $ */ +/* $Id: Http.cc,v 1.190 2005/03/05 09:57:25 lav Exp $ */ #include #include "trio.h" @@ -104,8 +104,8 @@ use_head=true; user_agent=0; - post_data=0; - post=false; + special_data=0; + special=HTTP_NONE; } Http::Http() : super() @@ -233,9 +233,9 @@ array_send=0; no_cache_this=false; no_ranges=false; - post=false; - xfree(post_data); - post_data=0; + special=HTTP_NONE; + xfree(special_data); + special_data=0; super::Close(); } @@ -517,12 +517,24 @@ { case CLOSED: case CONNECT_VERIFY: + abort(); // cannot happen + case QUOTE_CMD: - if(post) + switch(special) { - entity_size=xstrlen(post_data); + case HTTP_POST: + entity_size=xstrlen(special_data); goto send_post; + case HTTP_MOVE: + case HTTP_COPY: + SendMethod(special==HTTP_MOVE?"MOVE":"COPY",efile); + Send("Destination: %s\r\n",special_data); + break; + case HTTP_NONE: + abort(); // cannot happen } + break; + case LIST: case CHANGE_MODE: abort(); // unsupported @@ -609,11 +621,7 @@ case RENAME: { SendMethod("MOVE",efile); - char *efile1=string_alloca(strlen(file1)*3+1); - url::encode_string(file1,efile1,URL_PATH_UNSAFE); - char *pfile1=string_alloca(strlen(ecwd)+1+strlen(efile1)+1+6+1); - DirFile(pfile1,ecwd,efile1); - Send("Destination: %s\r\n",pfile1); + Send("Destination: %s\r\n",GetFileURL(file1)); } } SendAuth(); @@ -627,10 +635,10 @@ if(mode!=ARRAY_INFO || connection) Send("Connection: %s\r\n",connection?connection:"close"); Send("\r\n"); - if(post) + if(special==HTTP_POST) { - if(post_data) - Send("%s",post_data); + if(special_data) + Send("%s",special_data); entity_size=NO_SIZE; } else if(mode==MP_LIST) @@ -918,14 +926,25 @@ state=DONE; return MOVED; } - if(!hftp && mode==QUOTE_CMD && !post) + if(!hftp && mode==QUOTE_CMD && !special) { handle_quote_cmd: if(file && !strncasecmp(file,"Set-Cookie ",11)) SetCookie(file+11); else if(file && !strncasecmp(file,"POST ",5)) + special=HTTP_POST; + else if(file && !strncasecmp(file,"COPY ",5)) + special=HTTP_COPY; + else if(file && !strncasecmp(file,"MOVE ",5)) + special=HTTP_MOVE; + else { - // POST encoded_path data + SetError(NOT_SUPP,0); + return MOVED; + } + if(special) + { + // METHOD encoded_path data const char *scan=file+5; while(*scan==' ') scan++; @@ -954,21 +973,15 @@ scan=strchr(scan,' '); while(scan && *scan==' ') scan++; - post=true; - post_data=xstrdup(scan); + special_data=xstrdup(scan); xfree(file_url); file_url=path; return MOVED; } - else - { - SetError(NOT_SUPP,0); - return MOVED; - } state=DONE; return MOVED; } - if(!post && !ModeSupported()) + if(!special && !ModeSupported()) { SetError(NOT_SUPP); return MOVED; @@ -1106,7 +1119,7 @@ if(mode==CONNECT_VERIFY) return MOVED; - if(mode==QUOTE_CMD && !post) + if(mode==QUOTE_CMD && !special) goto handle_quote_cmd; if(recv_buf->Eof()) { @@ -1116,7 +1129,7 @@ } if(mode==CLOSED) return m; - if(!post && !ModeSupported()) + if(!special && !ModeSupported()) { SetError(NOT_SUPP); return MOVED; @@ -1147,7 +1160,7 @@ case RECEIVING_HEADER: if(send_buf->Error() || recv_buf->Error()) { - if((mode==STORE || post) && status_code && !H_20X(status_code)) + if((mode==STORE || special) && status_code && !H_20X(status_code)) goto pre_RECEIVING_BODY; // assume error. handle_buf_error: if(send_buf->Error()) @@ -1707,6 +1720,9 @@ if(state==DONE) return OK; if(mode==CONNECT_VERIFY && (peer || sock!=-1)) + return OK; + if((mode==REMOVE || mode==REMOVE_DIR || mode==RENAME) + && state==RECEIVING_BODY) return OK; return IN_PROGRESS; } diff -ruN lftp-3.1.0/src/Http.h lftp-3.1.1/src/Http.h --- lftp-3.1.0/src/Http.h Fri Feb 4 18:25:53 2005 +++ lftp-3.1.1/src/Http.h Sat Mar 5 12:10:45 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: Http.h,v 1.44 2005/02/04 15:25:53 lav Exp $ */ +/* $Id: Http.h,v 1.45 2005/03/05 09:10:45 lav Exp $ */ #ifndef HTTP_H #define HTTP_H @@ -56,8 +56,8 @@ bool recv_buf_suspended; void SendMethod(const char *,const char *); const char *last_method; - bool post; - char *post_data; + enum { HTTP_NONE=0, HTTP_POST, HTTP_MOVE, HTTP_COPY } special; + char *special_data; void DirFile(char *path_base,const char *ecwd,const char *efile); void SendAuth(); void SendCacheControl(); diff -ruN lftp-3.1.0/src/HttpDir.cc lftp-3.1.1/src/HttpDir.cc --- lftp-3.1.0/src/HttpDir.cc Wed Feb 23 21:29:45 2005 +++ lftp-3.1.1/src/HttpDir.cc Fri Mar 11 10:51:09 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: HttpDir.cc,v 1.81 2005/02/23 18:29:45 lav Exp $ */ +/* $Id: HttpDir.cc,v 1.82 2005/03/11 07:51:09 lav Exp $ */ #include #include "ascii_ctype.h" @@ -939,7 +939,7 @@ show_in_list=false; // makes apache listings look better. skip_len=tag_len; - if(list && show_in_list) + // try to find file info { const char *more1; char *str,*str_with_tags, *str2; @@ -1032,16 +1032,13 @@ if(try_csm_proxy(info,str) && info.validate()) goto got_info; add_file_no_info: + if(!list || !show_in_list) + goto info_done; sprintf(line_add,"%s -- %s", info.is_directory?"drwxr-xr-x":"-rw-r--r--",link_target); goto append_type_maybe; got_info: - if(info_string) - { - sprintf(line_add,"%.*s %s",info_string_len,info_string,link_target); - goto append_symlink_maybe; - } if(info.month==-1) info.month=parse_month(info.month_name); if(info.month>=0) @@ -1050,6 +1047,34 @@ if(info.year==-1) info.year=guess_year(info.month,info.day,info.hour,info.minute); } + if(info.year!=-1 && info.month!=-1 && info.day!=-1) + { + struct tm tm; + memset(&tm,0,sizeof(tm)); + tm.tm_year=info.year-1900; + tm.tm_mon=info.month-1; + tm.tm_mday=info.day; + tm.tm_hour=12; + info.date_prec=43200; + if(info.hour!=-1 && info.minute!=-1) + { + tm.tm_hour=info.hour; + tm.tm_min=info.minute; + tm.tm_sec=30; + info.date_prec=30; + if(info.second!=-1) + { + tm.tm_sec=info.second; + info.date_prec=0; + } + } + info.date=mktime_from_utc(&tm); + } + if(info.size==-1) + { + if(strspn(info.size_str,"0123456789")==strlen(info.size_str)) + info.size=atoll(info.size_str); + } if(info.perms[0]==0) { if(info.is_directory) @@ -1059,6 +1084,14 @@ else strcpy(info.perms,"-rw-r--r--"); } + if(!list || !show_in_list) + goto info_done; + + if(info_string) + { + sprintf(line_add,"%.*s %s",info_string_len,info_string,link_target); + goto append_symlink_maybe; + } sprintf(line_add,"%s %11s %04d-%s-%02d", info.perms,info.size_str,info.year,info.month_name,info.day); @@ -1088,12 +1121,10 @@ type = FileInfo::NORMAL; - if (color) { - if(info.is_directory) - type = FileInfo::DIRECTORY; - else if(info.is_sym_link && !info.sym_link) - type = FileInfo::SYMLINK; - } + if(info.is_directory) + type = FileInfo::DIRECTORY; + else if(info.is_sym_link && !info.sym_link) + type = FileInfo::SYMLINK; if (color && FileInfo::NORMAL != type && all_links && !all_links->FindByName(link_target)) { list->Put(line_add); @@ -1120,12 +1151,11 @@ if(!all_links->FindByName(link_target)) { list->Put(line_add); - FileInfo *fi=new FileInfo; - fi->SetName(link_target); + FileInfo *fi=new FileInfo(link_target); all_links->Add(fi); } } - +info_done: if(set && link_target[0]!='/' && link_target[0]!='~') { char *slash=strchr(link_target,'/'); @@ -1135,8 +1165,7 @@ info.is_directory=true; } - FileInfo *fi=new FileInfo; - fi->SetName(link_target); + FileInfo *fi=new FileInfo(link_target); if(info.sym_link) fi->SetSymlink(info.sym_link); else @@ -1151,7 +1180,7 @@ fi->SetSize(info.size); if(info.perms[0]) { - int m=parse_perms(info.perms); + int m=parse_perms(info.perms+1); if(m>=0) fi->SetMode(m); } diff -ruN lftp-3.1.0/src/NetAccess.cc lftp-3.1.1/src/NetAccess.cc --- lftp-3.1.0/src/NetAccess.cc Wed Dec 1 15:17:43 2004 +++ lftp-3.1.1/src/NetAccess.cc Tue Mar 1 17:41:47 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: NetAccess.cc,v 1.74 2004/12/01 12:17:43 lav Exp $ */ +/* $Id: NetAccess.cc,v 1.76 2005/03/01 14:41:47 lav Exp $ */ #include @@ -27,6 +27,12 @@ #include #include #include +#ifdef HAVE_NETINET_IN_SYSTM_H +# include +#endif +#ifdef HAVE_NETINET_IP_H +# include +#endif #ifdef HAVE_NETINET_TCP_H # include #endif @@ -136,6 +142,22 @@ void NetAccess::KeepAlive(int sock) { setsockopt(sock,SOL_SOCKET,SO_KEEPALIVE,(char*)&one,sizeof(one)); +} +void NetAccess::MinimizeLatency(int sock) +{ + int tos; +#ifdef IP_TOS + tos = IPTOS_LOWDELAY; + setsockopt(sock, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)); +#endif +} +void NetAccess::MaximizeThroughput(int sock) +{ + int tos; +#ifdef IP_TOS + tos = IPTOS_THROUGHPUT; + setsockopt(sock, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)); +#endif } void NetAccess::ReuseAddress(int sock) { diff -ruN lftp-3.1.0/src/NetAccess.h lftp-3.1.1/src/NetAccess.h --- lftp-3.1.0/src/NetAccess.h Thu Oct 14 16:02:36 2004 +++ lftp-3.1.1/src/NetAccess.h Tue Mar 1 16:53:11 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: NetAccess.h,v 1.35 2004/10/14 12:02:36 lav Exp $ */ +/* $Id: NetAccess.h,v 1.36 2005/03/01 13:53:11 lav Exp $ */ #ifndef NETACCESS_H #define NETACCESS_H @@ -64,6 +64,8 @@ void SetSocketMaxseg(int sock); static void KeepAlive(int sock); + static void MinimizeLatency(int sock); + static void MaximizeThroughput(int sock); static void ReuseAddress(int sock); static void SetSocketBuffer(int sock,int val); static void SetSocketMaxseg(int sock,int val); diff -ruN lftp-3.1.0/src/buffer.cc lftp-3.1.1/src/buffer.cc --- lftp-3.1.0/src/buffer.cc Tue Aug 3 12:37:53 2004 +++ lftp-3.1.1/src/buffer.cc Sun Mar 13 15:01:26 2005 @@ -523,18 +523,20 @@ res=write(fd,buf,size); if(res==-1) { - if(NonFatalError(errno)) + saved_errno=errno; + if(E_RETRY(saved_errno)) { Block(fd,POLLOUT); return 0; } + if(NonFatalError(saved_errno)) + return 0; if(errno==EPIPE) { broken=true; return -1; } - saved_errno=errno; - stream->MakeErrorText(); + stream->MakeErrorText(saved_errno); goto stream_err; } if(put_ll_timer) @@ -564,13 +566,15 @@ res=read(fd,buffer+buffer_ptr+in_buffer,size); if(res==-1) { - if(NonFatalError(errno)) + saved_errno=errno; + if(E_RETRY(saved_errno)) { Block(fd,POLLIN); return 0; } - saved_errno=errno; - stream->MakeErrorText(); + if(NonFatalError(saved_errno)) + return 0; + stream->MakeErrorText(saved_errno); goto stream_err; } diff -ruN lftp-3.1.0/src/ftpclass.cc lftp-3.1.1/src/ftpclass.cc --- lftp-3.1.0/src/ftpclass.cc Thu Feb 10 16:37:18 2005 +++ lftp-3.1.1/src/ftpclass.cc Sat Mar 5 10:07:02 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: ftpclass.cc,v 1.348 2005/02/10 13:37:18 lav Exp $ */ +/* $Id: ftpclass.cc,v 1.350 2005/03/05 07:07:02 lav Exp $ */ #include @@ -681,6 +681,7 @@ p[0]=p0; p[1]=p1; if((a0==0 && a1==0 && a2==0 && a3==0) + || QueryBool("ignore-pasv-address",hostname) || (QueryBool("fix-pasv-address",hostname) && !conn->proxy_is_http && (InPrivateNetwork(&conn->data_sa) != InPrivateNetwork(&conn->peer_sa) || IsLoopback(&conn->data_sa) != IsLoopback(&conn->peer_sa)))) @@ -1247,6 +1248,7 @@ return MOVED; } KeepAlive(conn->control_sock); + MinimizeLatency(conn->control_sock); SetSocketBuffer(conn->control_sock); SetSocketMaxseg(conn->control_sock); NonBlock(conn->control_sock); @@ -1599,6 +1601,7 @@ NonBlock(conn->data_sock); CloseOnExec(conn->data_sock); KeepAlive(conn->data_sock); + MaximizeThroughput(conn->data_sock); SetSocketBuffer(conn->data_sock); SetSocketMaxseg(conn->data_sock); @@ -2021,6 +2024,7 @@ NonBlock(conn->data_sock); CloseOnExec(conn->data_sock); KeepAlive(conn->data_sock); + MaximizeThroughput(conn->data_sock); SetSocketBuffer(conn->data_sock); SetSocketMaxseg(conn->data_sock); diff -ruN lftp-3.1.0/src/ftpclass.h lftp-3.1.1/src/ftpclass.h --- lftp-3.1.0/src/ftpclass.h Mon Nov 15 12:27:56 2004 +++ lftp-3.1.1/src/ftpclass.h Wed Mar 9 10:54:10 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: ftpclass.h,v 1.123 2004/11/15 09:27:56 lav Exp $ */ +/* $Id: ftpclass.h,v 1.124 2005/03/09 07:54:10 lav Exp $ */ #ifndef FTPCLASS_H #define FTPCLASS_H @@ -515,6 +515,11 @@ if(copy_mode==COPY_SOURCE) return copy_addr_valid && expect->FirstIs(Expect::TRANSFER); return state==WAITING_STATE && expect->IsEmpty(); + } + void CopyCheckTimeout(Ftp *o) + { + BumpEventTime(o->event_time); + CheckTimeout(); } }; diff -ruN lftp-3.1.0/src/misc.cc lftp-3.1.1/src/misc.cc --- lftp-3.1.0/src/misc.cc Wed Feb 23 21:29:47 2005 +++ lftp-3.1.1/src/misc.cc Wed Mar 9 12:24:03 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: misc.cc,v 1.69 2005/02/23 18:29:47 lav Exp $ */ +/* $Id: misc.cc,v 1.71 2005/03/09 09:24:03 lav Exp $ */ #include #include "xmalloc.h" @@ -804,14 +804,20 @@ char *ret=xstrdup(fn); return dirname_modify(ret); } -char *dirname_modify(char *ret) +char *strip_trailing_slashes(char *ret) { int len=strlen(ret); - - /* remove trailing slashes */ while(len>0 && ret[len-1]=='/') - ret[--len] = 0; - + len--; + if(len==0 && ret[0]=='/') + len=1+(ret[1]=='/'); + if(len>0) + ret[len]=0; + return ret; +} +char *dirname_modify(char *ret) +{ + strip_trailing_slashes(ret); char *slash=strrchr(ret,'/'); if(!slash) ret[0]=0; /* file with no path */ diff -ruN lftp-3.1.0/src/misc.h lftp-3.1.1/src/misc.h --- lftp-3.1.0/src/misc.h Wed Nov 17 15:58:25 2004 +++ lftp-3.1.1/src/misc.h Sat Mar 5 09:53:17 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: misc.h,v 1.35 2004/11/15 09:27:57 lav Exp $ */ +/* $Id: misc.h,v 1.36 2005/03/05 06:53:17 lav Exp $ */ #ifndef MISC_H #define MISC_H @@ -111,6 +111,7 @@ char *dirname_alloc(const char *fn); char *dirname_modify(char *fn); +char *strip_trailing_slashes(char *fn); /* returns last character of string or \0 if string is empty */ char last_char(const char *str); diff -ruN lftp-3.1.0/src/mvJob.cc lftp-3.1.1/src/mvJob.cc --- lftp-3.1.0/src/mvJob.cc Wed Jul 31 13:18:44 2002 +++ lftp-3.1.1/src/mvJob.cc Thu Mar 3 10:39:49 2005 @@ -22,10 +22,18 @@ #include #include "trio.h" #include "mvJob.h" +#include "misc.h" mvJob::mvJob(FileAccess *session,const char *from,const char *to) : SessionJob(session) { failed=0; + if(last_char(to)=='/') + { + const char *from_bn=basename_ptr(from); + char *to1=alloca_strdup2(to,strlen(from_bn)); + strcat(to1,from_bn); + to=to1; + } session->Rename(from,to); } diff -ruN lftp-3.1.0/src/resource.cc lftp-3.1.1/src/resource.cc --- lftp-3.1.0/src/resource.cc Fri Feb 25 15:47:42 2005 +++ lftp-3.1.1/src/resource.cc Sat Mar 5 10:07:03 2005 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: resource.cc,v 1.113 2005/02/25 12:47:42 lav Exp $ */ +/* $Id: resource.cc,v 1.114 2005/03/05 07:07:03 lav Exp $ */ #include @@ -191,6 +191,7 @@ ResDecl01g("ftp:client", PACKAGE"/"VERSION,0,0), ResDecl01e("ftp:device-prefix", "no", ResMgr::BoolValidate,0), ResDecl01c("ftp:fix-pasv-address", "yes", ResMgr::BoolValidate,0), + ResDecl01h("ftp:ignore-pasv-address", "no", ResMgr::BoolValidate,0), ResDecl01d("ftp:fxp-force", "no", ResMgr::BoolValidate,0), ResDecl02 ("ftp:fxp-passive-source", "no", ResMgr::BoolValidate,ResMgr::NoClosure), ResDecl02d("ftp:fxp-passive-sscn", "yes", ResMgr::BoolValidate,ResMgr::NoClosure),