Hello community,
here is the log from the commit of package lftp for openSUSE:Factory
checked in at Mon Nov 29 12:35:13 CET 2010.
--------
--- lftp/lftp.changes 2010-11-23 11:46:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/lftp/lftp.changes 2010-11-28 16:50:46.000000000 +0100
@@ -1,0 +2,8 @@
+Sun Nov 28 15:41:33 UTC 2010 - puzel@novell.com
+
+- udpate to 4.1.1
+ * fixed job command line display.
+ * fixed some warnings and compilation with old gcc compilers
+ (Openwall).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
lftp-4.1.0.tar.bz2
New:
----
lftp-4.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lftp.spec ++++++
--- /var/tmp/diff_new_pack.CA0ZUn/_old 2010-11-29 12:24:13.000000000 +0100
+++ /var/tmp/diff_new_pack.CA0ZUn/_new 2010-11-29 12:24:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package lftp (Version 4.1.0)
+# spec file for package lftp (Version 4.1.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
Name: lftp
-Version: 4.1.0
+Version: 4.1.1
Release: 1
License: GPLv2+
Summary: Command Line File Transfer Program
++++++ lftp-4.1.0.tar.bz2 -> lftp-4.1.1.tar.bz2 ++++++
++++ 1654 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/configure.ac new/lftp-4.1.1/configure.ac
--- old/lftp-4.1.0/configure.ac 2010-11-22 11:07:16.000000000 +0100
+++ new/lftp-4.1.1/configure.ac 2010-11-24 08:47:01.000000000 +0100
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.60])
-AC_INIT([lftp], [4.1.0], [lftp-bugs@lftp.yar.ru])
+AC_INIT([lftp], [4.1.1], [lftp-bugs@lftp.yar.ru])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_LIBOBJ_DIR([lib])
@@ -539,6 +539,13 @@
# define PRINTF_LIKE(n,m)
# define __attribute__(x)
#endif
+/* Attribute `sentinel' was valid as of gcc 3.5. */
+#if defined(__GNUC__) && \
+ (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 5))
+# define ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__))
+#else
+# define ATTRIBUTE_SENTINEL
+#endif
#ifdef TRIO_REPLACE_STDIO
/* replace all the functions */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/lftp.lsm new/lftp-4.1.1/lftp.lsm
--- old/lftp-4.1.0/lftp.lsm 2010-11-22 15:53:22.000000000 +0100
+++ new/lftp-4.1.1/lftp.lsm 2010-11-24 16:11:45.000000000 +0100
@@ -1,7 +1,7 @@
Begin3
Title: LFTP command line file transfer program
-Version: 4.1.0
-Entered-date: 2010-11-22
+Version: 4.1.1
+Entered-date: 2010-11-24
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.
@@ -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/source/lftp
- 2178 kB lftp-4.1.0.tar.gz
+ 2178 kB lftp-4.1.1.tar.gz
Alternate-site: metalab.unc.edu /pub/Linux/system/network/file-transfer
Platforms: Unix, G++
Copying-policy: GNU GPL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/lftp.spec new/lftp-4.1.1/lftp.spec
--- old/lftp-4.1.0/lftp.spec 2010-11-22 15:53:18.000000000 +0100
+++ new/lftp-4.1.1/lftp.spec 2010-11-24 16:11:41.000000000 +0100
@@ -1,4 +1,4 @@
-%define version 4.1.0
+%define version 4.1.1
%define release 1
%define use_modules 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/lib/config.h.in new/lftp-4.1.1/lib/config.h.in
--- old/lftp-4.1.0/lib/config.h.in 2010-11-22 11:13:33.000000000 +0100
+++ new/lftp-4.1.1/lib/config.h.in 2010-11-24 08:58:02.000000000 +0100
@@ -2214,6 +2214,13 @@
# define PRINTF_LIKE(n,m)
# define __attribute__(x)
#endif
+/* Attribute `sentinel' was valid as of gcc 3.5. */
+#if defined(__GNUC__) && \
+ (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 5))
+# define ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__))
+#else
+# define ATTRIBUTE_SENTINEL
+#endif
#ifdef TRIO_REPLACE_STDIO
/* replace all the functions */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/NEWS new/lftp-4.1.1/NEWS
--- old/lftp-4.1.0/NEWS 2010-11-22 11:07:04.000000000 +0100
+++ new/lftp-4.1.1/NEWS 2010-11-24 16:10:17.000000000 +0100
@@ -1,3 +1,8 @@
+Version 4.1.1 - 2010-11-24
+
+* fixed job command line display.
+* fixed some warnings and compilation with old gcc compilers (Openwall).
+
Version 4.1.0 - 2010-11-22
* send path components to ftp server separately, unless TVFS is in FEAT reply.
Files old/lftp-4.1.0/po/cs.gmo and new/lftp-4.1.1/po/cs.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/cs.po new/lftp-4.1.1/po/cs.po
--- old/lftp-4.1.0/po/cs.po 2010-11-22 15:28:24.000000000 +0100
+++ new/lftp-4.1.1/po/cs.po 2010-11-24 16:10:48.000000000 +0100
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: lftp 4.0.9\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2010-06-14 21:18+0200\n"
"Last-Translator: Petr Pisar \n"
"Language-Team: Czech \n"
@@ -160,63 +160,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr "Modul pro příkaz „%s“ si nezaregistroval tento příkaz.\n"
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd uspělo, cwd=%s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr "%s: přijato přesměrování na „%s“\n"
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr "Příliš mnoho přesměrování"
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "Přerušení"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "Pozor: neúplný příkaz bude zahozen\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\tVykonává se vestavěný příkaz „%s“ [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr "Fronta je pozastavena."
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "Nyní se vykonává:"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\tČeká se na dokončení úlohy [%d]\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\tČeká se na dokončení úloh: "
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\tBěžící\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, c-format
msgid "\tWaiting for command\n"
msgstr "\tČeká se na příkaz\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr "%s: příkaz „%s“ není zakompilován.\n"
Files old/lftp-4.1.0/po/de.gmo and new/lftp-4.1.1/po/de.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/de.po new/lftp-4.1.1/po/de.po
--- old/lftp-4.1.0/po/de.po 2010-11-22 15:28:21.000000000 +0100
+++ new/lftp-4.1.1/po/de.po 2010-11-24 16:10:45.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2008-03-29 14:27+0100\n"
"Last-Translator: \n"
"Language-Team: German \n"
@@ -162,63 +162,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr "Das Modul für den Befehl »%s« hat den Befehl nicht registriert.\n"
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "Verzeichniswechsel OK, cwd=%s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr "%s: Umleitung nach »%s« empfangen\n"
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr "Zu viele Umleitungen"
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "Abbruch"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "Warnung: unvollständiger Befehl verworfen\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\tEingebautes»%s« wird ausgeführt [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr "Warteschlange wurde angehalten."
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "Momentan läuft:"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\t Warte auf Beendigung von Job [%d]\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\tWarte auf Erledigung der Jobs: "
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\tWird ausgeführt\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, c-format
msgid "\tWaiting for command\n"
msgstr "\tWarten auf Befehl\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr "%s: Befehl »%s« wurde nicht mitkompiliert.\n"
Files old/lftp-4.1.0/po/es.gmo and new/lftp-4.1.1/po/es.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/es.po new/lftp-4.1.1/po/es.po
--- old/lftp-4.1.0/po/es.po 2010-11-22 15:28:21.000000000 +0100
+++ new/lftp-4.1.1/po/es.po 2010-11-24 16:10:45.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lftp 2.6.0\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2002-08-08 19:01+0000\n"
"Last-Translator: Nicol�s Lichtmaier \n"
"Language-Team: Spanish \n"
@@ -156,63 +156,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr "El m�dulo para la orden `%s' no registro esa orden.\n"
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd ok, dir actual=%s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr "%s: se recibi� redirecci�n a `%s'\n"
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr "Demasiadas redirecciones"
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "Interrupci�n"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "Aviso: descartando orden incompleta\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\tEjecutando primitiva `%s' [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr ""
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "Ejecutando ahora:"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\tEsperando que termine la tarea [%d]\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\tEsperando la finalizaci�n de las siguientes tareas: "
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\tEjecutando\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, c-format
msgid "\tWaiting for command\n"
msgstr "\tEsperando orden\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr "%s: la orden `%s' no fue compilada dentro del binario.\n"
Files old/lftp-4.1.0/po/fr.gmo and new/lftp-4.1.1/po/fr.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/fr.po new/lftp-4.1.1/po/fr.po
--- old/lftp-4.1.0/po/fr.po 2010-11-22 15:28:21.000000000 +0100
+++ new/lftp-4.1.1/po/fr.po 2010-11-24 16:10:45.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2008-04-12 12:40+0200\n"
"Last-Translator: Alain PORTAL \n"
"Language-Team: Français \n"
@@ -159,63 +159,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr "Le module pour la commande « %s » n'a pas enregistré la commande.\n"
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd ok, cwd=%s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr "%s : reçu une redirection vers « %s »\n"
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr "Trop de redirections"
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "Interrompu"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "Attention : commande incomplète ignorée\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\tExécution de la commande interne « %s » [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr "La file d'attente est stoppée."
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "En cours d'exécution :"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\tEn attente de la fin de la tâche [%d]\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\tEn attente de la fin des tâches : "
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\tEn cours d'exécution\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, c-format
msgid "\tWaiting for command\n"
msgstr "\tEn attente de la commande\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr "%s : la commande « %s » n'est pas compilée.\n"
Files old/lftp-4.1.0/po/it.gmo and new/lftp-4.1.1/po/it.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/it.po new/lftp-4.1.1/po/it.po
--- old/lftp-4.1.0/po/it.po 2010-11-22 15:28:22.000000000 +0100
+++ new/lftp-4.1.1/po/it.po 2010-11-24 16:10:46.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: lftp 2.2.3\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2000-06-18 10:46+02:00\n"
"Last-Translator: Giovanni Bortolozzo \n"
"Language-Team: Italian \n"
@@ -155,63 +155,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr ""
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd ok, cwd=%s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr ""
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr ""
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "Interruzione"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "Attenzione: ignoro il comando incompleto\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\tEsecuzione del comando interno `%s' [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr ""
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "Ora sto eseguendo:"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\tAttendo la fine del job [%d] per terminare\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, fuzzy, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\tAttendo la fine del job [%d] per terminare\n"
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\tIn esecuzione\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, fuzzy, c-format
msgid "\tWaiting for command\n"
msgstr "parse: manca il comando filtro\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr ""
Files old/lftp-4.1.0/po/ja.gmo and new/lftp-4.1.1/po/ja.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/ja.po new/lftp-4.1.1/po/ja.po
--- old/lftp-4.1.0/po/ja.po 2010-11-22 15:28:22.000000000 +0100
+++ new/lftp-4.1.1/po/ja.po 2010-11-24 16:10:46.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: lftp 2.3.0\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2002-04-12 00:06+0900\n"
"Last-Translator: Masayuki Hatta \n"
"Language-Team: Japanese \n"
@@ -155,63 +155,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr "���ޥ�� `%s' �ѤΥ⥸�塼�뤬���ޥ�ɤ���Ͽ���ޤ���Ǥ�����\n"
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd ������cwd=%s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr "%s: `%s'�ؤΥ�����쥯������������ޤ���\n"
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr "������쥯�����¿�����ޤ�"
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "���Ǥ��ޤ�"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "�ٹ�: �Դ����ʥ��ޥ�ɤ��������ޤ�\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\t��¢���줿 `%s' [%s] ��¹Ԥ��ޤ�\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr ""
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "���¹���:"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\t����� [%d] ����λ����Τ��ԤäƤ��ޤ�\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\t����֤ν�λ���ԤäƤ��ޤ�: "
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\t�¹���\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, c-format
msgid "\tWaiting for command\n"
msgstr "\t���ޥ�ɤ��ԤäƤ��ޤ�\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr "%s: ���ޥ�� `%s'�ϥ���ѥ�������Ȥ߹��ޤ�Ƥ��ޤ���\n"
Files old/lftp-4.1.0/po/ko.gmo and new/lftp-4.1.1/po/ko.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/ko.po new/lftp-4.1.1/po/ko.po
--- old/lftp-4.1.0/po/ko.po 2010-11-22 15:28:22.000000000 +0100
+++ new/lftp-4.1.1/po/ko.po 2010-11-24 16:10:46.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: lftp 2.1.1\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2001-05-27 KST\n"
"Last-Translator: Dojip Kim \n"
"Language-Team: \n"
@@ -155,63 +155,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr "`%s'���ɿ� ���� ����� ��ϵǾ� ���� �ʽ��ϴ�.\n"
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd ����, cwd=%s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr "%s: `%s'���� �����̷����� ����\n"
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr "�����̷����� �ʹ� �����ϴ�"
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "���ͷ�Ʈ"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "���: �ҿ����� ���ɾ� ����\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\t���� ���� `%s' [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr ""
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "���� ������:"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\t�۾� [%d]�� ���Ḧ ��ٸ��� ��\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\t�۾� ���Ḧ ���Ͽ� ��ٸ��� ��: "
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\t������\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, c-format
msgid "\tWaiting for command\n"
msgstr "\t������ ��ٸ��� ��\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr "%s: `%s'������ �����ϵ��� �ʾҽ��ϴ�.\n"
Files old/lftp-4.1.0/po/pl.gmo and new/lftp-4.1.1/po/pl.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/pl.po new/lftp-4.1.1/po/pl.po
--- old/lftp-4.1.0/po/pl.po 2010-11-22 15:28:22.000000000 +0100
+++ new/lftp-4.1.1/po/pl.po 2010-11-24 16:10:46.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: lftp 3.7.1\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2008-05-06 21:20+0200\n"
"Last-Translator: Jakub Bogusz \n"
"Language-Team: Polish \n"
@@ -160,63 +160,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr "Modu� dla komendy `%s' nie zarejestrowa� komendy.\n"
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd ok, cwd=%s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr "%s: otrzymano przekierowanie do `%s'\n"
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr "Zbyt du�o przekierowa�"
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "Przerwanie"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "Uwaga: niekompletna komenda zosta�a odrzucona\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\tUruchamianie wbudowanego `%s' [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr "Kolejka jest zatrzymana."
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "Aktualnie wykonuj�:"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\tOczekiwanie na zako�czenie zadania [%d]\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\tOczekiwanie na zako�czenie prac: "
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\tUruchamianie\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, c-format
msgid "\tWaiting for command\n"
msgstr "\tOczekiwanie na komend�\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr "%s: komenda `%s' nie zosta�a wkompilowana.\n"
Files old/lftp-4.1.0/po/pt_BR.gmo and new/lftp-4.1.1/po/pt_BR.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/pt_BR.po new/lftp-4.1.1/po/pt_BR.po
--- old/lftp-4.1.0/po/pt_BR.po 2010-11-22 15:28:23.000000000 +0100
+++ new/lftp-4.1.1/po/pt_BR.po 2010-11-24 16:10:47.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: lftp 1.0\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 1999-07-12 00:00+0400\n"
"Last-Translator: Arnaldo Carvalho de Melo \n"
"Language-Team: pt_BR \n"
@@ -154,63 +154,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr ""
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr ""
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr ""
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr ""
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "Interrup��o"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "Aten��o: descartando comando incompleto\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\tExecutando comando embutido `%s' [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr ""
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr ""
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\tEsperanto t�rmino do servi�o [%d]\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, fuzzy, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "Esperando t�rmino da filtragem"
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\tExecutando\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, fuzzy, c-format
msgid "\tWaiting for command\n"
msgstr "Aten��o: descartando comando incompleto\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr ""
Files old/lftp-4.1.0/po/ru.gmo and new/lftp-4.1.1/po/ru.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/ru.po new/lftp-4.1.1/po/ru.po
--- old/lftp-4.1.0/po/ru.po 2010-11-22 15:49:01.000000000 +0100
+++ new/lftp-4.1.1/po/ru.po 2010-11-24 16:10:47.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lftp 3.7.3\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2008-05-12 17:38+04:00\n"
"Last-Translator: Alexander V. Lukyanov \n"
"Language-Team: Russian \n"
@@ -159,63 +159,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr "Модуль для команды `%s' не зарегистрировал эту команду\n"
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd ok, каталог=%s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr "%s: получено перенаправление на `%s'\n"
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr "Слишком много перенаправлений"
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "Прерывание"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "Предупреждение: неполный остаток команды игнорируется\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\tВыполнение примитива `%s' [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr "Очередь остановлена."
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "Сейчас исполняется:"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\tОжидание завершения задания [%d]\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\tОжидание завершения заданий: "
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\tВыполнение\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, c-format
msgid "\tWaiting for command\n"
msgstr "\tОжидание команды\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr "%s: команда `%s' не встроена при компиляции.\n"
Files old/lftp-4.1.0/po/zh_CN.gmo and new/lftp-4.1.1/po/zh_CN.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/zh_CN.po new/lftp-4.1.1/po/zh_CN.po
--- old/lftp-4.1.0/po/zh_CN.po 2010-11-22 15:28:23.000000000 +0100
+++ new/lftp-4.1.1/po/zh_CN.po 2010-11-24 16:10:47.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lftp-2.0.4\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 1999-09-10 00:50+0800\n"
"Last-Translator: Wang Jian \n"
"Language-Team: zh \n"
@@ -156,63 +156,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr ""
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd �ɹ�, ��ǰĿ¼=%s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr ""
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr ""
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "�ж�"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "����: ����δ��ɵ�����\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\tִ���ڽ��� `%s' [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr ""
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr ""
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\t�ȴ����� [%d] ��ֹ\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, fuzzy, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "�ȴ���������ֹ"
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\t��������\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, fuzzy, c-format
msgid "\tWaiting for command\n"
msgstr "parse: ȱ�ٹ���������\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr ""
Files old/lftp-4.1.0/po/zh_HK.gmo and new/lftp-4.1.1/po/zh_HK.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/zh_HK.po new/lftp-4.1.1/po/zh_HK.po
--- old/lftp-4.1.0/po/zh_HK.po 2010-11-22 15:28:24.000000000 +0100
+++ new/lftp-4.1.1/po/zh_HK.po 2010-11-24 16:10:48.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: lftp 3.5.11\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2007-05-13 20:18+0800\n"
"Last-Translator: Abel Cheung \n"
"Language-Team: Chinese (Hong Kong) \n"
@@ -155,63 +155,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr "應該和指令 ‘%s’ 有關的模組根本沒有包含該指令在內。\n"
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd 成功,目前的目錄為 %s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr "%s:將輸出結果重新導向至 ‘%s’\n"
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr "重新導向次數太多"
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "中斷"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "警告:忽略不完整的指令\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\t執行內置的 ‘%s’ [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr "佇列已停止。"
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "現在執行:"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\t等待工作 [%d] 終止\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\t等待工作終止:"
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\t正在執行\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, c-format
msgid "\tWaiting for command\n"
msgstr "\t等待輸入指令\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr "%s:編譯程式時沒有包括指令 ‘%s’ 的支援。\n"
Files old/lftp-4.1.0/po/zh_TW.gmo and new/lftp-4.1.1/po/zh_TW.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/po/zh_TW.po new/lftp-4.1.1/po/zh_TW.po
--- old/lftp-4.1.0/po/zh_TW.po 2010-11-22 15:28:24.000000000 +0100
+++ new/lftp-4.1.1/po/zh_TW.po 2010-11-24 16:10:47.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: lftp 3.5.11\n"
"Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n"
-"POT-Creation-Date: 2010-11-22 17:28+0300\n"
+"POT-Creation-Date: 2010-11-24 18:10+0300\n"
"PO-Revision-Date: 2007-05-13 20:18+0800\n"
"Last-Translator: Abel Cheung \n"
"Language-Team: Chinese (Taiwan) \n"
@@ -155,63 +155,63 @@
msgid "Module for command `%s' did not register the command.\n"
msgstr "應該和指令 ‘%s’ 有關的模組根本沒有包含該指令在內。\n"
-#: src/CmdExec.cc:362
+#: src/CmdExec.cc:363
#, c-format
msgid "cd ok, cwd=%s\n"
msgstr "cd 成功,目前的目錄為 %s\n"
-#: src/CmdExec.cc:383 src/MirrorJob.cc:544
+#: src/CmdExec.cc:384 src/MirrorJob.cc:544
#, c-format
msgid "%s: received redirection to `%s'\n"
msgstr "%s:將輸出結果重新導向至 ‘%s’\n"
-#: src/CmdExec.cc:386 src/FileCopy.cc:1061
+#: src/CmdExec.cc:387 src/FileCopy.cc:1061
msgid "Too many redirections"
msgstr "重新導向次數太多"
-#: src/CmdExec.cc:498 src/CmdExec.cc:555
+#: src/CmdExec.cc:499 src/CmdExec.cc:556
msgid "Interrupt"
msgstr "中斷"
-#: src/CmdExec.cc:620
+#: src/CmdExec.cc:621
#, c-format
msgid "Warning: discarding incomplete command\n"
msgstr "警告:忽略不完整的指令\n"
-#: src/CmdExec.cc:714
+#: src/CmdExec.cc:715
#, c-format
msgid "\tExecuting builtin `%s' [%s]\n"
msgstr "\t執行內建的 ‘%s’ [%s]\n"
-#: src/CmdExec.cc:720
+#: src/CmdExec.cc:721
msgid "Queue is stopped."
msgstr "佇列已停止。"
-#: src/CmdExec.cc:725
+#: src/CmdExec.cc:726
msgid "Now executing:"
msgstr "現在執行:"
-#: src/CmdExec.cc:738
+#: src/CmdExec.cc:739
#, c-format
msgid "\tWaiting for job [%d] to terminate\n"
msgstr "\t等待工作 [%d] 終止\n"
-#: src/CmdExec.cc:743
+#: src/CmdExec.cc:744
#, c-format
msgid "\tWaiting for termination of jobs: "
msgstr "\t等待工作終止:"
-#: src/CmdExec.cc:754
+#: src/CmdExec.cc:755
#, c-format
msgid "\tRunning\n"
msgstr "\t正在執行\n"
-#: src/CmdExec.cc:758
+#: src/CmdExec.cc:759
#, c-format
msgid "\tWaiting for command\n"
msgstr "\t等待輸入指令\n"
-#: src/CmdExec.cc:1224
+#: src/CmdExec.cc:1225
#, c-format
msgid "%s: command `%s' is not compiled in.\n"
msgstr "%s:編譯程式時沒有包括指令 ‘%s’ 的支援。\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/src/ChangeLog new/lftp-4.1.1/src/ChangeLog
--- old/lftp-4.1.0/src/ChangeLog 2010-11-22 08:46:50.000000000 +0100
+++ new/lftp-4.1.1/src/ChangeLog 2010-11-24 08:48:09.000000000 +0100
@@ -1,3 +1,12 @@
+2010-11-24 Alexander V. Lukyanov
+
+ * CmdExec.cc: fixed setting of cmdline in new jobs.
+ * Torrent.cc, lftp_rl.c, xstring.cc: fixed warnings
+ (patch from Openwall, Alexander Peslyak).
+ * complete.cc: use CmdExec::is_space for parsing.
+ * xstring.h: fixed compilation with non-gcc and old gcc compilers
+ (patch from Openwall, Alexander Peslyak).
+
2010-11-22 Alexander V. Lukyanov
* MirrorJob.cc, SleepJob.cc: use parse_datetime instead of obsolete
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/src/CmdExec.cc new/lftp-4.1.1/src/CmdExec.cc
--- old/lftp-4.1.0/src/CmdExec.cc 2010-11-22 08:47:23.000000000 +0100
+++ new/lftp-4.1.1/src/CmdExec.cc 2010-11-24 08:46:44.000000000 +0100
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: CmdExec.cc,v 1.149 2010/11/22 07:47:23 lav Exp $ */
+/* $Id: CmdExec.cc,v 1.150 2010/11/24 07:46:44 lav Exp $ */
#include
#include
@@ -238,8 +238,11 @@
return;
}
RevertToSavedSession();
- if(new_job)
+ if(new_job) {
+ if(!new_job->cmdline)
+ new_job->cmdline.set_allocated(cmdline.borrow());
AddNewJob(new_job);
+ }
}
}
@@ -247,8 +250,6 @@
{
if(new_job->jobno<0)
new_job->AllocJobno();
- if(!new_job->cmdline)
- new_job->cmdline.set(cmdline);
new_job->SetParentFg(this,!background);
AddWaiting(new_job);
if(background) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/src/complete.cc new/lftp-4.1.1/src/complete.cc
--- old/lftp-4.1.0/src/complete.cc 2008-11-27 06:56:35.000000000 +0100
+++ new/lftp-4.1.1/src/complete.cc 2010-11-24 08:46:45.000000000 +0100
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: complete.cc,v 1.79 2008/11/27 05:56:35 lav Exp $ */
+/* $Id: complete.cc,v 1.80 2010/11/24 07:46:45 lav Exp $ */
#include
@@ -377,7 +377,7 @@
if((*p=='>' || *p=='|')
&& !lftp_char_is_quoted(cmd,p-cmd))
return LOCAL;
- if(!isspace((unsigned char)*p))
+ if(!CmdExec::is_space(*p))
break;
}
@@ -428,24 +428,24 @@
int second_start=-1;
for(int i=start; i>4; i--)
{
- if(!isspace(rl_line_buffer[i-1]))
+ if(!CmdExec::is_space(rl_line_buffer[i-1]))
break;
- if(!strncmp(rl_line_buffer+i-3,"-o",2) && isspace(rl_line_buffer[i-4]))
+ if(!strncmp(rl_line_buffer+i-3,"-o",2) && CmdExec::is_space(rl_line_buffer[i-4]))
{
was_o=true;
break;
}
- if(!strncmp(rl_line_buffer+i-3,"-N",2) && isspace(rl_line_buffer[i-4]))
+ if(!strncmp(rl_line_buffer+i-3,"-N",2) && CmdExec::is_space(rl_line_buffer[i-4]))
{
was_N=true;
break;
}
- if(i-14 >= 0 && !strncmp(rl_line_buffer+i-13, "--newer-than",12) && isspace(rl_line_buffer[i-14]))
+ if(i-14 >= 0 && !strncmp(rl_line_buffer+i-13, "--newer-than",12) && CmdExec::is_space(rl_line_buffer[i-14]))
{
was_N=true;
break;
}
- if(!strncmp(rl_line_buffer+i-3,"-O",2) && isspace(rl_line_buffer[i-4]))
+ if(!strncmp(rl_line_buffer+i-3,"-O",2) && CmdExec::is_space(rl_line_buffer[i-4]))
{
was_O=true;
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/src/lftp_rl.c new/lftp-4.1.1/src/lftp_rl.c
--- old/lftp-4.1.0/src/lftp_rl.c 2009-11-17 09:18:37.000000000 +0100
+++ new/lftp-4.1.1/src/lftp_rl.c 2010-11-24 08:46:45.000000000 +0100
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: lftp_rl.c,v 1.19 2009/11/17 08:18:37 lav Exp $ */
+/* $Id: lftp_rl.c,v 1.20 2010/11/24 07:46:45 lav Exp $ */
#include
#include
@@ -157,11 +157,11 @@
rl_attempted_completion_function =attempted_completion_function;
rl_getc_function =getc_function;
rl_completer_quote_characters =completer_quote_characters;
- rl_completer_word_break_characters=completer_word_break_characters;
+ rl_completer_word_break_characters=(char*)completer_word_break_characters;
rl_filename_quote_characters =filename_quote_characters;
rl_filename_quoting_function =filename_quoting_function;
- rl_filename_dequoting_function =filename_dequoting_function;
- rl_char_is_quoted_p =char_is_quoted_p;
+ rl_filename_dequoting_function =(rl_dequote_func_t*)filename_dequoting_function;
+ rl_char_is_quoted_p =(rl_linebuf_func_t*)char_is_quoted_p;
rl_completion_display_matches_hook = lftp_rl_display_match_list;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/src/Torrent.cc new/lftp-4.1.1/src/Torrent.cc
--- old/lftp-4.1.0/src/Torrent.cc 2010-11-22 08:47:25.000000000 +0100
+++ new/lftp-4.1.1/src/Torrent.cc 2010-11-24 08:46:45.000000000 +0100
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: Torrent.cc,v 1.39 2010/11/22 07:47:25 lav Exp $ */
+/* $Id: Torrent.cc,v 1.40 2010/11/24 07:46:45 lav Exp $ */
#include
#include
@@ -1124,7 +1124,7 @@
max_idle.toString(TimeInterval::TO_STR_TERSE+TimeInterval::TO_STR_TRANSLATE));
peers.chop();
if(max_idle<60)
- decline_timer.Set(60-max_idle);
+ decline_timer.Set(60-max_idle.Seconds());
}
}
peers.qsort(complete ? PeersCompareSendRate : PeersCompareRecvRate);
@@ -1226,13 +1226,13 @@
int Torrent::PeerBytesAllowed(const TorrentPeer *peer,RateLimit::dir_t dir)
{
float peer_rate=(dir==RateLimit::GET ? peer->peer_send_rate : peer->peer_recv_rate).Get();
- float rate=(dir==RateLimit::GET ? send_rate : recv_rate).Get();
- int min_rate = 1000;
+ float total_rate=(dir==RateLimit::GET ? send_rate : recv_rate).Get();
+ const int min_rate = 1024;
// the more is the opposite rate the more rate allowed, with a minimum
- int bytes = rate_limit.BytesAllowed(dir);
- bytes *= (peer_rate + min_rate);
- bytes /= (rate + active_peers_count*min_rate);
- return bytes;
+ float bytes = rate_limit.BytesAllowed(dir);
+ bytes *= (peer_rate + min_rate)
+ / (total_rate + active_peers_count*min_rate);
+ return (int)bytes;
}
void Torrent::PeerBytesUsed(int b,RateLimit::dir_t dir)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/src/xstring.cc new/lftp-4.1.1/src/xstring.cc
--- old/lftp-4.1.0/src/xstring.cc 2009-12-18 18:00:12.000000000 +0100
+++ new/lftp-4.1.1/src/xstring.cc 2010-11-24 08:46:45.000000000 +0100
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: xstring.cc,v 1.26 2009/12/18 17:00:12 lav Exp $ */
+/* $Id: xstring.cc,v 1.27 2010/11/24 07:46:45 lav Exp $ */
#include
#include
@@ -379,7 +379,7 @@
buf.appendf("%02X",(unsigned char)*s++);
buf.append('>');
} else {
- buf.appendf("",length());
+ buf.appendf("",(int)length());
}
} else {
while(len>0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lftp-4.1.0/src/xstring.h new/lftp-4.1.1/src/xstring.h
--- old/lftp-4.1.0/src/xstring.h 2010-06-07 11:11:03.000000000 +0200
+++ new/lftp-4.1.1/src/xstring.h 2010-11-24 08:02:04.000000000 +0100
@@ -104,7 +104,7 @@
const char *set(const char *s) { return xstrset(buf,s); }
const char *nset(const char *s,int n) { return xstrset(buf,s,n); }
const char *set_allocated(char *s) { xfree(buf); return buf=s; }
- const char *vset(...) __attribute__((sentinel));
+ const char *vset(...) ATTRIBUTE_SENTINEL;
void truncate(size_t n) { if(buf) buf[n]=0; }
char *borrow() { return replace_value(buf,(char*)0); }
bool eq(const char *s) { return !xstrcmp(buf,s); }
@@ -164,8 +164,8 @@
xstring& append(const xstring &s) { return append(s.get(),s.length()); }
xstring& append_padding(int len,char ch);
xstring& vappend(va_list);
- xstring& vappend(...) __attribute__((sentinel));
- xstring& vset(...) __attribute__((sentinel));
+ xstring& vappend(...) ATTRIBUTE_SENTINEL;
+ xstring& vset(...) ATTRIBUTE_SENTINEL;
xstring& vsetf(const char *fmt, va_list ap) { truncate(0); return vappendf(fmt,ap); }
xstring& setf(const char *fmt,...) PRINTF_LIKE(2,3);
xstring& vappendf(const char *fmt, va_list ap);
@@ -175,7 +175,7 @@
static xstring& get_tmp(const char *s,int n) { return get_tmp().nset(s,n); }
static xstring& vformat(const char *fmt,va_list ap) { return get_tmp().vsetf(fmt,ap); }
static xstring& format(const char *fmt,...) PRINTF_LIKE(1,2);
- static xstring& cat(const char *first,...) __attribute__((sentinel));
+ static xstring& cat(const char *first,...) ATTRIBUTE_SENTINEL;
static xstring& join(const char *sep,int n,...);
void truncate(size_t n);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org