diff --git a/NEWS b/NEWS index a3420112d..2b950a1aa 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +Version 4.9.2 - 2020-08-13 + * mkdir: fixed exit code with -f option. * ftp: made ftp:use-pret setting tri-boolean. * get/mget/put/mput: don't try next files after error if cmd:fail-exit is true. diff --git a/lib/.gitignore b/lib/.gitignore index 8e952c541..2dd3a6828 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -28,7 +28,6 @@ /dirent.in.h /dirfd.c /dirfd.h -/dosname.h /dummy.c /dup2.c /errno.in.h @@ -299,14 +298,11 @@ stddef.h /hard-locale.c /hard-locale.h /basename-lgpl.c -/dirname-lgpl.c -/dirname.h /flexmember.h /getprogname.c /getprogname.h /limits.in.h limits.h -/stripslash.c /minmax.h /_Noreturn.h /getopt-cdefs.in.h @@ -314,8 +310,6 @@ limits.h /getopt-ext.h /getopt-pfx-core.h /getopt-pfx-ext.h -/localtime-buffer.c -/localtime-buffer.h /stat-w32.c /stat-w32.h /tzset.c @@ -362,3 +356,11 @@ limits.h /mbtowc-lock.c /mbtowc-lock.h /setlocale_null.h +/attribute.h +/basename-lgpl.h +/ctype.in.h +/isblank.c +/strnlen.c +/wmemchr-impl.h +/wmemchr.c +/wmempcpy.c diff --git a/m4/.gitignore b/m4/.gitignore index 590ecb6d9..05380bb04 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -61,7 +61,6 @@ /inttypes_h.m4 /inttypes-h.m4 /inttypes.m4 -/inttypes-pri.m4 /isc-posix.m4 /isnand.m4 /isnanf.m4 @@ -231,7 +230,6 @@ /time_rz.m4 /timegm.m4 /memcasecmp.m4 -/dirname.m4 /double-slash-root.m4 /getprogname.m4 /limits-h.m4 @@ -239,7 +237,6 @@ /getlogin.m4 /minmax.m4 /pthread_rwlock_rdlock.m4 -/localtime-buffer.m4 /tzset.m4 /__inline.m4 /nstrftime.m4 @@ -262,3 +259,9 @@ /open-slash.m4 /setlocale_null.m4 /visibility.m4 +/ctype.m4 +/isblank.m4 +/strnlen.m4 +/wmemchr.m4 +/wmempcpy.m4 +/zzgnulib.m4 diff --git a/po/cs.po b/po/cs.po index 68bdad3a5..6850dd7c6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 4.8.0\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2017-07-10 21:40+02:00\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -97,11 +97,11 @@ msgstr "%s: volba vyžaduje argument – „%c“\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "„" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "“" @@ -181,7 +181,7 @@ msgstr "Modul pro příkaz „%s“ si nezaregistroval tento příkaz.\n" msgid "cd ok, cwd=%s\n" msgstr "cd uspělo, cwd=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: přijato přesměrování na „%s“\n" @@ -1281,7 +1281,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "Použití: %s [-e příkaz] [-p port] [-u uživatel[,heslo]] \n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " – nepodporovaný protokol" @@ -1299,7 +1299,7 @@ msgstr "%s: GetPass() selhalo – bude se předpokládat anonymní přihlášen #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1646,12 +1646,12 @@ msgstr "" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "%'lld $#ll#bajt přenesen|bajty přeneseny|bajtů přeneseno$" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "Přenos %'d z %'d $souboru|souborů|souborů$ selhal\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "Celkem přeneseno: %'d $soubor|soubory|souborů$\n" @@ -1664,8 +1664,8 @@ msgstr "Přístup selhal: " msgid "File cannot be accessed" msgstr "K souboru nelze přistoupit" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "Nepřipojeno" @@ -1742,7 +1742,7 @@ msgstr "kopírování: obdrženo přesměrování na „%s“\n" msgid "file name missed in URL" msgstr "v URL chybí název souboru" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "Příkaz verify (ověření) selhal bez vysvětlení" @@ -1811,45 +1811,45 @@ msgid "Running connect program" msgstr "Běží připojovací program" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "Druhá strana uzavřela spojení" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "nadbytečná odpověď serveru" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "Navazuje se spojení…" -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "Spojeno" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "Čeká se na odpověď…" -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "Přijímají se data" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "Odesílají se data" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "Hotovo" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Přijímá se seznam souborů (%'lld) [%s])" @@ -1960,7 +1960,7 @@ msgstr "Datový socket se připojuje na (%s) port %u" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Datový socket se připojuje na proxy %s (%s) port %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "Pasivní režim bude vypnut" @@ -1970,7 +1970,7 @@ msgstr "Pasivní režim bude vypnut" msgid "Data connection established" msgstr "Datové spojení navázáno" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "Je nastaveno ftp:ssl-force, ale server nepodporuje nebo nedovoluje SSL" @@ -1990,80 +1990,80 @@ msgstr "Datový socket bude uzavřen" msgid "Closing aborted data socket" msgstr "Přerušený datový socket bude uzavřen" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "v odpovědi zahlédnuta velikost souboru" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "Zapíná se sync-mode (synchronní režim)" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "Zapíná se pasivní režim" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "Vyjednávají se vlastnosti pomocí FEAT…" -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "Odesílají se příkazy…" -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "Zpoždění před opakováním" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "Spojení zahálí" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "Překládá se adresa stroje…" -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "Vyjednává se TLS…" -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "Probíhá přihlašování…" -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "Vytváří se datové spojení…" -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "Mění se vzdálený adresář…" -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "Čeká se na druhou kopírovací protistranu…" -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "Čeká se na dokončení přenosu" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 msgid "Waiting for TLS shutdown..." msgstr "Čeká se ukončení TLS…" -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "Čeká se na datové spojení…" -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "Odesílají se data/TLS" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "Přijímají se data/TLS" @@ -2201,7 +2201,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "Připojí terminál k určenému procesu lftp na pozadí.\n" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "%s nepředložil žádný certifikát.\n" @@ -2271,7 +2271,7 @@ msgstr "%s%d $chyba nalezena|chyby nalezeny|chyb nalezeno$\n" msgid "Finished %s" msgstr "Dokončeno %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "Odstraňuje se starý soubor „%s“" @@ -2296,7 +2296,7 @@ msgstr "Přenáší se soubor „%s“" msgid "Skipping directory `%s' (only-existing)" msgstr "Vynechává se adresář „%s“ (jen existující)" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "Odstraňuje se starý místní soubor „%s“" @@ -2321,52 +2321,56 @@ msgstr "Vytváří se symbolický odkaz „%s“ na „%s“" msgid "Skipping symlink `%s' (only-existing)" msgstr "Vynechává se symbolický odkaz „%s“ (jen existující)" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "zrcadlení: protokol „%s“ se na zrcadlení nehodí\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "Vytváří se adresář „%s“" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, c-format msgid "Old directory `%s' is not removed" msgstr "Starý adresář „%s“ není odstraněn" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "Starý soubor „%s“ není odstraněn" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "Odstraňuje se starý adresář „%s“" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, c-format msgid "Removing source directory `%s'" msgstr "Odstraňuje se zdrojový adresář „%s“" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, c-format msgid "Removing source file `%s'" msgstr "Odstraňuje se zdrojový soubor „%s“" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "Znovu se zkouší zrcadlení…\n" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "%s musí být jeden z: %s" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " @@ -2375,23 +2379,23 @@ msgstr "" "%s: opakující se volby --file a --directory musí mít stejný základní " "adresář\n" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "%s: nejednoznačný zdrojový adresář („%s“ nebo „%s“?)\n" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "%s: nejednoznačný cílový adresář („%s“ nebo „%s“?)\n" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" "%s: je vyžadován zdrojový adresář (mirror:require-source je nastaveno)\n" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2699,7 +2703,7 @@ msgid "%s ok, %d file$|s$ removed\n" msgstr "" "%s uspělo, %d $soubor odstraněn|soubory odstraněny|souborů odstraněno$\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "neplatný tvar odpovědi serveru" @@ -2803,15 +2807,15 @@ msgstr "%.2f MiB/s" msgid "eta:" msgstr "zbývá: " -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 msgid "Password required" msgstr "Vyžadováno heslo" -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "Nesprávné přihlášení" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, c-format msgid "Disconnecting" msgstr "Ukončuje se spojení" diff --git a/po/de.po b/po/de.po index baa7494e8..220cf6585 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2008-03-29 14:27+0100\n" "Last-Translator: Moritz Moeller-Herrmann \n" "Language-Team: German \n" @@ -94,11 +94,11 @@ msgstr "%s: Option erfordert einen Parameter --%c\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "»" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "«" @@ -181,7 +181,7 @@ msgstr "Das Modul für den Befehl »%s« hat den Befehl nicht registriert.\n" msgid "cd ok, cwd=%s\n" msgstr "Verzeichniswechsel OK, cwd=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: Umleitung nach »%s« empfangen\n" @@ -1295,7 +1295,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "Benutzung: %s [-e Befehl] [-p Port] [-u user[,passwort]] \n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " - Protokoll nicht unterstützt" @@ -1313,7 +1313,7 @@ msgstr "%s: GetPass() fehlgeschlagen -- benutze anonymen Login\n" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1642,12 +1642,12 @@ msgstr "%lld $#ll#Byte|Bytes$ übertragen in %ld $#l#Sekunde|Sekunden$" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "%lld $#ll#Byte|Bytes$ übertragen" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "Übertragung von %d der %d $Datei|Dateien$ fehlgeschlagen\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "Insgesamt %d $Datei|Dateien$ übertragen\n" @@ -1660,8 +1660,8 @@ msgstr "Zugriff nicht möglich:" msgid "File cannot be accessed" msgstr "Zugriff auf Datei nicht möglich" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "Keine Verbindung" @@ -1736,7 +1736,7 @@ msgstr "copy: Umleitung nach »%s« empfangen\n" msgid "file name missed in URL" msgstr "Dateiname fehlt in der URL" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "Überprüfung des Befehls fehlgeschlagen ohne Rückmeldung" @@ -1808,45 +1808,45 @@ msgid "Running connect program" msgstr "Starte Verbindungsprogramm" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "Gegenüber hat Verbindung beendet" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "zusätzliche Server Antwort" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "Verbinde..." -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "Verbunden" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "Warte auf Antwort..." -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "Empfange Daten" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "Sende Daten" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "Fertig" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Hole Dateiliste (%lld) [%s]" @@ -1959,7 +1959,7 @@ msgstr "Verbinde Daten Socket mit (%s) Port %u" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Datenverbindung mit Proxy %s (%s) Port %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "Schalte Passivmodus ab" @@ -1969,7 +1969,7 @@ msgstr "Schalte Passivmodus ab" msgid "Data connection established" msgstr "Datenverbindung hergestellt" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 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" @@ -1989,80 +1989,80 @@ msgstr "Schließe den Daten Socket" msgid "Closing aborted data socket" msgstr "Schließe die Datenverbindung" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "Dateigröße in Antwort empfangen" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "sync - Modus eingeschaltet" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "Schalte Passivmodus ein" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "FEAT Verbindungsaufbau..." -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "Schicke Befehle..." -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "Pausiere vor erneuter Verbindung" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "Verbindung ruht" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "Löse Hostadresse auf..." -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "TLS Verbindungsaufbau..." -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "Logge ein..." -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "Stelle Datenverbindung her..." -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "Wechsle nichtlokales Verzeichnis..." -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "Warte auf die Gegenstelle für die andere Kopie..." -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "Warte auf Übertragungsende" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 msgid "Waiting for TLS shutdown..." msgstr "Warte auf Beendung von LTS..." -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "Warte auf Datenverbindung..." -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "Sende Daten/TLS" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "Empfange Daten/TLS" @@ -2202,7 +2202,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "" @@ -2264,7 +2264,7 @@ msgstr "%s%d Fehler gefunden\n" msgid "Finished %s" msgstr "[%lu] Beendet. %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "Entferne alte Datei »%s«" @@ -2289,7 +2289,7 @@ msgstr "Sende Datei »%s«" msgid "Skipping directory `%s' (only-existing)" msgstr "Lege Verzeichnis »%s« an (only-existing)" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "Entferne alte lokale Datei »%s«" @@ -2314,74 +2314,78 @@ msgstr "Erzeuge symbolische Verknüpfung »%s« nach »%s«" msgid "Skipping symlink `%s' (only-existing)" msgstr "Überspringe Verknüpfung »%s« (only-existing)" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "mirror: Protokoll »%s« ist nicht für das spiegeln geeignet\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "Lege Verzeichnis »%s« an" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, c-format msgid "Old directory `%s' is not removed" msgstr "Bestehendes Verzeichnis »%s« wird nicht entfernt" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "Bestehende Datei »%s« wird nicht entfernt" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "Entferne alte Datei »%s«" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, fuzzy, c-format msgid "Removing source directory `%s'" msgstr "Entferne alte Datei »%s«" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, fuzzy, c-format msgid "Removing source file `%s'" msgstr "Entferne alte Datei »%s«" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "Versuche Spiegelserver...\n" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, fuzzy, c-format msgid "%s must be one of: %s" msgstr "muss eins der folgenden sein: C, S, E, P oder leer" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, fuzzy, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "mehrdeutiges Argument %s für %s" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2677,7 +2681,7 @@ msgstr "%s OK, %d Verzeichnis$|se$ entfernt\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s OK, %d Datei$|en$ gelöscht\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "unzulässiges Format der Serverantwort" @@ -2774,16 +2778,16 @@ msgstr "%.2fM/s" msgid "eta:" msgstr "ca. fertig:" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 #, fuzzy msgid "Password required" msgstr "Passwort: " -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, fuzzy, c-format msgid "Disconnecting" msgstr "Verbinde..." diff --git a/po/es.po b/po/es.po index 4e62e52e9..839eec941 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 2.6.0\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2002-08-08 19:01+0000\n" "Last-Translator: Nicolás Lichtmaier \n" "Language-Team: Spanish \n" @@ -90,11 +90,11 @@ msgstr "%s: requiere un argumento -- '%c'\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -178,7 +178,7 @@ msgstr "El módulo para la orden `%s' no registro esa orden.\n" msgid "cd ok, cwd=%s\n" msgstr "cd ok, dir actual=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: se recibió redirección a `%s'\n" @@ -1205,7 +1205,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "Uso: %s [-e cmd] [-p puerto] [-u usuario[,clave]] \n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " - protocolo no soportado" @@ -1223,7 +1223,7 @@ msgstr "%s: GetPass() falló -- asumiendo identificación anónima\n" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1553,12 +1553,12 @@ msgstr "%lld byte$#ll#|s$ transferidos en %ld segundo$#l#|s$." msgid "%lld $#ll#byte|bytes$ transferred" msgstr "%lld byte$#l#|s$ transferidos.\n" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "Falló la transferencia de %d de %d archivo$|s$.\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "%d archivo$|s$ transferido$|s$ en total.\n" @@ -1572,8 +1572,8 @@ msgstr "Falló el acceso: %s" msgid "File cannot be accessed" msgstr "El archivo no puede ser accedido" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "No conectado" @@ -1651,7 +1651,7 @@ msgstr "copy: se recibió redirección a `%s'\n" msgid "file name missed in URL" msgstr "nombre de archivo no encontrado em URL" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "Comando Verify fallo sin mensaje" @@ -1724,46 +1724,46 @@ msgid "Running connect program" msgstr "Ejecutando programa de conección" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "El otro extremo cerró la conexión" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "respuesta extra del servidor" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "Conectándose..." -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "Conectado" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "Esperando respuesta..." -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "Recibiendo datos" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "Enviando datos" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 #, fuzzy msgid "Done" msgstr "\tHecho\n" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Obteniendo lista de archivos (%lld) [%s]" @@ -1880,7 +1880,7 @@ msgstr "Conectando socket de datos a (%s) puerto %u" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Conectando socket de datos a (%s) puerto %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "Desconectando modo pasivo" @@ -1890,7 +1890,7 @@ msgstr "Desconectando modo pasivo" msgid "Data connection established" msgstr "Conexión de datos abierta" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 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" @@ -1910,83 +1910,83 @@ msgstr "Cerrando socket de datos" msgid "Closing aborted data socket" msgstr "Cerrando socket de datos" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "vi tamaño del archivo en la respuesta" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "Activando sync-mode" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "Conectando modo pasivo" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 #, fuzzy msgid "FEAT negotiation..." msgstr "Negociando TLS..." -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "Enviando comandos..." -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 #, fuzzy msgid "Delaying before retry" msgstr "Esperando antes de reintentar" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "Conexión ociosa" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "Resolviendo dirección del servidor..." -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "Negociando TLS..." -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "Identificándose..." -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "Estableciendo la conexión de datos..." -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "Cambiando el directorio remoto..." -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "Esperando al otro extremo para copiar..." -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "Esperando que finalice la transferencia" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 #, fuzzy msgid "Waiting for TLS shutdown..." msgstr "Esperando respuesta..." -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "Esperando la conexión de datos..." -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "Enviando datos/TLS" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "Recibiendo datos/TLS" @@ -2118,7 +2118,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "" @@ -2183,7 +2183,7 @@ msgstr "%s ok, %d directorio$|s$ creado$|s$\n" msgid "Finished %s" msgstr "[%lu] Finalizado. %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "Borrando archivo antiguo `%s'" @@ -2208,7 +2208,7 @@ msgstr "Enviando archivo `%s'" msgid "Skipping directory `%s' (only-existing)" msgstr "Creando directorio `%s'" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "Borrando archivo local antiguo `%s'" @@ -2233,75 +2233,79 @@ msgstr "Creando enlace simbólico `%s' a `%s'" msgid "Skipping symlink `%s' (only-existing)" msgstr "Omitiendo enlace simbolico `%s'" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "mirror: el protocolo `%s' no es adecuado para mirror\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "Creando directorio `%s'" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, fuzzy, c-format msgid "Old directory `%s' is not removed" msgstr "No se borró el archivo `%s'" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "No se borró el archivo `%s'" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "Borrando directorio antiguo `%s'" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, fuzzy, c-format msgid "Removing source directory `%s'" msgstr "Borrando directorio antiguo `%s'" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, fuzzy, c-format msgid "Removing source file `%s'" msgstr "Borrando archivo antiguo `%s'" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "Recibiendo mirror...\n" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "%s debe ser uno de: %s" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "%s: ambiguo directorio de origen (¿`%s' o `%s'?)\n" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "%s: ambiguo directorio de destino (¿`%s' o `%s'?)\n" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" "%s: directorio origen es requerido (mirror:require-source está configurado)\n" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2600,7 +2604,7 @@ msgstr "%s ok, %d directorio$|s$ borrado$|s$\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s ok, %d archivo$|s$ borrado$|s$\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, fuzzy, c-format msgid "invalid server response format" msgstr "respuesta extra del servidor" @@ -2694,16 +2698,16 @@ msgstr "" msgid "eta:" msgstr "falta:" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 #, fuzzy msgid "Password required" msgstr "Clave: " -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, fuzzy, c-format msgid "Disconnecting" msgstr "Conectándose..." diff --git a/po/fr.po b/po/fr.po index f1c726c0b..543eb14a6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2008-04-12 12:40+0200\n" "Last-Translator: Alain PORTAL \n" "Language-Team: Français \n" @@ -92,11 +92,11 @@ msgstr "%s: l'option nécessite un argument -- %c\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "« " -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr " »" @@ -179,7 +179,7 @@ msgstr "Le module pour la commande « %s » n'a pas enregistré la commande.\n" msgid "cd ok, cwd=%s\n" msgstr "cd ok, cwd=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s : reçu une redirection vers « %s »\n" @@ -1295,7 +1295,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "Utilisation : %s [-e cmd] [-p port] [-u user[,pass]] \n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " - protocole non pris en charge" @@ -1313,7 +1313,7 @@ msgstr "%s : GetPass() a échoué -- passage en mode anonyme\n" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1646,12 +1646,12 @@ msgstr "%lld octet$#ll# transféré|s transférés$ en %ld seconde$#l#|s$" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "%lld octet$#ll# transféré|s transférés" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "Le transfert de %d sur %d fichier$|s$ a échoué\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "Total %d fichier$|s$ transférés\n" @@ -1664,8 +1664,8 @@ msgstr "L'accès a échoué : " msgid "File cannot be accessed" msgstr "Impossible d'accéder au fichier" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "Non connecté" @@ -1740,7 +1740,7 @@ msgstr "copy : reçu une redirection vers « %s »\n" msgid "file name missed in URL" msgstr "nom de fichier manquant dans l'URL" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "La commande verify a échoué sans message" @@ -1810,45 +1810,45 @@ msgid "Running connect program" msgstr "Exécution du programme de connexion" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "Connexion interrompue par le tiers" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "réponse du serveur supplémentaire" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "Connexion..." -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "Connecté" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "En attente de réponse..." -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "Réception des données" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "Émission des données" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "Terminé" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Récupération de la liste des fichiers (%lld) [%s]" @@ -1961,7 +1961,7 @@ msgstr "Connexion du socket de données à (%s) port %u" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Connexion du socket de données au proxy %s (%s) port %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "Désactivation du mode passif" @@ -1971,7 +1971,7 @@ msgstr "Désactivation du mode passif" msgid "Data connection established" msgstr "Connexion de donnée établie" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 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" @@ -1990,80 +1990,80 @@ msgstr "Fermeture du socket de données" msgid "Closing aborted data socket" msgstr "Fermeture du socket de données avortée" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "taille du fichier détectée dans la réponse" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "Activation de sync-mode" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "Activation du mode passif" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "négociation FEAT..." -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "Émission des commandes..." -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "Attente avant nouvelle tentative" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "Connexion stagnante" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "Résolution de l'adresse..." -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "Négociation TLS..." -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "Identification en cours..." -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "Établissement de la connexion de données..." -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "Changement de répertoire distant..." -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "En attente de la copie distante..." -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "En attente de la fin du transfert" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 msgid "Waiting for TLS shutdown..." msgstr "En attente de l'arrêt de TLS..." -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "En attente de la connexion de données..." -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "Émission des données/TLS" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "Réception des données/TLS" @@ -2204,7 +2204,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "" @@ -2270,7 +2270,7 @@ msgstr "%s%d $erreur détectée|erreurs détectées$\n" msgid "Finished %s" msgstr "[%lu] Terminé. %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "Suppression de l'ancien fichier « %s »" @@ -2295,7 +2295,7 @@ msgstr "Transfert du fichier « %s »" msgid "Skipping directory `%s' (only-existing)" msgstr "On ignore le répertoire « %s » (only-existing)" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "Suppression de l'ancien fichier local « %s »" @@ -2320,74 +2320,78 @@ msgstr "Création du lien symbolique « %s » vers « %s »" msgid "Skipping symlink `%s' (only-existing)" msgstr "On ignore le lien symbolique « %s » (only-existing)" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "mirror : le protocole « %s » ne convient pas pour une duplication\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "Création du répertoire « %s »" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, c-format msgid "Old directory `%s' is not removed" msgstr "L'ancien répertoire « %s » n'est pas supprimé" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "L'ancien fichier « %s » n'est pas supprimé" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "Suppression de l'ancien répertoire « %s »" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, fuzzy, c-format msgid "Removing source directory `%s'" msgstr "Suppression de l'ancien répertoire « %s »" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, fuzzy, c-format msgid "Removing source file `%s'" msgstr "Suppression de l'ancien fichier « %s »" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "Réessaye la commande mirror...\n" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, fuzzy, c-format msgid "%s must be one of: %s" msgstr "doit être C, S, E, P, ou vide" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, fuzzy, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "Argument %s ambigu pour %s" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2684,7 +2688,7 @@ msgstr "%s ok, %d répertoire$ supprimé|s supprimés$\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s ok, %d fichier$ supprimé|s supprimés$\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "format de réponse du serveur invalide" @@ -2781,16 +2785,16 @@ msgstr "%.2fMo/s" msgid "eta:" msgstr "reste :" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 #, fuzzy msgid "Password required" msgstr "Mot de passe : " -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, fuzzy, c-format msgid "Disconnecting" msgstr "Connexion..." diff --git a/po/it.po b/po/it.po index bf4dc575f..50df19e06 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 2.2.3\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2000-06-18 10:46+02:00\n" "Last-Translator: Giovanni Bortolozzo \n" "Language-Team: Italian \n" @@ -89,11 +89,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -174,7 +174,7 @@ msgstr "" msgid "cd ok, cwd=%s\n" msgstr "cd ok, cwd=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "" @@ -1183,7 +1183,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "Uso: %s [-e cmd] [-p porta] [-u utente,[password]] \n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr "- protocollo non supportato" @@ -1201,7 +1201,7 @@ msgstr "%s: GetPass() fallita -- assumo login anonimo\n" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1533,12 +1533,12 @@ msgstr "%ld byte $#l#trasferito|trasferiti$ in %ld $#l#secondo|secondi$" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "Trasferit$#l#o|i$ %ld byte\n" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "Fallito il trasferimento di %d su %d file$|$\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "Trasferit$o|i$ %d file in totale\n" @@ -1552,8 +1552,8 @@ msgstr "Accesso fallito: %s" msgid "File cannot be accessed" msgstr "Impossibile accedere al file" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "Non connesso" @@ -1629,7 +1629,7 @@ msgstr "" msgid "file name missed in URL" msgstr "nell'URL manca il nome del file" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "" @@ -1700,46 +1700,46 @@ msgid "Running connect program" msgstr "" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "Connessione chiusa dal peer" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "risposta extra del server" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "Connessione in corso..." -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 #, fuzzy msgid "Connected" msgstr "Non connesso" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "In attesa della risposta..." -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "Sto ricevendo i dati" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "Sto inviando i dati" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, fuzzy, c-format msgid "Getting file list (%lld) [%s]" msgstr "Scarico la lista dei file (%ld) [%s]" @@ -1854,7 +1854,7 @@ msgstr "Connessione del socket dei dati a (%s) porta %u" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Connessione del socket dei dati a (%s) porta %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "Metto ad off (disabilito) la modalità passiva" @@ -1865,7 +1865,7 @@ msgid "Data connection established" msgstr "" "L'altro estremo della connesione dati ha un indirizzo che non corrisponde" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" @@ -1884,83 +1884,83 @@ msgstr "Chiusura del socket dati" msgid "Closing aborted data socket" msgstr "Chiusura del socket dati" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "ottenuta in risposta la dimensione del file" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "Abilito la modalità passiva" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "" -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "Invio comandi..." -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "Connessione inattiva" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "Risoluzione dell'indirizzo dell'host..." -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "" -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "Accesso al server..." -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "Creo la connessione dati..." -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "Cambio la directory remota..." -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 #, fuzzy msgid "Waiting for other copy peer..." msgstr "In attesa della risposta..." -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "Attendo la fine del trasferimento" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 #, fuzzy msgid "Waiting for TLS shutdown..." msgstr "In attesa della risposta..." -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "In attesa della connessione dati..." -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 #, fuzzy msgid "Sending data/TLS" msgstr "Sto inviando i dati" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 #, fuzzy msgid "Receiving data/TLS" msgstr "Sto ricevendo i dati" @@ -2093,7 +2093,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "" @@ -2157,7 +2157,7 @@ msgstr "%s ok, create %d directory$|$\n" msgid "Finished %s" msgstr "[%lu] Concluso. %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, fuzzy, c-format msgid "Removing old file `%s'" msgstr "Cancellazione del vecchio file locale `%s'" @@ -2182,7 +2182,7 @@ msgstr "Invio il file locale `%s'" msgid "Skipping directory `%s' (only-existing)" msgstr "Creo la directory remota `%s'" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "Cancellazione del vecchio file locale `%s'" @@ -2207,74 +2207,78 @@ msgstr "Creo il link simbolico da `%s' a `%s'" msgid "Skipping symlink `%s' (only-existing)" msgstr "" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "mirror: il protocollo `%s' non va bene per fare il mirror\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, fuzzy, c-format msgid "Making directory `%s'" msgstr "Creo la directory remota `%s'" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, fuzzy, c-format msgid "Old directory `%s' is not removed" msgstr "Il vecchio file locale `%s' non è stato rimosso" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, fuzzy, c-format msgid "Old file `%s' is not removed" msgstr "Il vecchio file locale `%s' non è stato rimosso" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, fuzzy, c-format msgid "Removing old directory `%s'" msgstr "Cancellazione del vecchio file remoto `%s'" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, fuzzy, c-format msgid "Removing source directory `%s'" msgstr "Cancellazione del vecchio file remoto `%s'" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, fuzzy, c-format msgid "Removing source file `%s'" msgstr "Cancellazione del vecchio file locale `%s'" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2573,7 +2577,7 @@ msgstr "%s ok, rimosse %d directory$|$\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s ok, rimossi %d file$|$\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, fuzzy, c-format msgid "invalid server response format" msgstr "risposta extra del server" @@ -2668,16 +2672,16 @@ msgstr "" msgid "eta:" msgstr "" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 #, fuzzy msgid "Password required" msgstr "Password: " -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, fuzzy, c-format msgid "Disconnecting" msgstr "Connessione in corso..." diff --git a/po/ja.po b/po/ja.po index 03badeec5..8fd58edf8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 2.3.0\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2002-04-12 00:06+0900\n" "Last-Translator: Masayuki Hatta \n" "Language-Team: Japanese \n" @@ -89,11 +89,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -174,7 +174,7 @@ msgstr "コマンド `%s' 用のモジュールがコマンドを登録しませ msgid "cd ok, cwd=%s\n" msgstr "cd 成功、cwd=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: `%s'へのリダイレクションを受け取りました\n" @@ -1198,7 +1198,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "使い方: %s [-e cmd] [-p port] [-u user[,pass]] \n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " - はサポートされていないプロトコルです" @@ -1216,7 +1216,7 @@ msgstr "%s: GetPass() が失敗しました -- 匿名ログインと仮定しま #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1550,12 +1550,12 @@ msgstr "%lld バイト転送済、%ld 秒経過" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "%lld バイト転送済\n" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "%d 個(%d ファイル中)の転送が失敗\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "計 %d ファイル転送済\n" @@ -1569,8 +1569,8 @@ msgstr "アクセス失敗: %s" msgid "File cannot be accessed" msgstr "ファイルにアクセスできません" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "接続されていません" @@ -1647,7 +1647,7 @@ msgstr "copy: `%s' へのリダイレクションを受け取りました\n" msgid "file name missed in URL" msgstr "URL 中にファイル名がありません" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "" @@ -1721,45 +1721,45 @@ msgid "Running connect program" msgstr "" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "ピアが接続を閉じました" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "余分なサーバレスポンスです" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "接続中..." -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "接続しました" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "応答を待っています..." -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "データ受信中" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "データ送信中" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "ファイルリスト (%lld) [%s] を取得中" @@ -1875,7 +1875,7 @@ msgstr "データソケットを (%s) のポート %u に接続中" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "データソケットを (%s) のポート %u に接続中" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "パッシヴモードをオフに切り替えました" @@ -1885,7 +1885,7 @@ msgstr "パッシヴモードをオフに切り替えました" msgid "Data connection established" msgstr "データ接続ピアのアドレスが一致しません" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" "ftp:ssl-force がセットされていますが、サーバは SSL をサポートあるいは許可して" @@ -1906,84 +1906,84 @@ msgstr "データソケットを閉じています" msgid "Closing aborted data socket" msgstr "データソケットを閉じています" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "レスポンス中にファイルサイズがありました" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "sync モードを有効にしました" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "パッシヴモードをオンに切り替えました" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 #, fuzzy msgid "FEAT negotiation..." msgstr "TLS ネゴシエーション..." -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "コマンドを送信中..." -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 #, fuzzy msgid "Delaying before retry" msgstr "再接続を遅延しています" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "接続アイドル" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "ホストアドレスを解決しています..." -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "TLS ネゴシエーション..." -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "ログインしています..." -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "データ接続を確立中..." -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "リモートディレクトリを変更中..." -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "他のコピー相手を待っています..." -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "送受信の完了を待っています" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 #, fuzzy msgid "Waiting for TLS shutdown..." msgstr "応答を待っています..." -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "データ接続を待っています..." -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 #, fuzzy msgid "Sending data/TLS" msgstr "データ送信中" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 #, fuzzy msgid "Receiving data/TLS" msgstr "データ受信中" @@ -2124,7 +2124,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "" @@ -2190,7 +2190,7 @@ msgstr "%s 成功、%d 個のディレクトリを作成しました\n" msgid "Finished %s" msgstr "[%lu] 完了。 %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, fuzzy, c-format msgid "Removing old file `%s'" msgstr "古いローカルファイル `%s' を削除しています" @@ -2215,7 +2215,7 @@ msgstr "ローカルファイル `%s' を送信しています" msgid "Skipping directory `%s' (only-existing)" msgstr "リモートディレクトリ `%s' を作成しています" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "古いローカルファイル `%s' を削除しています" @@ -2240,74 +2240,78 @@ msgstr "`%s' から `%s' へのシンボリックリンクを張っています" msgid "Skipping symlink `%s' (only-existing)" msgstr "" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "mirror: プロトコル `%s' はミラーに適しません\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, fuzzy, c-format msgid "Making directory `%s'" msgstr "リモートディレクトリ `%s' を作成しています" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, fuzzy, c-format msgid "Old directory `%s' is not removed" msgstr "古いローカルファイル `%s' は削除されません" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, fuzzy, c-format msgid "Old file `%s' is not removed" msgstr "古いローカルファイル `%s' は削除されません" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, fuzzy, c-format msgid "Removing old directory `%s'" msgstr "古いリモートディレクトリ `%s' を削除しています" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, fuzzy, c-format msgid "Removing source directory `%s'" msgstr "古いリモートディレクトリ `%s' を削除しています" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, fuzzy, c-format msgid "Removing source file `%s'" msgstr "古いローカルファイル `%s' を削除しています" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2607,7 +2611,7 @@ msgstr "%s 成功、%d 個のディレクトリを削除しました\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s 成功、%d ファイルを削除しました\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, fuzzy, c-format msgid "invalid server response format" msgstr "余分なサーバレスポンスです" @@ -2702,16 +2706,16 @@ msgstr "%.2fMB/s" msgid "eta:" msgstr "eta:" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 #, fuzzy msgid "Password required" msgstr "パスワード: " -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, fuzzy, c-format msgid "Disconnecting" msgstr "接続中..." diff --git a/po/ko.po b/po/ko.po index 243265b24..3af0ebbf7 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 2.1.1\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2001-05-27 KST\n" "Last-Translator: Dojip Kim \n" "Language-Team: \n" @@ -89,11 +89,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -174,7 +174,7 @@ msgstr "`%s'명령에 대한 모듈이 등록되어 있지 않습니다.\n" msgid "cd ok, cwd=%s\n" msgstr "cd 성공, cwd=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: `%s'으로 리다이렉션을 받음\n" @@ -1147,7 +1147,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "사용법: %s [-e cmd] [-p port] [-u user[,pass]] \n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " - 지원하지 않는 프로토콜입니다" @@ -1165,7 +1165,7 @@ msgstr "%s: GetPass() 실패 -- 익명의 로그인으로 간주합니다\n" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1495,12 +1495,12 @@ msgstr "%lld $#l#byte|bytes$ 전송 in %ld $#l#second|seconds$" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "%lld $#ll#byte|bytes$ 전송\n" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "%d of %d $file|files$ 전송 실패\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "총 %d $file|files$ 전송\n" @@ -1514,8 +1514,8 @@ msgstr "접속 실패: %s" msgid "File cannot be accessed" msgstr "파일을 읽을 수 없습니다" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "접속되지 않았습니다" @@ -1593,7 +1593,7 @@ msgstr "copy: `%s'로 재지정하여 받음\n" msgid "file name missed in URL" msgstr "URL에 파일명이 빠졌습니다" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "" @@ -1666,46 +1666,46 @@ msgid "Running connect program" msgstr "" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "접속이 끊겼습니다" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "임시 서버 응답" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "접속중..." -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "접속되었음" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "응답을 기다립니다..." -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "자료 받는 중" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "자료 보내는 중" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 #, fuzzy msgid "Done" msgstr "\t완료\n" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "파일 목록을 가져옵니다 (%lld) [%s]" @@ -1817,7 +1817,7 @@ msgstr "(%s) 포트 %u에 자료 소켓을 연결합니다" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "(%s) 포트 %u에 자료 소켓을 연결합니다" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "패시브(passive) 모드 끔" @@ -1827,7 +1827,7 @@ msgstr "패시브(passive) 모드 끔" msgid "Data connection established" msgstr "접속이 잘못된 주소로 된 듯 합니다" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" "ftp:ssl-force가 설정되어있지만 서버가 지원하지 않거나 SSL을 허용하지 않음" @@ -1847,85 +1847,85 @@ msgstr "데이터 소켓 닫음" msgid "Closing aborted data socket" msgstr "데이터 소켓 닫음" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "응답에서 파일 크기를 봅니다" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "동기 모드로 전환" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "패시브(passive) 모드로 전환" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 #, fuzzy msgid "FEAT negotiation..." msgstr "TLS 협상중..." -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "명령어 전송중..." -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 #, fuzzy msgid "Delaying before retry" msgstr "재접속하기 위하여 기다립니다" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "사용하지 않는 접속" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "호스트 주소를 찾습니다..." -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "TLS 협상중..." -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "로그인 중..." -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "접속 하는 중..." -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "원거리 디렉토리 변경중..." -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 #, fuzzy msgid "Waiting for other copy peer..." msgstr "응답을 기다립니다..." -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "전송 완료를 기다립니다" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 #, fuzzy msgid "Waiting for TLS shutdown..." msgstr "응답을 기다립니다..." -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "접속을 기다리는 중..." -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 #, fuzzy msgid "Sending data/TLS" msgstr "자료 보내는 중" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 #, fuzzy msgid "Receiving data/TLS" msgstr "자료 받는 중" @@ -2059,7 +2059,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "" @@ -2123,7 +2123,7 @@ msgstr "%s 성공, %d director$y|ies$ 생성\n" msgid "Finished %s" msgstr "[%lu] 종료. %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, fuzzy, c-format msgid "Removing old file `%s'" msgstr "옛 지역 파일 `%s' 지움" @@ -2148,7 +2148,7 @@ msgstr "지역 파일 `%s'을 전송" msgid "Skipping directory `%s' (only-existing)" msgstr "원거리 디렉토리 `%s' 생성" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "옛 지역 파일 `%s' 지움" @@ -2173,74 +2173,78 @@ msgstr "`%s'를 `%s'로 심볼 링크함" msgid "Skipping symlink `%s' (only-existing)" msgstr "" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "미러: 프로토콜 '%s'은 mirror에 적합하지 않습니다\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, fuzzy, c-format msgid "Making directory `%s'" msgstr "원거리 디렉토리 `%s' 생성" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, fuzzy, c-format msgid "Old directory `%s' is not removed" msgstr "옛 지역 파일 `%s'이 삭제되지 않았습니다" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, fuzzy, c-format msgid "Old file `%s' is not removed" msgstr "옛 지역 파일 `%s'이 삭제되지 않았습니다" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, fuzzy, c-format msgid "Removing old directory `%s'" msgstr "옛 원거리 디렉토리 `%s' 삭제" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, fuzzy, c-format msgid "Removing source directory `%s'" msgstr "옛 원거리 디렉토리 `%s' 삭제" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, fuzzy, c-format msgid "Removing source file `%s'" msgstr "옛 지역 파일 `%s' 지움" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2539,7 +2543,7 @@ msgstr "%s 성공, %d director$y|ies$ 삭제했습니다\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s 성공, %d file$|s$ 삭제했습니다\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, fuzzy, c-format msgid "invalid server response format" msgstr "임시 서버 응답" @@ -2633,16 +2637,16 @@ msgstr "%.2fM/초" msgid "eta:" msgstr "남은시간:" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 #, fuzzy msgid "Password required" msgstr "비밀번호: " -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, fuzzy, c-format msgid "Disconnecting" msgstr "접속중..." diff --git a/po/lftp.pot b/po/lftp.pot index 922f0eb2b..582673ece 100644 --- a/po/lftp.pot +++ b/po/lftp.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lftp 4.9.0.7-7bf1-dirty\n" +"Project-Id-Version: lftp 4.9.1.16-d4fe-dirty\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -91,11 +91,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -175,7 +175,7 @@ msgstr "" msgid "cd ok, cwd=%s\n" msgstr "" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "" @@ -984,7 +984,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr "" @@ -1002,7 +1002,7 @@ msgstr "" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1329,12 +1329,12 @@ msgstr "" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "" @@ -1347,8 +1347,8 @@ msgstr "" msgid "File cannot be accessed" msgstr "" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "" @@ -1423,7 +1423,7 @@ msgstr "" msgid "file name missed in URL" msgstr "" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "" @@ -1492,45 +1492,45 @@ msgid "Running connect program" msgstr "" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "" -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "" -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "" @@ -1639,7 +1639,7 @@ msgstr "" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "" @@ -1649,7 +1649,7 @@ msgstr "" msgid "Data connection established" msgstr "" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" @@ -1668,80 +1668,80 @@ msgstr "" msgid "Closing aborted data socket" msgstr "" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "" -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "" -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "" -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "" -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "" -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "" -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "" -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "" -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 msgid "Waiting for TLS shutdown..." msgstr "" -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "" -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "" @@ -1873,7 +1873,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "" @@ -1935,7 +1935,7 @@ msgstr "" msgid "Finished %s" msgstr "" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "" @@ -1960,7 +1960,7 @@ msgstr "" msgid "Skipping directory `%s' (only-existing)" msgstr "" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "" @@ -1985,74 +1985,78 @@ msgstr "" msgid "Skipping symlink `%s' (only-existing)" msgstr "" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, c-format msgid "Old directory `%s' is not removed" msgstr "" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, c-format msgid "Removing source directory `%s'" msgstr "" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, c-format msgid "Removing source file `%s'" msgstr "" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2344,7 +2348,7 @@ msgstr "" msgid "%s ok, %d file$|s$ removed\n" msgstr "" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "" @@ -2430,15 +2434,15 @@ msgstr "" msgid "eta:" msgstr "" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 msgid "Password required" msgstr "" -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, c-format msgid "Disconnecting" msgstr "" diff --git a/po/pl.po b/po/pl.po index af8ec473a..2f870dee5 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 4.7.2\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2016-05-20 15:00+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -92,11 +92,11 @@ msgstr "%s: opcja musi mieć argument -- '%c'\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "`" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "'" @@ -180,7 +180,7 @@ msgstr "Moduł dla komendy `%s' nie zarejestrował komendy.\n" msgid "cd ok, cwd=%s\n" msgstr "cd ok, cwd=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: otrzymano przekierowanie do `%s'\n" @@ -1286,7 +1286,7 @@ msgstr "" "Użycie: %s [-e polecenie] [-p port] [-u użytkownik[,hasło]] \n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " - protokół nie jest wspierany" @@ -1304,7 +1304,7 @@ msgstr "%s: GetPass() nie powiodło się -- logowanie anonimowe\n" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1644,12 +1644,12 @@ msgstr "%lld bajt$#ll#|y|ów$ przesłan$y|e|ych$ w ciągu %ld sekund$#l#y||$" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "%lld bajt$#ll#|y|ów$ przesłan$y|e|ych$" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "Transfer %d z %d plik$u|ów|ów$ nie powiódł się\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "Podsumowując: przesłano %d plik$|i|ów$\n" @@ -1662,8 +1662,8 @@ msgstr "Brak dostępu: " msgid "File cannot be accessed" msgstr "Brak dostępu do pliku" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "Nie połączony" @@ -1739,7 +1739,7 @@ msgstr "kopiowanie: otrzymano przekierowanie do `%s'\n" msgid "file name missed in URL" msgstr "brak nazwy pliku w URL" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "Polecenie weryfikacji nie powiodło się bez komunikatu" @@ -1809,45 +1809,45 @@ msgid "Running connect program" msgstr "Uruchamianie programu łączącego" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "Komputer po drugiej stronie zamknął połączenie" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "dodatkowa odpowiedź serwera" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "Łączenie się..." -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "Połączono" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "Czekanie na odpowiedź..." -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "Otrzymuję dane" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "Wysyłam dane" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "Gotowe" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Pobieranie listy plików (%lld) [%s]" @@ -1958,7 +1958,7 @@ msgstr "Łączenie się (gniazdo danych) z (%s) port %u" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Łączenie się (gniazdo danych) z proxy %s (%s) port %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "Wyłączam tryb pasywny" @@ -1968,7 +1968,7 @@ msgstr "Wyłączam tryb pasywny" msgid "Data connection established" msgstr "Ustanowiono połączenie dla danych" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 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" @@ -1989,80 +1989,80 @@ msgstr "Zamykanie gniazda danych" msgid "Closing aborted data socket" msgstr "Zamykanie gniazda danych po przerwaniu" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "w odpowiedzi pojawił się rozmiar pliku" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "Włączanie trybu sync" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "Włączam tryb pasywny" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "Negocjacja FEAT..." -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "Wysyłanie komend..." -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "Opóźnienie przed ponownym połączeniem" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "Połączenie bezczynne" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "Uzyskiwanie adresu hosta..." -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "Negocjacja TLS..." -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "Logowanie się..." -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "Ustanawianie połączenia dla danych..." -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "Zmiana zdalnego katalogu..." -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "Oczekiwanie na inne kopiowanie..." -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "Oczekiwanie na zakończenie transferu" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 msgid "Waiting for TLS shutdown..." msgstr "Oczekiwanie na zakończenie TLS..." -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "Oczekiwanie na połączenie dla danych..." -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "Wysyłam dane/TLS" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "Otrzymuję dane/TLS" @@ -2200,7 +2200,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "Dołączenie terminala do podanego procesu lftp działającego w tle.\n" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "" @@ -2270,7 +2270,7 @@ msgstr "%sWykryto %d bł$ąd|ędy|ędów$\n" msgid "Finished %s" msgstr "Zakończono %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "Usuwanie starego pliku `%s'" @@ -2295,7 +2295,7 @@ msgstr "Przesyłanie pliku `%s'" msgid "Skipping directory `%s' (only-existing)" msgstr "Pominięcie katalogu `%s' (tylko istniejące)" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "Usuwanie starego lokalnego pliku `%s'" @@ -2320,75 +2320,79 @@ msgstr "Tworzenie dowiązania symbolicznego `%s' do `%s'" msgid "Skipping symlink `%s' (only-existing)" msgstr "Pomijanie dowiązania symbolicznego `%s' (tylko istniejące)" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "mirror: protokół `%s' nieodpowiedni dla mirrora\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "Tworzenie katalogu `%s'" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, c-format msgid "Old directory `%s' is not removed" msgstr "Stary katalog `%s' nie został usunięty" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "Stary plik `%s' nie został usunięty" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "Usuwanie starego katalogu `%s'" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, c-format msgid "Removing source directory `%s'" msgstr "Usuwanie katalogu źródłowego `%s'" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, c-format msgid "Removing source file `%s'" msgstr "Usuwanie pliku źródłowego `%s'" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "Ponowne próbowanie mirrora...\n" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "%s musi być jednym z: %s" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "%s: niejednoznaczny katalog źródłowy (`%s' czy `%s'?)\n" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "%s: niejednoznaczny katalog docelowy (`%s' czy `%s'?)\n" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" "%s: katalog źródłowy jest wymagany (mirror:require-source jest ustawione)\n" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2683,7 +2687,7 @@ msgstr "%s ok, %d katalog$|i|ów$ usunięto\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s ok, %d plik$|i|ów$ usunięto\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "nieprawidłowy format odpowiedzi serwera" @@ -2780,16 +2784,16 @@ msgstr "%.2f MiB/s" msgid "eta:" msgstr "pozostało: " -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 #, fuzzy msgid "Password required" msgstr "Hasło: " -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, fuzzy, c-format msgid "Disconnecting" msgstr "Łączenie się..." diff --git a/po/pt_BR.po b/po/pt_BR.po index 5c209bde5..2f6652d1c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 1.0\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 1999-07-12 00:00+0400\n" "Last-Translator: Arnaldo Carvalho de Melo \n" "Language-Team: pt_BR \n" @@ -88,11 +88,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -174,7 +174,7 @@ msgstr "" msgid "cd ok, cwd=%s\n" msgstr "" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "" @@ -1101,7 +1101,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 #, fuzzy msgid " - not supported protocol" msgstr "%s: %s - protocolo não suportado\n" @@ -1120,7 +1120,7 @@ msgstr "" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1449,12 +1449,12 @@ msgstr "%ld bytes transmitidos em %ld segundos (%g bytes/s)\n" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "%ld bytes transmitidos\n" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "Transferência de %d de %d arquivos falhou\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, fuzzy, c-format msgid "Total %d $file|files$ transferred\n" msgstr "%d arquivos transmitidos" @@ -1468,8 +1468,8 @@ msgstr "Falha no acesso: %s" msgid "File cannot be accessed" msgstr "Arquivo não pode ser acessado" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "Não conectado" @@ -1545,7 +1545,7 @@ msgstr "" msgid "file name missed in URL" msgstr "" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "" @@ -1615,46 +1615,46 @@ msgid "Running connect program" msgstr "" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "" -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 #, fuzzy msgid "Connected" msgstr "Não conectado" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "" -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, fuzzy, c-format msgid "Getting file list (%lld) [%s]" msgstr "\tExecutando comando embutido `%s' [%s]\n" @@ -1764,7 +1764,7 @@ msgstr "" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "" @@ -1774,7 +1774,7 @@ msgstr "" msgid "Data connection established" msgstr "" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" @@ -1793,80 +1793,80 @@ msgstr "" msgid "Closing aborted data socket" msgstr "" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "" -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "" -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "" -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "" -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "" -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "" -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "" -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "" -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 msgid "Waiting for TLS shutdown..." msgstr "" -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "" -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "" @@ -1998,7 +1998,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "" @@ -2062,7 +2062,7 @@ msgstr "%s: nenhum arquivo encontrado\n" msgid "Finished %s" msgstr "" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, fuzzy, c-format msgid "Removing old file `%s'" msgstr "Removendo arquivo local antigo `%s'" @@ -2087,7 +2087,7 @@ msgstr "Enviando arquivo local `%s'" msgid "Skipping directory `%s' (only-existing)" msgstr "Criando diretório remoto `%s'" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "Removendo arquivo local antigo `%s'" @@ -2112,74 +2112,78 @@ msgstr "Criando link simbólico de `%s' para `%s'" msgid "Skipping symlink `%s' (only-existing)" msgstr "" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "mirror: o protocolo `%s' não pode ser espelhado\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, fuzzy, c-format msgid "Making directory `%s'" msgstr "Criando diretório remoto `%s'" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, fuzzy, c-format msgid "Old directory `%s' is not removed" msgstr "%s: nenhum arquivo encontrado\n" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, fuzzy, c-format msgid "Removing old directory `%s'" msgstr "Removendo arquivo remoto antigo `%s'" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, fuzzy, c-format msgid "Removing source directory `%s'" msgstr "Removendo arquivo remoto antigo `%s'" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, fuzzy, c-format msgid "Removing source file `%s'" msgstr "Removendo arquivo local antigo `%s'" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2476,7 +2480,7 @@ msgstr "%s: nenhum arquivo encontrado\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s: nenhum arquivo encontrado\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "" @@ -2562,15 +2566,15 @@ msgstr "" msgid "eta:" msgstr "" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 msgid "Password required" msgstr "" -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, c-format msgid "Disconnecting" msgstr "" diff --git a/po/ru.po b/po/ru.po index a3ffe981d..f9cb644f3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 4.7.5\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2016-11-30 13:40+0300\n" "Last-Translator: Alexander V. Lukyanov \n" "Language-Team: Russian \n" @@ -37,29 +37,29 @@ msgid "Unknown system error" msgstr "Неизвестная системная ошибка" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: опция `%s' неоднозначна\n" +msgstr "%s: опция `%s%s' неоднозначна\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: опция `%s' неоднозначна; варианты:" +msgstr "%s: опция `%s%s' неоднозначна; варианты:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: неизвестная опция `%c%s'\n" +msgstr "%s: неизвестная опция `%s%s'\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: опция `%c%s' не позволяет указывать аргумент\n" +msgstr "%s: опция `%s%s' не позволяет указывать аргумент\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: для опции `--%s' требуется аргумент\n" +msgstr "%s: для опции `%s%s' требуется аргумент\n" #: lib/getopt.c:621 #, c-format @@ -92,11 +92,11 @@ msgstr "%s: для опции требуется аргумент -- `%c'\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "«" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "»" @@ -177,7 +177,7 @@ msgstr "Модуль для команды `%s' не зарегистриров msgid "cd ok, cwd=%s\n" msgstr "cd ok, каталог=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: получено перенаправление на `%s'\n" @@ -793,9 +793,8 @@ msgid "Rename to \n" msgstr "Переименовать <файл1> в <файл2>\n" #: src/commands.cc:346 -#, fuzzy msgid "mmv [OPTS] " -msgstr "mget [КЛЮЧИ] <файлы>" +msgstr "mmv [КЛЮЧИ] <файлы> <конечный-каталог>" #: src/commands.cc:347 msgid "" @@ -1197,7 +1196,7 @@ msgstr "" "Использование: %s [-e команда] [-p порт] [-u имя[,пароль]] <машина|url>\n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " - протокол не поддерживается" @@ -1215,7 +1214,7 @@ msgstr "%s: ошибка GetPass() -- подразумевается анони #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1265,14 +1264,14 @@ msgid "Usage: %s [OPTS] files...\n" msgstr "Использование: %s [КЛЮЧИ] файлы...\n" #: src/commands.cc:1784 src/commands.cc:1813 -#, fuzzy, c-format +#, c-format msgid "%s: %s: Number expected. " -msgstr "%s: -n: Ожидается числовое значение. " +msgstr "%s: %s: Ожидается числовое значение. " #: src/commands.cc:1833 -#, fuzzy, c-format +#, c-format msgid "%s: --continue conflicts with --remove-target.\n" -msgstr "%s: --share конфликтует с --only-new.\n" +msgstr "%s: --continue конфликтует с --remove-target.\n" #: src/commands.cc:1843 src/commands.cc:1919 #, c-format @@ -1358,9 +1357,9 @@ msgid "%s: wait loop detected\n" msgstr "%s: обнаружен цикл в цепочке ожидания\n" #: src/commands.cc:2552 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [OPTS] \n" -msgstr "Использование: %s [КЛЮЧИ] <файл>\n" +msgstr "Использование: %s [КЛЮЧИ] <файлы> <конечный-каталог>\n" #: src/commands.cc:2614 src/commands.cc:2949 #, c-format @@ -1549,12 +1548,12 @@ msgstr "" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "%lld $#ll#байт перемещен|байта перемещены|байтов перемещено$" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "Пересылка %d из %d $файла|файлов|файлов$ завершилась неудачей\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "Всего перемещено: %d $файл|файла|файлов$\n" @@ -1567,8 +1566,8 @@ msgstr "Ошибка доступа: " msgid "File cannot be accessed" msgstr "Доступ к файлу невозможен" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "Нет соединения" @@ -1645,7 +1644,7 @@ msgstr "копирование: получено перенаправление msgid "file name missed in URL" msgstr "пропущено имя файла в URL" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "Команда проверки вернула статус ошибки без сообщения" @@ -1697,9 +1696,8 @@ msgid "execl(/bin/sh) failed: %s\n" msgstr "функция execl(/bin/sh) не выполнена: %s\n" #: src/Filter.cc:415 -#, fuzzy msgid "file already exists and xfer:clobber is unset" -msgstr "%s: %s: файл уже существует и не задано xfer:clobber\n" +msgstr "файл уже существует и не задано xfer:clobber" #: src/FindJobDu.cc:101 msgid "total" @@ -1715,45 +1713,45 @@ msgid "Running connect program" msgstr "Выполняется соединяющая программа" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "Соединение закрыто удаленной машиной" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "непредвиденный ответ сервера" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "Установка соединения..." -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "Соединен" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "Ожидание ответа..." -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "Получение данных" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "Отправка данных" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "Готово" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Получение списка файлов (%lld) [%s]" @@ -1802,10 +1800,9 @@ msgid "cannot parse EPSV response" msgstr "невозможно разобрать ответ на EPSV" #: src/ftpclass.cc:837 src/ftpclass.cc:838 -#, fuzzy, c-format -#| msgid "cannot parse EPSV response" +#, c-format msgid "cannot parse custom EPSV response" -msgstr "невозможно разобрать ответ на EPSV" +msgstr "невозможно разобрать ответ на кастомный EPSV" #: src/ftpclass.cc:1122 #, c-format @@ -1863,7 +1860,7 @@ msgstr "Соединение сокета данных с (%s), порт %u" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "Соединение сокета данных с прокси-сервером %s (%s), порт %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "Отключение пассивного режима" @@ -1873,7 +1870,7 @@ msgstr "Отключение пассивного режима" msgid "Data connection established" msgstr "Канал данных установлен" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" "ftp:ssl-force установлено, а сервер не поддерживает или не позволяет " @@ -1894,80 +1891,80 @@ msgstr "Закрытие соединения данных" msgid "Closing aborted data socket" msgstr "Закрытие соединения данных, оставшегося после ABOR" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "замечен размер файла в ответе сервера" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "Включение синхронного режима" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "Включение пассивного режима" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "Согласование FEAT..." -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "Передача команд..." -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "Задержка перед повторной попыткой" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "Соединение не используется" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "Преобразование адреса сервера..." -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "Согласование TLS..." -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "Регистрация..." -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "Установка соединения данных..." -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "Смена каталога на сервере..." -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "Ожидание готовности другой стороны..." -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "Ожидание окончания пересылки" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 msgid "Waiting for TLS shutdown..." msgstr "Ожидание закрытия сеанса TLS..." -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "Ожидание установки соединения данных..." -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "Отправка данных/TLS" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "Получение данных/TLS" @@ -2100,7 +2097,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "Присоединить терминал к указанному фоновому процессу lftp.\n" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "Сервер %s не предъявил свой сертификат.\n" @@ -2164,7 +2161,7 @@ msgstr "%s%d ошиб$ка обнаружена|ки обнаружены|ок msgid "Finished %s" msgstr "Завершено: %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "Удаление старого файла `%s'" @@ -2189,7 +2186,7 @@ msgstr "Копирование файла `%s'" msgid "Skipping directory `%s' (only-existing)" msgstr "Пропущен каталог `%s' (only-existing)" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "Удаление старого локального файла `%s'" @@ -2214,52 +2211,56 @@ msgstr "Создание символьной ссылки `%s' на `%s'" msgid "Skipping symlink `%s' (only-existing)" msgstr "Пропущена символьная ссылка `%s' (only-existing)" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "mirror: протокол `%s' не подходит для зеркалирования\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "Создание каталога `%s'" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, c-format msgid "Old directory `%s' is not removed" msgstr "Старый каталог `%s' не удален" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "Старый файл `%s' не удален" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "Удаление старого каталога `%s'" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, c-format msgid "Removing source directory `%s'" msgstr "Удаление исходного каталога `%s'" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, c-format msgid "Removing source file `%s'" msgstr "Удаление исходного файла `%s'" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "Повторный проход...\n" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "%s должно быть одним из: %s" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " @@ -2268,23 +2269,23 @@ msgstr "" "%s: при указании опций --file или --directory несколько раз базовый каталог " "в них должен совпадать\n" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "%s: неоднозначен исходный каталог (`%s' или `%s'?)\n" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "%s: неоднозначен конечный каталог (`%s' или `%s'?)\n" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" "%s: требуется указать исходный каталог (mirror:require-source установлено)\n" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2577,7 +2578,7 @@ msgstr "%s ok, %d каталог$|а|ов$ удалено\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s ok, %d файл$|а|ов$ удалено\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "неверный формат ответа сервера" @@ -2674,15 +2675,15 @@ msgstr "%.2f Миб/с" msgid "eta:" msgstr "овп:" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 msgid "Password required" msgstr "Требуется пароль" -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "Login/пароль неверный" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, c-format msgid "Disconnecting" msgstr "Закрытие соединения" diff --git a/po/uk.po b/po/uk.po index 640798633..df4b6dd16 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 4.4.8\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2018-01-03 13:01+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -93,11 +93,11 @@ msgstr "%s: до параметра слід додати аргумент — #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "«" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "»" @@ -179,7 +179,7 @@ msgstr "Модулем для команди «%s» не зареєстрова msgid "cd ok, cwd=%s\n" msgstr "cd виконано, cwd=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: отримано переспрямовування до «%s»\n" @@ -1315,7 +1315,7 @@ msgstr "" "адреса>\n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " — немає серед підтримуваних протоколів" @@ -1333,7 +1333,7 @@ msgstr "%s: помилка GetPass() - припускаємо, що вхід є #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1683,12 +1683,12 @@ msgstr "" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "Передано %lld $#ll#байт|байти|байтів$" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "Не вдалося передати %d з %d $файла|файлів|файлів$\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "Загалом перенесено %d $файл|файлів|файлів$\n" @@ -1701,8 +1701,8 @@ msgstr "Спроба доступу зазнала невдачі: " msgid "File cannot be accessed" msgstr "Не вдалося отримати доступ до файла" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "Не з’єднано" @@ -1779,7 +1779,7 @@ msgstr "copy: отримано переспрямування на «%s»\n" msgid "file name missed in URL" msgstr "у адресі не вказано назви файла" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "" "Не вдалося виконати команду перевірки. Додаткових повідомлень не виведено." @@ -1849,45 +1849,45 @@ msgid "Running connect program" msgstr "Запускаємо програму для встановлення з’єднання" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "З’єднання перервано з ініціативи віддаленого комп’ютера" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "зайва відповідь сервера" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "Встановлюємо з’єднання…" -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "З'єднано" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "Очікуємо на відповідь…" -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "Отримуємо дані…" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "Надсилаємо дані" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "Виконано" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "Отримуємо список файлів (%lld) [%s]" @@ -2002,7 +2002,7 @@ msgstr "" "Встановлюємо з’єднання сокета передавання даних з проксі-сервером %s (%s), " "порт %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "Вимикаємо пасивний режим" @@ -2012,7 +2012,7 @@ msgstr "Вимикаємо пасивний режим" msgid "Data connection established" msgstr "Встановлено з’єднання для обміну даними" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "" "Встановлено ftp:ssl-force, а на сервері не підтримується і не дозволяється " @@ -2033,80 +2033,80 @@ msgstr "Закриваємо сокет передавання даних" msgid "Closing aborted data socket" msgstr "Закриваємо перерваний сокет передавання даних" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "розмір файла saw у відповіді" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "Вмикаємо режим синхронізації" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "Вмикаємо пасивний режим" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "Узгодження FEAT…" -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "Надсилаємо команди…" -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "Затримка перед повторною спробою" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "Неактивне з’єднання" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "Визначаємо адресу вузла…" -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "Узгодуємо TLS…" -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "Вхід до системи…" -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "Створюємо з’єднання для передавання даних…" -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "Змінюємо віддалений каталог…" -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "Очікуємо на інший вузол копіювання…" -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "Очікуємо на завершення передавання даних" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 msgid "Waiting for TLS shutdown..." msgstr "Очікуємо на завершення роботи TLS…" -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "Очікуємо на з’єднання для обміну даними…" -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "Надсилаємо дані/TLS" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "Отримуємо дані/TLS" @@ -2247,7 +2247,7 @@ msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "" "Долучити термінал до вказаного переведеного у фоновий режим процесу lftp.\n" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "%s не надано жодних сертифікатів.\n" @@ -2317,7 +2317,7 @@ msgstr "%sвиявлено %d $помилку|помилки|помилок$\n" msgid "Finished %s" msgstr "Завершено %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "Вилучаємо застарілий файл «%s»" @@ -2342,7 +2342,7 @@ msgstr "Переносимо дані файла «%s»" msgid "Skipping directory `%s' (only-existing)" msgstr "Пропускаємо каталог «%s» (only-existing)" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "Вилучаємо застарілий локальний файл «%s»" @@ -2367,53 +2367,57 @@ msgstr "Створюємо символічне посилання «%s» на msgid "Skipping symlink `%s' (only-existing)" msgstr "Пропускаємо символічне посилання «%s» (only-existing)" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "" "mirror: протокол «%s» не може бути використано для дзеркального копіювання\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "Створюємо каталог «%s»" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, c-format msgid "Old directory `%s' is not removed" msgstr "Старий каталог «%s» не вилучено" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "Старий файл «%s» не вилучено" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "Вилучаємо старий каталог «%s»" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, c-format msgid "Removing source directory `%s'" msgstr "Вилучаємо початковий каталог «%s»" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, c-format msgid "Removing source file `%s'" msgstr "Вилучаємо файл джерела «%s»" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "Повторюємо спробу створення дзеркальної копії…\n" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "%s має бути одним з таких значень: %s" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " @@ -2422,22 +2426,22 @@ msgstr "" "%s: якщо вказано декілька параметрів --file або --directory, усі вони " "повинні мати однаковий базовий каталог\n" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "%s: неоднозначний початковий каталог («%s» чи «%s»?)\n" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "%s: неоднозначний каталог призначення («%s» чи «%s»?)\n" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "%s: слід вказати каталог джерела (встановлено mirror:require-source)\n" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2752,7 +2756,7 @@ msgstr "%s виконано, вилучено %d каталог$y|ів$\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s виконано, вилучено %d файл$|ів$\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "некоректний формат відповіді сервера" @@ -2851,15 +2855,15 @@ msgstr "%.2f МіБ/с" msgid "eta:" msgstr "оцінка часу завершення:" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 msgid "Password required" msgstr "Потрібен пароль" -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "Помилкове ім’я користувача" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, c-format msgid "Disconnecting" msgstr "Від'єднуємося" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5f3174606..49e28188b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 4.8.3-dirty\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2018-03-21 02:41+0800\n" "Last-Translator: wwj402@Wang Jian \n" "Language-Team: zh \n" @@ -94,11 +94,11 @@ msgstr "%s：选项需要一个参数 -- '%c'\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -178,7 +178,7 @@ msgstr "命令 `%s' 的模块没有注册该命令。\n" msgid "cd ok, cwd=%s\n" msgstr "cd 成功, 当前目录=%s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s：收到重定向到 `%s'\n" @@ -1243,7 +1243,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "用法：%s [-e cmd] [-p port] [-u user[,pass]] \n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " - 不支持的协议" @@ -1261,7 +1261,7 @@ msgstr "%s：GetPass() 失败 -- 使用匿名登录\n" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1600,12 +1600,12 @@ msgstr "%lld 字节，在 %ld 秒中传输完毕" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "传输 %lld 字节" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "传输 %d/%d 文件失败\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "总共传输 %d 个文件\n" @@ -1618,8 +1618,8 @@ msgstr "访问失败: " msgid "File cannot be accessed" msgstr "文件无法访问" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "未连接" @@ -1694,7 +1694,7 @@ msgstr "复制：接收重定向到 `%s'\n" msgid "file name missed in URL" msgstr "在 URL中缺失文件名" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "没有信息，验证命令失败" @@ -1763,45 +1763,45 @@ msgid "Running connect program" msgstr "运行连接程序" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "对端关闭连接" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "额外的服务器应答" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "正在连接..." -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "已连接" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "正等待应答..." -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "正接收数据" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "正发送数据" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "完成" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "正在获取文件列表 (%lld) [%s]" @@ -1911,7 +1911,7 @@ msgstr "将数据套接字连接到 (%s) 端口 %u" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "将数据套接字连接到代理服务器 %s (%s) 端口 %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "关闭被动模式" @@ -1921,7 +1921,7 @@ msgstr "关闭被动模式" msgid "Data connection established" msgstr "数据连接已建立" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "ftp:ssl-force 已设置并且服务器不支持或不允许使用 SSL" @@ -1940,80 +1940,80 @@ msgstr "关闭数据套接字" msgid "Closing aborted data socket" msgstr "关闭中止的数据套接字" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "在响应时查看文件大小" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "打开同步模式" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "打开被动模式" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "FEAT 协商..." -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "正在发送命令..." -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "重新连接前延时" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "连接空闲" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "正在解析主机地址..." -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "TLS 协商..." -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "正在登录..." -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "正在建立数据连接..." -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "正在改变远程目录..." -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "正在等待其他副本对等方....." -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "正等待传输完成" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 msgid "Waiting for TLS shutdown..." msgstr "正在等待 TLS 关闭..." -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "正等待数据连接..." -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "发送 data/TLS" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "接收 data/TLS" @@ -2151,7 +2151,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "将终端附加到指定的后台 lftp 进程。\n" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "没有由 %s 提供的证书。\n" @@ -2213,7 +2213,7 @@ msgstr "检测到 %s%d 个错误\n" msgid "Finished %s" msgstr "已完成 %s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "正在删除旧文件 `%s'" @@ -2238,7 +2238,7 @@ msgstr "传输文件 '%s'" msgid "Skipping directory `%s' (only-existing)" msgstr "跳过目录 `%s' (仅存在时)" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "正在删除旧的本地文件 `%s'" @@ -2263,74 +2263,78 @@ msgstr "建立符号链接 `%s' 指向 `%s'" msgid "Skipping symlink `%s' (only-existing)" msgstr "跳过符号链接 `%s' (仅存在时)" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "镜像：协议 `%s' 不适合进行镜像\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "建立目录 `%s'" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, c-format msgid "Old directory `%s' is not removed" msgstr "旧的目录 `%s' 没有删除" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "旧的文件 `%s' 没有删除" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "删除旧的目录 `%s'" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, c-format msgid "Removing source directory `%s'" msgstr "删除源目录 `%s'" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, c-format msgid "Removing source file `%s'" msgstr "删除源文件 `%s'" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "重试镜像...\n" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "%s 必须是以下之一：%s" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "%s：多个 --file 或 --directory 选项必须具有相同的基础目录\n" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "%s：不明确的源目录 (%s' 或 `%s'?)\n" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "%s：不明确的目标目录 (`%s' 或 `%s'?)\n" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "%s：源目录是必需的(mirror:require-source 已设置)\n" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2633,7 +2637,7 @@ msgstr "%s 成功，删除 %d 个目录\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s 成功，删除 %d 个文件\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "服务器响应格式无效" @@ -2730,15 +2734,15 @@ msgstr "" msgid "eta:" msgstr "" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 msgid "Password required" msgstr "要求输入密码" -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "登入错误" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, c-format msgid "Disconnecting" msgstr "断开" diff --git a/po/zh_HK.po b/po/zh_HK.po index 376dec653..d35b7afeb 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 3.5.11\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2007-05-13 20:18+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (Hong Kong) \n" @@ -89,11 +89,11 @@ msgstr "%s：選項需要參數 ─ %c\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "‘" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "’" @@ -175,7 +175,7 @@ msgstr "應該和指令 ‘%s’ 有關的模組根本沒有包含該指令在 msgid "cd ok, cwd=%s\n" msgstr "cd 成功，目前的目錄為 %s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s：將輸出結果重新導向至 ‘%s’\n" @@ -1224,7 +1224,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "用法：%s [-e 指令] [-p 連接埠] [-u 用戶名稱[,密碼]] <主機名稱|URL>\n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " - 不支援該種協定" @@ -1242,7 +1242,7 @@ msgstr "%s：GetPass() 錯誤 -- 假設是無名氏身份登入\n" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1570,12 +1570,12 @@ msgstr "於 %2$ld 秒內傳送了 %1$lld 位元組" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "傳送了 %lld 位元組" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "傳送 %2$d 個檔案時有 %1$d 個失敗了\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "共傳送了 %d 個檔案\n" @@ -1589,8 +1589,8 @@ msgstr "存取失敗：%s" msgid "File cannot be accessed" msgstr "無法存取檔案" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "並未連線" @@ -1667,7 +1667,7 @@ msgstr "複製：重新導向至‘%s’\n" msgid "file name missed in URL" msgstr "URL 裏缺少了檔案名稱" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "確認指令失敗，但沒有錯誤訊息" @@ -1738,45 +1738,45 @@ msgid "Running connect program" msgstr "正在執行進行連線的程式" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "對方關閉了連線" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "額外的伺服器回應" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "嘗試連線……" -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "成功連線" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "正在等待回應……" -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "下載中" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "上傳中" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "完成" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "正在擷取檔案清單 (%lld) [%s]" @@ -1888,7 +1888,7 @@ msgstr "連接資料 socket 到 (%s)，埠號為 %u" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "連接資料 socket 到 %s (%s)，埠號為 %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "關閉 passive 模式" @@ -1898,7 +1898,7 @@ msgstr "關閉 passive 模式" msgid "Data connection established" msgstr "成功建立數據連線" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "已設定 ftp:ssl-force 但伺服器不支援/不使用 SSL" @@ -1917,81 +1917,81 @@ msgstr "正在關閉資料 socket" msgid "Closing aborted data socket" msgstr "關閉被中止的數據連線" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "回應中包括檔案的大小" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "開啟 sync-mode" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "開啟 passive 模式" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "支援功能 (FEAT) 協商……" -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "正在送出指令……" -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "重新嘗試之前稍為延遲" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "連線閒置" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "正在解析主機地址……" -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "使用 TLS 協定通訊……" -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "正在登入……" -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "正在建立資料傳送連線……" -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "更改遠端目錄……" -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "等待複製程序的遠端回應……" -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "等待傳送完成" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 #, fuzzy msgid "Waiting for TLS shutdown..." msgstr "正在等待回應……" -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "等待建立資料傳送連線……" -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "上傳中/TLS" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "下載中/TLS" @@ -2130,7 +2130,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "" @@ -2194,7 +2194,7 @@ msgstr "%s發現了 %d 個錯誤\n" msgid "Finished %s" msgstr "[%lu] 完成。%s" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "刪除舊的檔案 ‘%s’" @@ -2219,7 +2219,7 @@ msgstr "正在上傳檔案 ‘%s’" msgid "Skipping directory `%s' (only-existing)" msgstr "正在建立 ‘%s’ 目錄" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "刪除舊的本機檔案 ‘%s’" @@ -2244,74 +2244,78 @@ msgstr "建立符號鏈結 ‘%s’ 到 ‘%s’" msgid "Skipping symlink `%s' (only-existing)" msgstr "" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "mirror：協定 ‘%s’ 不適合作為 mirror 用途\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "正在建立 ‘%s’ 目錄" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, c-format msgid "Old directory `%s' is not removed" msgstr "沒有刪除 ‘%s’ 舊目錄" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "沒有刪除舊檔案 ‘%s’" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "刪除 ‘%s’ 舊目錄" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, fuzzy, c-format msgid "Removing source directory `%s'" msgstr "刪除 ‘%s’ 舊目錄" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, fuzzy, c-format msgid "Removing source file `%s'" msgstr "刪除舊的檔案 ‘%s’" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "重新嘗試 mirror……\n" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, fuzzy, c-format msgid "%s must be one of: %s" msgstr "必須是 C, S, E, P 或者空白。" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, fuzzy, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "%2$s 的參數 %1$s 不明確" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2608,7 +2612,7 @@ msgstr "%s 成功，刪除了 %d 個目錄\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s 成功，刪除了 %d 個檔案\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "伺服器回應格式無效" @@ -2700,15 +2704,15 @@ msgstr "每秒 %.2fM" msgid "eta:" msgstr "距離完成約:" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 msgid "Password required" msgstr "需要密碼" -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "登入錯誤" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, c-format msgid "Disconnecting" msgstr "正在中斷連線" diff --git a/po/zh_TW.po b/po/zh_TW.po index d344a987c..177030375 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lftp 4.6.4\n" "Report-Msgid-Bugs-To: lftp-bugs@lftp.yar.ru\n" -"POT-Creation-Date: 2020-01-15 22:27+0300\n" +"POT-Creation-Date: 2020-08-13 22:44+0300\n" "PO-Revision-Date: 2020-01-16 11:56+0800\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese \n" @@ -92,11 +92,11 @@ msgstr "%s：選項需要參數 ─ ‘%c’\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "‘" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "’" @@ -176,7 +176,7 @@ msgstr "應該和指令 ‘%s’ 有關的模組根本沒有包含該指令在 msgid "cd ok, cwd=%s\n" msgstr "cd 成功，目前的目錄為 %s\n" -#: src/CmdExec.cc:405 src/MirrorJob.cc:728 +#: src/CmdExec.cc:405 src/MirrorJob.cc:736 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s：將輸出結果重新導向至 ‘%s’\n" @@ -1144,7 +1144,8 @@ msgstr "wait [<工作編號>]" msgid "" "Wait for specified job to terminate. If jobno is omitted, wait\n" "for last backgrounded job.\n" -msgstr "等待指定的工作終止。如果沒有指定 <工作編號>，則等待最後一個背景工作完成。\n" +msgstr "" +"等待指定的工作終止。如果沒有指定 <工作編號>，則等待最後一個背景工作完成。\n" #: src/commands.cc:461 msgid "zcat " @@ -1234,7 +1235,7 @@ msgid "Usage: %s [-e cmd] [-p port] [-u user[,pass]] \n" msgstr "用法：%s [-e 指令] [-p 連接埠] [-u 用戶名稱[,密碼]] <主機名稱|URL>\n" #: src/commands.cc:1045 src/commands.cc:2275 src/DummyProto.cc:65 -#: src/MirrorJob.cc:2157 src/MirrorJob.cc:2179 +#: src/MirrorJob.cc:2172 src/MirrorJob.cc:2194 msgid " - not supported protocol" msgstr " - 不支援該種協定" @@ -1252,7 +1253,7 @@ msgstr "%s：GetPass() 錯誤 -- 假設是無名氏身份登入\n" #: src/commands.cc:2186 src/commands.cc:2380 src/commands.cc:2542 #: src/commands.cc:2587 src/commands.cc:2615 src/commands.cc:2622 #: src/commands.cc:2923 src/commands.cc:2950 src/commands.cc:2957 -#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2121 +#: src/commands.cc:3286 src/lftp.cc:267 src/MirrorJob.cc:2136 #: src/SleepJob.cc:144 src/SleepJob.cc:200 src/Torrent.cc:4169 #, c-format msgid "Try `help %s' for more information.\n" @@ -1592,12 +1593,12 @@ msgstr "於 %2$ld 秒內傳送了 %1$lld 位元組" msgid "%lld $#ll#byte|bytes$ transferred" msgstr "傳送了 %lld 位元組" -#: src/CopyJob.cc:282 +#: src/CopyJob.cc:283 #, c-format msgid "Transfer of %d of %d $file|files$ failed\n" msgstr "傳送 %2$d 個檔案時有 %1$d 個失敗了\n" -#: src/CopyJob.cc:288 +#: src/CopyJob.cc:289 #, c-format msgid "Total %d $file|files$ transferred\n" msgstr "共傳送了 %d 個檔案\n" @@ -1610,8 +1611,8 @@ msgstr "存取失敗： " msgid "File cannot be accessed" msgstr "無法存取檔案" -#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4596 -#: src/ftpclass.cc:4605 src/SFtp.cc:1317 src/Torrent.cc:3533 +#: src/FileAccess.cc:163 src/Fish.cc:982 src/ftpclass.cc:4599 +#: src/ftpclass.cc:4608 src/SFtp.cc:1335 src/Torrent.cc:3533 msgid "Not connected" msgstr "並未連線" @@ -1686,7 +1687,7 @@ msgstr "複製：重新導向至‘%s’\n" msgid "file name missed in URL" msgstr "URL 裡缺少了檔案名稱" -#: src/FileCopy.cc:2070 +#: src/FileCopy.cc:2078 msgid "Verify command failed without a message" msgstr "確認指令失敗，但沒有錯誤訊息" @@ -1755,45 +1756,45 @@ msgid "Running connect program" msgstr "正在執行進行連線的程式" #: src/Fish.cc:588 src/ftpclass.cc:2887 src/ftpclass.cc:3107 src/Http.cc:1510 -#: src/SFtp.cc:741 src/SFtp.cc:1078 src/SFtp.cc:1079 src/SSH_Access.cc:165 +#: src/SFtp.cc:741 src/SFtp.cc:1082 src/SFtp.cc:1083 src/SSH_Access.cc:167 #, c-format msgid "Peer closed connection" msgstr "對方關閉了連線" -#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4216 src/SFtp.cc:1103 +#: src/Fish.cc:634 src/ftpclass.cc:3037 src/ftpclass.cc:4219 src/SFtp.cc:1107 #, c-format msgid "extra server response" msgstr "額外的伺服器回應" -#: src/Fish.cc:987 src/ftpclass.cc:4608 src/Http.cc:2329 src/Http.cc:2336 -#: src/SFtp.cc:1323 src/Torrent.cc:3536 src/TorrentTracker.cc:624 +#: src/Fish.cc:987 src/ftpclass.cc:4611 src/Http.cc:2329 src/Http.cc:2336 +#: src/SFtp.cc:1341 src/Torrent.cc:3536 src/TorrentTracker.cc:624 msgid "Connecting..." msgstr "嘗試連線……" -#: src/Fish.cc:989 src/ftpclass.cc:4614 src/SFtp.cc:1325 +#: src/Fish.cc:989 src/ftpclass.cc:4617 src/SFtp.cc:1343 msgid "Connected" msgstr "成功連線" -#: src/Fish.cc:991 src/ftpclass.cc:4591 src/ftpclass.cc:4619 -#: src/ftpclass.cc:4633 src/Http.cc:2338 src/SFtp.cc:1327 +#: src/Fish.cc:991 src/ftpclass.cc:4594 src/ftpclass.cc:4622 +#: src/ftpclass.cc:4636 src/Http.cc:2338 src/SFtp.cc:1345 #: src/TorrentTracker.cc:626 msgid "Waiting for response..." msgstr "正在等待回應……" -#: src/Fish.cc:993 src/ftpclass.cc:4653 src/Http.cc:2341 src/SFtp.cc:1329 +#: src/Fish.cc:993 src/ftpclass.cc:4656 src/Http.cc:2341 src/SFtp.cc:1347 msgid "Receiving data" msgstr "下載中" -#: src/Fish.cc:995 src/ftpclass.cc:4651 src/Http.cc:2334 src/SFtp.cc:1331 +#: src/Fish.cc:995 src/ftpclass.cc:4654 src/Http.cc:2334 src/SFtp.cc:1349 msgid "Sending data" msgstr "上傳中" -#: src/Fish.cc:997 src/SFtp.cc:1333 +#: src/Fish.cc:997 src/SFtp.cc:1351 msgid "Done" msgstr "完成" -#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2178 -#: src/SFtp.cc:2298 +#: src/Fish.cc:1136 src/FtpDirList.cc:123 src/HttpDir.cc:1384 src/SFtp.cc:2196 +#: src/SFtp.cc:2316 #, c-format msgid "Getting file list (%lld) [%s]" msgstr "正在擷取檔案清單 (%lld) [%s]" @@ -1843,7 +1844,6 @@ msgstr "無法分析 EPSV 回應內容" #: src/ftpclass.cc:837 src/ftpclass.cc:838 #, c-format -#| msgid "cannot parse EPSV response" msgid "cannot parse custom EPSV response" msgstr "無法解析自訂的 EPSV 回應內容" @@ -1903,7 +1903,7 @@ msgstr "連接資料 socket 到 (%s)，埠號為 %u" msgid "Connecting data socket to proxy %s (%s) port %u" msgstr "連接資料 socket 到 %s (%s)，埠號為 %u" -#: src/ftpclass.cc:2358 src/ftpclass.cc:4411 +#: src/ftpclass.cc:2358 src/ftpclass.cc:4414 #, c-format msgid "Switching passive mode off" msgstr "關閉 passive 模式" @@ -1913,7 +1913,7 @@ msgstr "關閉 passive 模式" msgid "Data connection established" msgstr "成功建立數據連線" -#: src/ftpclass.cc:2688 src/ftpclass.cc:4545 +#: src/ftpclass.cc:2688 src/ftpclass.cc:4548 msgid "ftp:ssl-force is set and server does not support or allow SSL" msgstr "已設定 ftp:ssl-force 但伺服器不支援/不使用 SSL" @@ -1932,80 +1932,80 @@ msgstr "正在關閉資料 socket" msgid "Closing aborted data socket" msgstr "關閉被中止的數據連線" -#: src/ftpclass.cc:4190 +#: src/ftpclass.cc:4193 #, c-format msgid "saw file size in response" msgstr "回應中包括檔案的大小" -#: src/ftpclass.cc:4230 src/ftpclass.cc:4257 +#: src/ftpclass.cc:4233 src/ftpclass.cc:4260 #, c-format msgid "Turning on sync-mode" msgstr "開啟 sync-mode" -#: src/ftpclass.cc:4431 +#: src/ftpclass.cc:4434 #, c-format msgid "Switching passive mode on" msgstr "開啟 passive 模式" -#: src/ftpclass.cc:4582 +#: src/ftpclass.cc:4585 msgid "FEAT negotiation..." msgstr "支援功能 (FEAT) 協商……" -#: src/ftpclass.cc:4589 +#: src/ftpclass.cc:4592 msgid "Sending commands..." msgstr "正在送出指令……" -#: src/ftpclass.cc:4593 +#: src/ftpclass.cc:4596 msgid "Delaying before retry" msgstr "重新嘗試之前稍為延遲" -#: src/ftpclass.cc:4594 src/Http.cc:2331 +#: src/ftpclass.cc:4597 src/Http.cc:2331 msgid "Connection idle" msgstr "連線閒置" -#: src/ftpclass.cc:4601 src/Http.cc:2323 src/Resolver.cc:172 +#: src/ftpclass.cc:4604 src/Http.cc:2323 src/Resolver.cc:172 #: src/Resolver.cc:217 src/TorrentTracker.cc:622 #, c-format msgid "Resolving host address..." msgstr "正在解析主機地址……" -#: src/ftpclass.cc:4612 +#: src/ftpclass.cc:4615 msgid "TLS negotiation..." msgstr "使用 TLS 協定通訊……" -#: src/ftpclass.cc:4616 +#: src/ftpclass.cc:4619 msgid "Logging in..." msgstr "正在登入……" -#: src/ftpclass.cc:4620 +#: src/ftpclass.cc:4623 msgid "Making data connection..." msgstr "正在建立資料傳送連線……" -#: src/ftpclass.cc:4623 +#: src/ftpclass.cc:4626 msgid "Changing remote directory..." msgstr "變更遠端目錄……" -#: src/ftpclass.cc:4629 +#: src/ftpclass.cc:4632 msgid "Waiting for other copy peer..." msgstr "等待複製程序的遠端回應……" -#: src/ftpclass.cc:4631 src/ftpclass.cc:4655 +#: src/ftpclass.cc:4634 src/ftpclass.cc:4658 msgid "Waiting for transfer to complete" msgstr "等待傳送完成" -#: src/ftpclass.cc:4635 +#: src/ftpclass.cc:4638 msgid "Waiting for TLS shutdown..." msgstr "正在等待 TLS 關閉……" -#: src/ftpclass.cc:4637 +#: src/ftpclass.cc:4640 msgid "Waiting for data connection..." msgstr "等待建立資料傳送連線……" -#: src/ftpclass.cc:4643 +#: src/ftpclass.cc:4646 msgid "Sending data/TLS" msgstr "上傳中/TLS" -#: src/ftpclass.cc:4645 +#: src/ftpclass.cc:4648 msgid "Receiving data/TLS" msgstr "下載中/TLS" @@ -2020,7 +2020,8 @@ msgstr "使用 POST 方法失敗" #: src/Http.cc:1381 msgid "ftp over http cannot work without proxy, set hftp:proxy." -msgstr "若沒有代理伺服器，是不可能在 http 連線上使用 ftp 的，請設定 hftp:proxy。" +msgstr "" +"若沒有代理伺服器，是不可能在 http 連線上使用 ftp 的，請設定 hftp:proxy。" #: src/Http.cc:1537 #, c-format @@ -2143,7 +2144,7 @@ msgstr "" msgid "Attach the terminal to specified backgrounded lftp process.\n" msgstr "將終端機附著在指定的背景 lftp 行程上。\n" -#: src/lftp_ssl.cc:1395 +#: src/lftp_ssl.cc:1402 #, c-format msgid "No certificate presented by %s.\n" msgstr "沒有由 %s 提供的憑證。\n" @@ -2205,7 +2206,7 @@ msgstr "%s發現了 %d 個錯誤\n" msgid "Finished %s" msgstr "%s 已完成" -#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1207 +#: src/MirrorJob.cc:344 src/MirrorJob.cc:519 src/MirrorJob.cc:1218 #, c-format msgid "Removing old file `%s'" msgstr "刪除舊的檔案 ‘%s’" @@ -2230,7 +2231,7 @@ msgstr "正在上傳檔案 ‘%s’" msgid "Skipping directory `%s' (only-existing)" msgstr "正在跳過 ‘%s’ 目錄（唯一存在）" -#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:891 +#: src/MirrorJob.cc:461 src/MirrorJob.cc:550 src/MirrorJob.cc:902 #, c-format msgid "Removing old local file `%s'" msgstr "刪除舊的本機檔案 ‘%s’" @@ -2255,74 +2256,78 @@ msgstr "建立符號鏈結 ‘%s’ 到 ‘%s’" msgid "Skipping symlink `%s' (only-existing)" msgstr "正在跳過 ‘%s’ 符號連結（唯一存在）" -#: src/MirrorJob.cc:799 +#: src/MirrorJob.cc:807 #, c-format msgid "mirror: protocol `%s' is not suitable for mirror\n" msgstr "mirror：協定 ‘%s’ 不適合作為 mirror 用途\n" -#: src/MirrorJob.cc:912 +#: src/MirrorJob.cc:923 #, c-format msgid "Making directory `%s'" msgstr "正在建立 ‘%s’ 目錄" -#: src/MirrorJob.cc:1170 +#: src/MirrorJob.cc:1181 #, c-format msgid "Old directory `%s' is not removed" msgstr "沒有刪除 ‘%s’ 舊目錄" -#: src/MirrorJob.cc:1172 +#: src/MirrorJob.cc:1183 #, c-format msgid "Old file `%s' is not removed" msgstr "沒有刪除舊檔案 ‘%s’" -#: src/MirrorJob.cc:1205 +#: src/MirrorJob.cc:1216 #, c-format msgid "Removing old directory `%s'" msgstr "刪除 ‘%s’ 舊目錄" -#: src/MirrorJob.cc:1327 +#: src/MirrorJob.cc:1339 #, c-format msgid "Removing source directory `%s'" msgstr "正在移除 ‘%s’ 來源目錄" -#: src/MirrorJob.cc:1393 +#: src/MirrorJob.cc:1405 #, c-format msgid "Removing source file `%s'" msgstr "刪除來源檔案 ‘%s’" -#: src/MirrorJob.cc:1413 +#: src/MirrorJob.cc:1425 #, c-format msgid "Retrying mirror...\n" msgstr "重新嘗試 mirror……\n" -#: src/MirrorJob.cc:1764 +#: src/MirrorJob.cc:1694 +msgid "pattern is empty" +msgstr "" + +#: src/MirrorJob.cc:1779 #, c-format msgid "%s must be one of: %s" msgstr "%s 必須為以下之一：%s" -#: src/MirrorJob.cc:2004 +#: src/MirrorJob.cc:2019 #, c-format msgid "" "%s: multiple --file or --directory options must have the same base " "directory\n" msgstr "%s：多個 --file 或 --directory 選項必須有相同的基礎資料夾\n" -#: src/MirrorJob.cc:2145 +#: src/MirrorJob.cc:2160 #, c-format msgid "%s: ambiguous source directory (`%s' or `%s'?)\n" msgstr "%s：不明確的來源目錄（`%s' 或 `%s'？）\n" -#: src/MirrorJob.cc:2167 +#: src/MirrorJob.cc:2182 #, c-format msgid "%s: ambiguous target directory (`%s' or `%s'?)\n" msgstr "%s：不明確的目標目錄（`%s' 或 `%s'？）\n" -#: src/MirrorJob.cc:2208 +#: src/MirrorJob.cc:2223 #, c-format msgid "%s: source directory is required (mirror:require-source is set)\n" msgstr "%s：需要來源目錄（鏡像：已設定 require-source）\n" -#: src/MirrorJob.cc:2327 +#: src/MirrorJob.cc:2343 msgid "" "\n" "Mirror specified remote directory to local directory\n" @@ -2625,7 +2630,7 @@ msgstr "%s 成功，刪除了 %d 個目錄\n" msgid "%s ok, %d file$|s$ removed\n" msgstr "%s 成功，刪除了 %d 個檔案\n" -#: src/SFtp.cc:1094 src/SFtp.cc:1095 +#: src/SFtp.cc:1098 src/SFtp.cc:1099 #, c-format msgid "invalid server response format" msgstr "伺服器回應格式無效" @@ -2721,15 +2726,15 @@ msgstr "%.2f MiB/s" msgid "eta:" msgstr "距離完成約:" -#: src/SSH_Access.cc:95 +#: src/SSH_Access.cc:97 msgid "Password required" msgstr "需要密碼" -#: src/SSH_Access.cc:100 +#: src/SSH_Access.cc:102 msgid "Login incorrect" msgstr "登入錯誤" -#: src/SSH_Access.cc:194 +#: src/SSH_Access.cc:196 #, c-format msgid "Disconnecting" msgstr "正在中斷連線"