diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2006-08-28 15:40:50 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2006-08-28 15:40:50 +0000 |
| commit | 1d52ba244ee360a36db245988a797c7fa143c0f5 (patch) | |
| tree | df59e59561078cc51cec4c0c973429a05865fffc | |
| parent | d63e6fb052ae5881abd265b10eb457bba27490d1 (diff) | |
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | po/Makefile.in | 2 | ||||
| -rw-r--r-- | po/POTFILES | 1 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/aria2c.pot | 125 | ||||
| -rw-r--r-- | po/de.gmo | bin | 20674 -> 20674 bytes | |||
| -rw-r--r-- | po/de.po | 141 | ||||
| -rw-r--r-- | po/ja.gmo | bin | 26090 -> 27544 bytes | |||
| -rw-r--r-- | po/ja.po | 134 | ||||
| -rw-r--r-- | po/ru.gmo | bin | 26737 -> 26737 bytes | |||
| -rw-r--r-- | po/ru.po | 141 | ||||
| -rw-r--r-- | src/HandshakeMessage.cc | 2 | ||||
| -rw-r--r-- | src/TorrentMan.cc | 4 | ||||
| -rw-r--r-- | src/TrackerWatcherCommand.cc | 2 | ||||
| -rw-r--r-- | src/Util.cc | 4 | ||||
| -rw-r--r-- | src/Util.h | 4 | ||||
| -rw-r--r-- | src/main.cc | 5 |
19 files changed, 383 insertions, 207 deletions
@@ -11,6 +11,8 @@ To fix a bug that caused assertion failure in ares_strerror: * src/NameResolver.cc (callback): Fixed the bug. + + * Release 0.7.3 2006-08-27 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for aria2c 0.7.2. +# Generated by GNU Autoconf 2.59 for aria2c 0.7.3. # # Report bugs to <tujikawa@rednoah.com>. # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='aria2c' PACKAGE_TARNAME='aria2c' -PACKAGE_VERSION='0.7.2' -PACKAGE_STRING='aria2c 0.7.2' +PACKAGE_VERSION='0.7.3' +PACKAGE_STRING='aria2c 0.7.3' PACKAGE_BUGREPORT='tujikawa@rednoah.com' ac_unique_file="src/Socket.h" @@ -788,7 +788,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures aria2c 0.7.2 to adapt to many kinds of systems. +\`configure' configures aria2c 0.7.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -854,7 +854,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of aria2c 0.7.2:";; + short | recursive ) echo "Configuration of aria2c 0.7.3:";; esac cat <<\_ACEOF @@ -1004,7 +1004,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -aria2c configure 0.7.2 +aria2c configure 0.7.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1018,7 +1018,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by aria2c $as_me 0.7.2, which was +It was created by aria2c $as_me 0.7.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1661,7 +1661,7 @@ fi # Define the identity of the package. PACKAGE='aria2c' - VERSION='0.7.2' + VERSION='0.7.3' cat >>confdefs.h <<_ACEOF @@ -12227,7 +12227,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by aria2c $as_me 0.7.2, which was +This file was extended by aria2c $as_me 0.7.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12290,7 +12290,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -aria2c config.status 0.7.2 +aria2c config.status 0.7.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index b87d9c51..6adf4dbe 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. # AC_PREREQ(2.59) -AC_INIT(aria2c, 0.7.2, tujikawa@rednoah.com) +AC_INIT(aria2c, 0.7.3, tujikawa@rednoah.com) AM_INIT_AUTOMAKE() AM_PATH_CPPUNIT(1.10.2) AC_CONFIG_SRCDIR([src/Socket.h]) diff --git a/po/Makefile.in b/po/Makefile.in index 528c9324..a3a8541d 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -9,7 +9,7 @@ # General Public License and is *not* in the public domain. PACKAGE = aria2c -VERSION = 0.7.2 +VERSION = 0.7.3 SHELL = /bin/sh diff --git a/po/POTFILES b/po/POTFILES index f73cc6a1..1802dcaa 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,3 +1,4 @@ + ../src/TorrentMan.cc \ ../src/RequestInfo.h \ ../src/message.h \ ../src/DownloadEngineFactory.cc \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 8c87df31..74d86e9f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ +src/TorrentMan.cc src/RequestInfo.h src/message.h src/DownloadEngineFactory.cc diff --git a/po/aria2c.pot b/po/aria2c.pot index 2e87a2ab..32960c3a 100644 --- a/po/aria2c.pot +++ b/po/aria2c.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2006-08-22 00:04+0900\n" +"POT-Creation-Date: 2006-08-28 22:50+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,6 +16,14 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: src/TorrentMan.cc:656 +msgid "Download of selected files was complete." +msgstr "" + +#: src/TorrentMan.cc:659 +msgid "The download was complete." +msgstr "" + #: src/RequestInfo.h:84 #, c-format msgid "" @@ -343,7 +351,7 @@ msgstr "" msgid "Failed to peek data, cause: %s" msgstr "" -#: src/DownloadEngineFactory.cc:102 +#: src/DownloadEngineFactory.cc:106 msgid "Errors occurred while binding port.\n" msgstr "" @@ -608,11 +616,28 @@ msgid "" " ',' and '-' can be used together." msgstr "" +#: src/main.cc:178 +msgid "" +" --seed-time=MINUTES Specify seeding time in minutes. See also\n" +" --seed-ratio option." +msgstr "" + #: src/main.cc:180 +msgid "" +" --seed-ratio=RATIO Specify share ratio. Seed completed torrents " +"until\n" +" share ratio reaches RATIO. 1.0 is encouraged.\n" +" If --seed-time option is specified along with\n" +" this option, seeding ends when at least one " +"of\n" +" the conditions is satisfied." +msgstr "" + +#: src/main.cc:187 msgid " -M, --metalink-file=METALINK_FILE The file path to .metalink file." msgstr "" -#: src/main.cc:181 +#: src/main.cc:188 msgid "" " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" " simultaneously. If more than one connection " @@ -621,20 +646,20 @@ msgid "" " Default: 15" msgstr "" -#: src/main.cc:185 +#: src/main.cc:192 msgid " --metalink-version=VERSION The version of file to download." msgstr "" -#: src/main.cc:186 +#: src/main.cc:193 msgid " --metalink-language=LANGUAGE The language of file to download." msgstr "" -#: src/main.cc:187 +#: src/main.cc:194 msgid "" " --metalink-os=OS The operating system the file is targeted." msgstr "" -#: src/main.cc:188 +#: src/main.cc:195 msgid "" " --follow-metalink=true|false Setting this option to false prevents aria2 " "to\n" @@ -643,166 +668,174 @@ msgid "" " Default: true" msgstr "" -#: src/main.cc:193 +#: src/main.cc:200 msgid " -v, --version Print the version number and exit." msgstr "" -#: src/main.cc:194 +#: src/main.cc:201 msgid " -h, --help Print this message and exit." msgstr "" -#: src/main.cc:197 +#: src/main.cc:204 msgid "" " You can specify multiple URLs. All URLs must point to the same file\n" " or downloading fails." msgstr "" -#: src/main.cc:202 +#: src/main.cc:209 msgid "" " Specify files in multi-file torrent to download. Use conjunction with\n" " -T option. This arguments are ignored if you specify --select-file option." msgstr "" -#: src/main.cc:206 +#: src/main.cc:213 msgid "Examples:" msgstr "" -#: src/main.cc:207 +#: src/main.cc:214 msgid " Download a file by 1 connection:" msgstr "" -#: src/main.cc:209 +#: src/main.cc:216 msgid " Download a file by 2 connections:" msgstr "" -#: src/main.cc:211 +#: src/main.cc:218 msgid " Download a file by 2 connections, each connects to a different server:" msgstr "" -#: src/main.cc:213 +#: src/main.cc:220 msgid " You can mix up different protocols:" msgstr "" -#: src/main.cc:217 +#: src/main.cc:224 msgid " Download a torrent:" msgstr "" -#: src/main.cc:219 +#: src/main.cc:226 msgid " Download a torrent using local .torrent file:" msgstr "" -#: src/main.cc:221 +#: src/main.cc:228 msgid " Download only selected files:" msgstr "" -#: src/main.cc:223 +#: src/main.cc:230 msgid " Print file listing of .torrent file:" msgstr "" -#: src/main.cc:228 +#: src/main.cc:235 msgid " Metalink downloading:" msgstr "" -#: src/main.cc:230 +#: src/main.cc:237 msgid " Download a file using local .metalink file:" msgstr "" -#: src/main.cc:232 +#: src/main.cc:239 msgid " Metalink downloading with preferences:" msgstr "" -#: src/main.cc:236 +#: src/main.cc:243 #, c-format msgid "Report bugs to %s" msgstr "" -#: src/main.cc:361 +#: src/main.cc:370 msgid "unrecognized proxy format" msgstr "" -#: src/main.cc:388 +#: src/main.cc:397 msgid "Currently, supported authentication scheme is basic." msgstr "" -#: src/main.cc:397 +#: src/main.cc:406 msgid "retry-wait must be between 0 and 60." msgstr "" -#: src/main.cc:414 +#: src/main.cc:423 msgid "ftp-type must be either 'binary' or 'ascii'." msgstr "" -#: src/main.cc:423 +#: src/main.cc:432 msgid "ftp-via-http-proxy must be either 'get' or 'tunnel'." msgstr "" -#: src/main.cc:431 +#: src/main.cc:440 msgid "min-segment-size invalid" msgstr "" -#: src/main.cc:442 +#: src/main.cc:451 msgid "http-proxy-method must be either 'get' or 'tunnel'." msgstr "" -#: src/main.cc:450 +#: src/main.cc:459 msgid "listen-port must be between 1024 and 65535." msgstr "" -#: src/main.cc:463 +#: src/main.cc:472 msgid "follow-torrent must be either 'true' or 'false'." msgstr "" -#: src/main.cc:477 +#: src/main.cc:486 msgid "direct-file-mapping must be either 'true' or 'false'." msgstr "" -#: src/main.cc:485 +#: src/main.cc:494 msgid "upload-limit must be greater than or equal to 0." msgstr "" -#: src/main.cc:510 +#: src/main.cc:507 +msgid "seed-time must be greater than or equal to 0." +msgstr "" + +#: src/main.cc:517 +msgid "seed-ratio must be greater than or equal to 0.0." +msgstr "" + +#: src/main.cc:539 msgid "follow-metalink must be either 'true' or 'false'." msgstr "" -#: src/main.cc:518 +#: src/main.cc:547 msgid "lowest-speed-limit must be greater than or equal to 0" msgstr "" -#: src/main.cc:547 +#: src/main.cc:576 msgid "split must be between 1 and 5." msgstr "" -#: src/main.cc:559 +#: src/main.cc:588 msgid "timeout must be between 1 and 600" msgstr "" -#: src/main.cc:568 +#: src/main.cc:597 msgid "max-tries invalid" msgstr "" -#: src/main.cc:590 +#: src/main.cc:619 msgid "metalink-servers must be greater than 0." msgstr "" -#: src/main.cc:610 +#: src/main.cc:639 msgid "specify at least one URL" msgstr "" -#: src/main.cc:617 +#: src/main.cc:646 msgid "daemon failed" msgstr "" -#: src/main.cc:679 +#: src/main.cc:710 msgid "" "Now verifying checksum.\n" "This may take some time depending on your PC environment and the size of " "file." msgstr "" -#: src/main.cc:683 +#: src/main.cc:714 msgid "checksum OK." msgstr "" -#: src/main.cc:686 +#: src/main.cc:717 msgid "checksum ERROR." msgstr "" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2006-08-22 00:04+0900\n" +"POT-Creation-Date: 2006-08-28 22:50+0900\n" "PO-Revision-Date: 2006-05-05 19:44+0900\n" "Last-Translator: Hermann J. Beckers <hj.beckers@onlinehome.de>\n" "Language-Team: deutsch <de@li.org>\n" @@ -16,6 +16,18 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3\n" +#: src/TorrentMan.cc:656 +#, fuzzy +msgid "Download of selected files was complete." +msgstr " Nur ausgewählte Dateien abrufen:" + +#: src/TorrentMan.cc:659 +#, fuzzy +msgid "The download was complete." +msgstr "" +"\n" +"Abruf ist vollständig. <%s>\n" + #: src/RequestInfo.h:84 #, c-format msgid "" @@ -357,7 +369,7 @@ msgstr "Konnte Daten nicht erhalten, Ursache: %s" msgid "Failed to peek data, cause: %s" msgstr "Datenermittelung fehlgeschlagen, Ursache: %s" -#: src/DownloadEngineFactory.cc:102 +#: src/DownloadEngineFactory.cc:106 msgid "Errors occurred while binding port.\n" msgstr "Fehler beim Binden an Port aufgetreten.\n" @@ -717,12 +729,39 @@ msgstr "" " Sie können auch '-' verwenden wie in \"1-5\".\n" " ',' und '-' können zusammen benutzt werden." +#: src/main.cc:178 +#, fuzzy +msgid "" +" --seed-time=MINUTES Specify seeding time in minutes. See also\n" +" --seed-ratio option." +msgstr "" +" -m, --max-tries=N Anzahl Versuche. 0 bedeutet unbegrenzt.\n" +" Fehlwert: 5" + #: src/main.cc:180 #, fuzzy +msgid "" +" --seed-ratio=RATIO Specify share ratio. Seed completed torrents " +"until\n" +" share ratio reaches RATIO. 1.0 is encouraged.\n" +" If --seed-time option is specified along with\n" +" this option, seeding ends when at least one " +"of\n" +" the conditions is satisfied." +msgstr "" +" -s, --split=N Abruf einer Datei mittels N Verbindungen. N " +"muss\n" +" zwischen 1 and 5 liegen. Diese Option betrifft " +"alle URLs.\n" +" Daher verbindet sich aria2 zu jeder URL mit\n" +" N Verbindungen." + +#: src/main.cc:187 +#, fuzzy msgid " -M, --metalink-file=METALINK_FILE The file path to .metalink file." msgstr " -T, --torrent-file=TORRENT_FILE Datenpfad zur torrent-Datei." -#: src/main.cc:181 +#: src/main.cc:188 #, fuzzy msgid "" " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" @@ -738,20 +777,20 @@ msgstr "" " auf .torrent endet.\n" " Fehlwert: true" -#: src/main.cc:185 +#: src/main.cc:192 msgid " --metalink-version=VERSION The version of file to download." msgstr "" -#: src/main.cc:186 +#: src/main.cc:193 msgid " --metalink-language=LANGUAGE The language of file to download." msgstr "" -#: src/main.cc:187 +#: src/main.cc:194 msgid "" " --metalink-os=OS The operating system the file is targeted." msgstr "" -#: src/main.cc:188 +#: src/main.cc:195 #, fuzzy msgid "" " --follow-metalink=true|false Setting this option to false prevents aria2 " @@ -767,15 +806,15 @@ msgstr "" " auf .torrent endet.\n" " Fehlwert: true" -#: src/main.cc:193 +#: src/main.cc:200 msgid " -v, --version Print the version number and exit." msgstr " -v, --version Versionsnummer ausgeben und beenden." -#: src/main.cc:194 +#: src/main.cc:201 msgid " -h, --help Print this message and exit." msgstr " -h, --help Diese Anzeige ausgeben und beenden." -#: src/main.cc:197 +#: src/main.cc:204 msgid "" " You can specify multiple URLs. All URLs must point to the same file\n" " or downloading fails." @@ -784,7 +823,7 @@ msgstr "" "verweisen\n" "oder der Abruf schlägt fehl." -#: src/main.cc:202 +#: src/main.cc:209 msgid "" " Specify files in multi-file torrent to download. Use conjunction with\n" " -T option. This arguments are ignored if you specify --select-file option." @@ -794,152 +833,162 @@ msgstr "" " -T-Option. Diese Argumente werden ignoriert, wenn sie die Option --select-" "file angeben." -#: src/main.cc:206 +#: src/main.cc:213 msgid "Examples:" msgstr "Beispiele:" -#: src/main.cc:207 +#: src/main.cc:214 msgid " Download a file by 1 connection:" msgstr " Abruf einer Datei über 1 Verbindung:" -#: src/main.cc:209 +#: src/main.cc:216 msgid " Download a file by 2 connections:" msgstr " Abruf einer Datei mit 2 Verbindungen:" -#: src/main.cc:211 +#: src/main.cc:218 msgid " Download a file by 2 connections, each connects to a different server:" msgstr "" " Abruf einer Datei über 2 Verbindungen, jede verbindet zu einem anderen " "Server:" -#: src/main.cc:213 +#: src/main.cc:220 msgid " You can mix up different protocols:" msgstr " Sie können verschiedene Protokolle mischen:" -#: src/main.cc:217 +#: src/main.cc:224 msgid " Download a torrent:" msgstr " Einen torrent abrufen:" -#: src/main.cc:219 +#: src/main.cc:226 msgid " Download a torrent using local .torrent file:" msgstr " Einen torrent mit einer lokalen .torrent-Datei abrufen:" -#: src/main.cc:221 +#: src/main.cc:228 msgid " Download only selected files:" msgstr " Nur ausgewählte Dateien abrufen:" -#: src/main.cc:223 +#: src/main.cc:230 msgid " Print file listing of .torrent file:" msgstr " Dateiliste einer .torrent-Datei ausgeben:" -#: src/main.cc:228 +#: src/main.cc:235 msgid " Metalink downloading:" msgstr "" -#: src/main.cc:230 +#: src/main.cc:237 #, fuzzy msgid " Download a file using local .metalink file:" msgstr " Einen torrent mit einer lokalen .torrent-Datei abrufen:" -#: src/main.cc:232 +#: src/main.cc:239 msgid " Metalink downloading with preferences:" msgstr "" -#: src/main.cc:236 +#: src/main.cc:243 #, c-format msgid "Report bugs to %s" msgstr "Fehler an %s melden" -#: src/main.cc:361 +#: src/main.cc:370 msgid "unrecognized proxy format" msgstr "nicht erkanntes Proxy-Format" -#: src/main.cc:388 +#: src/main.cc:397 msgid "Currently, supported authentication scheme is basic." msgstr "Derzeit unterstütztes Authentifizierungsschema ist basic." -#: src/main.cc:397 +#: src/main.cc:406 msgid "retry-wait must be between 0 and 60." msgstr "retry-wait muss zwischen 0 und 60 liegen." -#: src/main.cc:414 +#: src/main.cc:423 msgid "ftp-type must be either 'binary' or 'ascii'." msgstr "ftp-type muss entweder 'binary' oder 'ascii' sein." -#: src/main.cc:423 +#: src/main.cc:432 msgid "ftp-via-http-proxy must be either 'get' or 'tunnel'." msgstr "ftp-via-http-proxy muss entweder 'get' oder 'tunnel' sein." -#: src/main.cc:431 +#: src/main.cc:440 msgid "min-segment-size invalid" msgstr "min-segment-size ungültig" -#: src/main.cc:442 +#: src/main.cc:451 msgid "http-proxy-method must be either 'get' or 'tunnel'." msgstr "http-proxy-method muss entweder 'get' oder 'tunnel' sein." -#: src/main.cc:450 +#: src/main.cc:459 msgid "listen-port must be between 1024 and 65535." msgstr "listen-port muss zwischen 1024 und 65535 liegen." -#: src/main.cc:463 +#: src/main.cc:472 msgid "follow-torrent must be either 'true' or 'false'." msgstr "follow-torrent muss entweder 'true' oder 'false' sein." -#: src/main.cc:477 +#: src/main.cc:486 msgid "direct-file-mapping must be either 'true' or 'false'." msgstr "direct-file-mapping muss entweder 'true' oder 'false' sein." -#: src/main.cc:485 +#: src/main.cc:494 msgid "upload-limit must be greater than or equal to 0." msgstr "upload-limit muss größer oder gleich 0 sein." -#: src/main.cc:510 +#: src/main.cc:507 +#, fuzzy +msgid "seed-time must be greater than or equal to 0." +msgstr "upload-limit muss größer oder gleich 0 sein." + +#: src/main.cc:517 +#, fuzzy +msgid "seed-ratio must be greater than or equal to 0.0." +msgstr "upload-limit muss größer oder gleich 0 sein." + +#: src/main.cc:539 #, fuzzy msgid "follow-metalink must be either 'true' or 'false'." msgstr "follow-torrent muss entweder 'true' oder 'false' sein." -#: src/main.cc:518 +#: src/main.cc:547 #, fuzzy msgid "lowest-speed-limit must be greater than or equal to 0" msgstr "upload-limit muss größer oder gleich 0 sein." -#: src/main.cc:547 +#: src/main.cc:576 msgid "split must be between 1 and 5." msgstr "split muss zwischen 1 und 5 liegen." -#: src/main.cc:559 +#: src/main.cc:588 msgid "timeout must be between 1 and 600" msgstr "timeout muss zwischen 1 und 600 liegen." -#: src/main.cc:568 +#: src/main.cc:597 msgid "max-tries invalid" msgstr "max-tries ungültig" -#: src/main.cc:590 +#: src/main.cc:619 #, fuzzy msgid "metalink-servers must be greater than 0." msgstr "upload-limit muss größer oder gleich 0 sein." -#: src/main.cc:610 +#: src/main.cc:639 msgid "specify at least one URL" msgstr "Geben Sie zumindest eine URL an" -#: src/main.cc:617 +#: src/main.cc:646 msgid "daemon failed" msgstr "Daemon-Start nicht erfolgreich" -#: src/main.cc:679 +#: src/main.cc:710 msgid "" "Now verifying checksum.\n" "This may take some time depending on your PC environment and the size of " "file." msgstr "" -#: src/main.cc:683 +#: src/main.cc:714 msgid "checksum OK." msgstr "" -#: src/main.cc:686 +#: src/main.cc:717 msgid "checksum ERROR." msgstr "" Binary files differ@@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: aria2c 0.2.1\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2006-08-22 00:04+0900\n" -"PO-Revision-Date: 2006-08-14 23:22+0900\n" +"POT-Creation-Date: 2006-08-28 22:50+0900\n" +"PO-Revision-Date: 2006-08-28 22:51+0900\n" "Last-Translator: Tatsuhiro Tsujikawa <tujikawa@rednoah.com>\n" "Language-Team: Japanese <ja@li.org>\n" "MIME-Version: 1.0\n" @@ -16,6 +16,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: src/TorrentMan.cc:656 +msgid "Download of selected files was complete." +msgstr "¤´»ØÄê¤Î¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤¬´°Î»." + +#: src/TorrentMan.cc:659 +msgid "The download was complete." +msgstr "¥À¥¦¥ó¥í¡¼¥É¤¬´°Î»." + #: src/RequestInfo.h:84 #, c-format msgid "" @@ -360,7 +368,7 @@ msgstr "¥Ç¡¼¥¿¤Î¼õ¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿. ¸¶°ø: %s" msgid "Failed to peek data, cause: %s" msgstr "¥Ç¡¼¥¿¤Î peek ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿. ¸¶°ø: %s" -#: src/DownloadEngineFactory.cc:102 +#: src/DownloadEngineFactory.cc:106 msgid "Errors occurred while binding port.\n" msgstr "¥Ý¡¼¥È¤ò¥Ð¥¤¥ó¥ÉÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿.\n" @@ -755,11 +763,35 @@ msgstr "" " ¤Þ¤¿, '-' ¤ò»È¤Ã¤ÆÈϰϻØÄê¤â¤Ç¤¤Þ¤¹: \"1-5\"\n" " ',' ¤È '-' ¤ÏÁȤ߹ç¤ï¤»¤Æ»È¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹." +#: src/main.cc:178 +msgid "" +" --seed-time=MINUTES Specify seeding time in minutes. See also\n" +" --seed-ratio option." +msgstr "" +" --seed-time=MINUTES ¥·¡¼¥É¤ò¹Ô¤¦»þ´Ö¤òʬñ°Ì¤Ç»ØÄꤷ¤Þ¤¹. \n" +" --seed-ratio ¥ª¥×¥·¥ç¥ó¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤." + #: src/main.cc:180 +msgid "" +" --seed-ratio=RATIO Specify share ratio. Seed completed torrents " +"until\n" +" share ratio reaches RATIO. 1.0 is encouraged.\n" +" If --seed-time option is specified along with\n" +" this option, seeding ends when at least one " +"of\n" +" the conditions is satisfied." +msgstr "" +" --seed-ratio=RATIO ¥·¥§¥¢¥ì¥·¥ª¤ò»ØÄꤷ¤Þ¤¹. ¥·¥§¥¢¥ì¥·¥ª¤¬ RATIO ¤Ë\n" +" 㤹¤ë¤È¥·¡¼¥É¤ò½ªÎ»¤·¤Þ¤¹. ¥³¥ß¥å¥Ë¥Æ¥£¤Î¤¿¤á¤Ë\n" +" 1.0 ¤ò¶¯¤¯¿ä¾©¤·¤Þ¤¹.\n" +" --seed-time ¥ª¥×¥·¥ç¥ó¤È¶¦¤Ë»ÈÍѤ·¤¿¾ì¹ç, ¾¯¤Ê¤¯\n" +" ¤È¤â°ìÊý¤Î¾ò·ï¤¬À®Î©¤¹¤ë¤È¥·¡¼¥É¤ò½ªÎ»¤·¤Þ¤¹." + +#: src/main.cc:187 msgid " -M, --metalink-file=METALINK_FILE The file path to .metalink file." msgstr " -M, --metalink-file=METALINK_FILE .metalink ¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤ò»ØÄê." -#: src/main.cc:181 +#: src/main.cc:188 msgid "" " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" " simultaneously. If more than one connection " @@ -773,15 +805,15 @@ msgstr "" " »ÈÍѤ·¤Æ¤¯¤À¤µ¤¤.\n" " ¥Ç¥Õ¥©¥ë¥ÈÃÍ: 15" -#: src/main.cc:185 +#: src/main.cc:192 msgid " --metalink-version=VERSION The version of file to download." msgstr " --metalink-version=VERSION ¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥Ð¡¼¥¸¥ç¥ó." -#: src/main.cc:186 +#: src/main.cc:193 msgid " --metalink-language=LANGUAGE The language of file to download." msgstr " --metalink-language=LANGUAGE ¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¸À¸ì." -#: src/main.cc:187 +#: src/main.cc:194 msgid "" " --metalink-os=OS The operating system the file is targeted." msgstr "" @@ -789,7 +821,7 @@ msgstr "" "¥ì¡¼\n" " ¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à." -#: src/main.cc:188 +#: src/main.cc:195 msgid "" " --follow-metalink=true|false Setting this option to false prevents aria2 " "to\n" @@ -804,16 +836,16 @@ msgstr "" " ¤Ï, Metalink ¥â¡¼¥É¤ËÆþ¤ê¤Þ¤»¤ó.\n" " ¥Ç¥Õ¥©¥ë¥ÈÃÍ: true" -#: src/main.cc:193 +#: src/main.cc:200 msgid " -v, --version Print the version number and exit." msgstr " -v, --version ¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨¤·, ½ªÎ»¤·¤Þ¤¹." -#: src/main.cc:194 +#: src/main.cc:201 msgid " -h, --help Print this message and exit." msgstr "" " -h, --help ¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·, ½ªÎ»¤·¤Þ¤¹." -#: src/main.cc:197 +#: src/main.cc:204 msgid "" " You can specify multiple URLs. All URLs must point to the same file\n" " or downloading fails." @@ -822,7 +854,7 @@ msgstr "" "¤ì\n" " ¤Ð¤Ê¤ê¤Þ¤»¤ó. ¤µ¤â¤Ê¤¯¤Ð¥À¥¦¥ó¥í¡¼¥É¤Ï¼ºÇÔ¤·¤Þ¤¹." -#: src/main.cc:202 +#: src/main.cc:209 msgid "" " Specify files in multi-file torrent to download. Use conjunction with\n" " -T option. This arguments are ignored if you specify --select-file option." @@ -831,136 +863,144 @@ msgstr "" "¥ó\n" " ¤È¶¦¤Ë»ÈÍѤ·¤Þ¤¹. --select-file ¥ª¥×¥·¥ç¥ó¤ÈÊ»ÍѤϤǤ¤Þ¤»¤ó." -#: src/main.cc:206 +#: src/main.cc:213 msgid "Examples:" msgstr "Îã:" -#: src/main.cc:207 +#: src/main.cc:214 msgid " Download a file by 1 connection:" msgstr " 1 ¥³¥Í¥¯¥·¥ç¥ó¤Ç¤Î¥À¥¦¥ó¥í¡¼¥É:" -#: src/main.cc:209 +#: src/main.cc:216 msgid " Download a file by 2 connections:" msgstr " 2 ¥³¥Í¥¯¥·¥ç¥ó¤Ç¤Î¥À¥¦¥ó¥í¡¼¥É:" -#: src/main.cc:211 +#: src/main.cc:218 msgid " Download a file by 2 connections, each connects to a different server:" msgstr " Æó¤Ä¤Î°Û¤Ê¤ë¥µ¡¼¥Ð¡¼¤ËÀܳ¤·¤Æ¥À¥¦¥ó¥í¡¼¥É:" -#: src/main.cc:213 +#: src/main.cc:220 msgid " You can mix up different protocols:" msgstr " °Û¤Ê¤ë¥×¥í¥È¥³¥ë¤òº®¹ç¤µ¤»¤Æ¥À¥¦¥ó¥í¡¼¥É:" -#: src/main.cc:217 +#: src/main.cc:224 msgid " Download a torrent:" msgstr " torrent ¤ò¥À¥¦¥ó¥í¡¼¥É:" -#: src/main.cc:219 +#: src/main.cc:226 msgid " Download a torrent using local .torrent file:" msgstr " ¥í¡¼¥«¥ë .torrent ¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ¥À¥¦¥ó¥í¡¼¥É:" -#: src/main.cc:221 +#: src/main.cc:228 msgid " Download only selected files:" msgstr " ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¥À¥¦¥ó¥í¡¼¥É:" -#: src/main.cc:223 +#: src/main.cc:230 msgid " Print file listing of .torrent file:" msgstr " ¤³¤Î .torrent ¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ë¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤òɽ¼¨:" -#: src/main.cc:228 +#: src/main.cc:235 msgid " Metalink downloading:" msgstr " Metalink ¤Ç¥À¥¦¥ó¥í¡¼¥É:" -#: src/main.cc:230 +#: src/main.cc:237 msgid " Download a file using local .metalink file:" msgstr " ¥í¡¼¥«¥ë .metalink ¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ¥À¥¦¥ó¥í¡¼¥É:" -#: src/main.cc:232 +#: src/main.cc:239 msgid " Metalink downloading with preferences:" msgstr " ¥æ¡¼¥¶ÀßÄê¤Ë¤è¤ë Metalink ¥À¥¦¥ó¥í¡¼¥É:" -#: src/main.cc:236 +#: src/main.cc:243 #, c-format msgid "Report bugs to %s" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï¤³¤Á¤é¤Ø: %s" -#: src/main.cc:361 +#: src/main.cc:370 msgid "unrecognized proxy format" msgstr "Íý²ò¤Ç¤¤Ê¤¤Proxy¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤¹." -#: src/main.cc:388 +#: src/main.cc:397 msgid "Currently, supported authentication scheme is basic." msgstr "¸½ºß¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ëǧ¾ÚÊýË¡¤Ï basic ¤Ç¤¹." -#: src/main.cc:397 +#: src/main.cc:406 msgid "retry-wait must be between 0 and 60." msgstr "retry-wait ¤Ï 0 ¤«¤é 60 ¤Î´Ö¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:414 +#: src/main.cc:423 msgid "ftp-type must be either 'binary' or 'ascii'." msgstr "ftp-type ¤Ï 'binary' ¤Þ¤¿¤Ï 'ascii' ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:423 +#: src/main.cc:432 msgid "ftp-via-http-proxy must be either 'get' or 'tunnel'." msgstr "ftp-via-http-proxy ¤Ï 'get' ¤Þ¤¿¤Ï 'tunnel' ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:431 +#: src/main.cc:440 msgid "min-segment-size invalid" msgstr "min-segment-size ¤¬ÉÔÀµ¤Ç¤¹." -#: src/main.cc:442 +#: src/main.cc:451 msgid "http-proxy-method must be either 'get' or 'tunnel'." msgstr "http-proxy-method ¤Ï 'get' ¤Þ¤¿¤Ï 'tunnel' ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:450 +#: src/main.cc:459 msgid "listen-port must be between 1024 and 65535." msgstr "listen-port ¤Ï 1024 - 65535 ¤ÎÃͤò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:463 +#: src/main.cc:472 msgid "follow-torrent must be either 'true' or 'false'." msgstr "follow-torrent ¤Ï 'true' ¤Þ¤¿¤Ï 'false ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:477 +#: src/main.cc:486 msgid "direct-file-mapping must be either 'true' or 'false'." msgstr "direct-file-mapping ¤Ï 'true' ¤Þ¤¿¤Ï 'false ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:485 +#: src/main.cc:494 msgid "upload-limit must be greater than or equal to 0." msgstr "upload-limit ¤Ï 0 °Ê¾å¤Î¿ô¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:510 +#: src/main.cc:507 +msgid "seed-time must be greater than or equal to 0." +msgstr "seed-time ¤Ï 0 °Ê¾å¤Î¿ô¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." + +#: src/main.cc:517 +msgid "seed-ratio must be greater than or equal to 0.0." +msgstr "seed-ratio ¤Ï 0.0 °Ê¾å¤Î¿ô¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." + +#: src/main.cc:539 msgid "follow-metalink must be either 'true' or 'false'." msgstr "follow-metalink ¤Ï 'true' ¤Þ¤¿¤Ï 'false ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:518 +#: src/main.cc:547 msgid "lowest-speed-limit must be greater than or equal to 0" msgstr "lowest-speed-limit ¤Ï 0 °Ê¾å¤Î¿ô¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:547 +#: src/main.cc:576 msgid "split must be between 1 and 5." msgstr "split ¤Ï 1 - 5 ¤ÎÃͤò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:559 +#: src/main.cc:588 msgid "timeout must be between 1 and 600" msgstr "timeout ¤Ï 1 - 600 ¤ÎÃͤò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:568 +#: src/main.cc:597 msgid "max-tries invalid" msgstr "max-tries ¤¬ÉÔÀµ¤Ç¤¹." -#: src/main.cc:590 +#: src/main.cc:619 msgid "metalink-servers must be greater than 0." msgstr "metalink-servers ¤Ï 0 °Ê¾å¤Î¿ô¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:610 +#: src/main.cc:639 msgid "specify at least one URL" msgstr "°ì¸Ä°Ê¾å¤Î URL ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: src/main.cc:617 +#: src/main.cc:646 msgid "daemon failed" msgstr "¥Ç¡¼¥â¥óµ¯Æ°¤Ë¼ºÇÔ" -#: src/main.cc:679 +#: src/main.cc:710 msgid "" "Now verifying checksum.\n" "This may take some time depending on your PC environment and the size of " @@ -969,10 +1009,10 @@ msgstr "" "¥Á¥§¥Ã¥¯¥µ¥à¤ò¸¡ºº¤·¤Æ¤¤¤Þ¤¹.\n" "¤ª»È¤¤¤Î PC ´Ä¶¤È¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤Ë¤è¤ê, ¤¢¤ëÄøÅ٤λþ´Ö¤¬¤«¤«¤ê¤Þ¤¹." -#: src/main.cc:683 +#: src/main.cc:714 msgid "checksum OK." msgstr "¥Á¥§¥Ã¥¯¥µ¥à OK." -#: src/main.cc:686 +#: src/main.cc:717 msgid "checksum ERROR." msgstr "¥Á¥§¥Ã¥¯¥µ¥à ¥¨¥é¡¼." Binary files differ@@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2006-08-22 00:04+0900\n" +"POT-Creation-Date: 2006-08-28 22:50+0900\n" "PO-Revision-Date: 2006-07-28 18:04+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: <ru@li.org>\n" @@ -21,6 +21,18 @@ msgstr "" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.2\n" +#: src/TorrentMan.cc:656 +#, fuzzy +msgid "Download of selected files was complete." +msgstr " Скачать только выбранные файлы:" + +#: src/TorrentMan.cc:659 +#, fuzzy +msgid "The download was complete." +msgstr "" +"\n" +"Скачивание завершено. <%s>\n" + #: src/RequestInfo.h:84 #, c-format msgid "" @@ -359,7 +371,7 @@ msgstr "Ошибка получениÑ� данных: %s" msgid "Failed to peek data, cause: %s" msgstr "Ошибка запроÑ�а данных: %s" -#: src/DownloadEngineFactory.cc:102 +#: src/DownloadEngineFactory.cc:106 msgid "Errors occurred while binding port.\n" msgstr "Ошибка при открытии порта.\n" @@ -711,11 +723,38 @@ msgstr "" " Также вы можете иÑ�пользовать тире (\"1-5\").\n" " \",\" и \"-\" могут быть иÑ�пользованы вмеÑ�те." +#: src/main.cc:178 +#, fuzzy +msgid "" +" --seed-time=MINUTES Specify seeding time in minutes. See also\n" +" --seed-ratio option." +msgstr "" +" -m, --max-tries=N УÑ�тановить чиÑ�ло попыток. 0 означает\n" +" неограниченное чиÑ�ло. По умолчанию: 5" + #: src/main.cc:180 +#, fuzzy +msgid "" +" --seed-ratio=RATIO Specify share ratio. Seed completed torrents " +"until\n" +" share ratio reaches RATIO. 1.0 is encouraged.\n" +" If --seed-time option is specified along with\n" +" this option, seeding ends when at least one " +"of\n" +" the conditions is satisfied." +msgstr "" +" -s, --split=N Скачать файл, иÑ�пользуÑ� N Ñ�оединений. N\n" +" должен быть в пределах от 1 до 5. Ðтот " +"параметр\n" +" влиÑ�ет на вÑ�е URL.\n" +" СледуÑ� Ñ�тому, aria2 Ñ�оединÑ�етÑ�Ñ� к каждому URL\n" +" иÑ�пользуÑ� N Ñ�оединений." + +#: src/main.cc:187 msgid " -M, --metalink-file=METALINK_FILE The file path to .metalink file." msgstr " -M, --metalink-file=METALINK_FILE Путь к .metalink-файлу." -#: src/main.cc:181 +#: src/main.cc:188 msgid "" " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" " simultaneously. If more than one connection " @@ -729,20 +768,20 @@ msgstr "" "параметр -s.\n" " По умолчанию: 15" -#: src/main.cc:185 +#: src/main.cc:192 msgid " --metalink-version=VERSION The version of file to download." msgstr " --metalink-version=VERSION ВерÑ�иÑ� файла длÑ� Ñ�качиваниÑ�." -#: src/main.cc:186 +#: src/main.cc:193 msgid " --metalink-language=LANGUAGE The language of file to download." msgstr " --metalink-language=LANGUAGE Язык файла длÑ� Ñ�качиваниÑ�." -#: src/main.cc:187 +#: src/main.cc:194 msgid "" " --metalink-os=OS The operating system the file is targeted." msgstr " --metalink-os=OS ЦелеваÑ� операционнаÑ� Ñ�иÑ�тема файла." -#: src/main.cc:188 +#: src/main.cc:195 msgid "" " --follow-metalink=true|false Setting this option to false prevents aria2 " "to\n" @@ -756,15 +795,15 @@ msgstr "" " файлы.\n" " По умолчанию: true" -#: src/main.cc:193 +#: src/main.cc:200 msgid " -v, --version Print the version number and exit." msgstr " -v, --version ВывеÑ�ти номер верÑ�ии и выйти." -#: src/main.cc:194 +#: src/main.cc:201 msgid " -h, --help Print this message and exit." msgstr " -h, --help ВывеÑ�ти Ñ�то Ñ�ообщение и выйти." -#: src/main.cc:197 +#: src/main.cc:204 msgid "" " You can specify multiple URLs. All URLs must point to the same file\n" " or downloading fails." @@ -772,7 +811,7 @@ msgstr "" " Ð’Ñ‹ можете указать неÑ�колько URL. Ð’Ñ�е URL должны указывать на один и тот же\n" " файл, иначе Ñ�качивание завершитÑ�Ñ� неудачей." -#: src/main.cc:202 +#: src/main.cc:209 msgid "" " Specify files in multi-file torrent to download. Use conjunction with\n" " -T option. This arguments are ignored if you specify --select-file option." @@ -780,147 +819,157 @@ msgstr "" " Указать файлы длÑ� Ñ�качиваниÑ� при многофайловом torent. ИÑ�пользуйте вмеÑ�те\n" " Ñ� параметром -T. Ðтот параметр игнорируетÑ�Ñ� при указании --select-file." -#: src/main.cc:206 +#: src/main.cc:213 msgid "Examples:" msgstr "Примеры:" -#: src/main.cc:207 +#: src/main.cc:214 msgid " Download a file by 1 connection:" msgstr " Скачать файл Ñ� помощью 1 Ñ�оединениÑ�:" -#: src/main.cc:209 +#: src/main.cc:216 msgid " Download a file by 2 connections:" msgstr " Скачать файл Ñ� помощью 2 Ñ�оединений:" -#: src/main.cc:211 +#: src/main.cc:218 msgid " Download a file by 2 connections, each connects to a different server:" msgstr " Скачать файл Ñ� помощью 2 Ñ�оединений к различным Ñ�ерверам:" -#: src/main.cc:213 +#: src/main.cc:220 msgid " You can mix up different protocols:" msgstr " Ð’Ñ‹ можете Ñ�мешивать различные протоколы:" -#: src/main.cc:217 +#: src/main.cc:224 msgid " Download a torrent:" msgstr " Скачать torrent:" -#: src/main.cc:219 +#: src/main.cc:226 msgid " Download a torrent using local .torrent file:" msgstr " Скачать torrent Ñ� помощью локального .torrent-файла:" -#: src/main.cc:221 +#: src/main.cc:228 msgid " Download only selected files:" msgstr " Скачать только выбранные файлы:" -#: src/main.cc:223 +#: src/main.cc:230 msgid " Print file listing of .torrent file:" msgstr " ВывеÑ�ти Ñ�пиÑ�ок фалов из .torrent" -#: src/main.cc:228 +#: src/main.cc:235 msgid " Metalink downloading:" msgstr " Скачать metalink:" -#: src/main.cc:230 +#: src/main.cc:237 msgid " Download a file using local .metalink file:" msgstr " Скачать файл Ñ� помощью локального .metalink-файла:" -#: src/main.cc:232 +#: src/main.cc:239 msgid " Metalink downloading with preferences:" msgstr " Скачивание metalink Ñ� наÑ�тройками:" -#: src/main.cc:236 +#: src/main.cc:243 #, c-format msgid "Report bugs to %s" msgstr "СообщениÑ� об ошибках направлÑ�йте на адреÑ� %s" -#: src/main.cc:361 +#: src/main.cc:370 msgid "unrecognized proxy format" msgstr "неизвеÑ�тный формат прокÑ�и" -#: src/main.cc:388 +#: src/main.cc:397 msgid "Currently, supported authentication scheme is basic." msgstr "ПоддерживаемаÑ� Ñ�хема аутентификации - \"basic\"." -#: src/main.cc:397 +#: src/main.cc:406 msgid "retry-wait must be between 0 and 60." msgstr "retry-wait должен быть в пределах 0..60" -#: src/main.cc:414 +#: src/main.cc:423 msgid "ftp-type must be either 'binary' or 'ascii'." msgstr "ftp-type должен быть \"binary\" или \"ascii\"." -#: src/main.cc:423 +#: src/main.cc:432 msgid "ftp-via-http-proxy must be either 'get' or 'tunnel'." msgstr "ftp-via-http-proxy должен быть \"get\" или \"tunnel\"." -#: src/main.cc:431 +#: src/main.cc:440 msgid "min-segment-size invalid" msgstr "min-segment-size неверен" -#: src/main.cc:442 +#: src/main.cc:451 msgid "http-proxy-method must be either 'get' or 'tunnel'." msgstr "http-proxy-method должен быть \"get\" или \"tunnel\"." -#: src/main.cc:450 +#: src/main.cc:459 msgid "listen-port must be between 1024 and 65535." msgstr "listen-port должен быть в пределах 1024..65535." -#: src/main.cc:463 +#: src/main.cc:472 msgid "follow-torrent must be either 'true' or 'false'." msgstr "follow-torrent должен быть 'true' или 'false'." -#: src/main.cc:477 +#: src/main.cc:486 msgid "direct-file-mapping must be either 'true' or 'false'." msgstr "direct-file-mapping должен быть 'true' или 'false'." -#: src/main.cc:485 +#: src/main.cc:494 msgid "upload-limit must be greater than or equal to 0." msgstr "upload-limit должен быть не меньше 0." -#: src/main.cc:510 +#: src/main.cc:507 +#, fuzzy +msgid "seed-time must be greater than or equal to 0." +msgstr "upload-limit должен быть не меньше 0." + +#: src/main.cc:517 +#, fuzzy +msgid "seed-ratio must be greater than or equal to 0.0." +msgstr "upload-limit должен быть не меньше 0." + +#: src/main.cc:539 msgid "follow-metalink must be either 'true' or 'false'." msgstr "follow-metalink должен быть 'true' или 'false'." -#: src/main.cc:518 +#: src/main.cc:547 #, fuzzy msgid "lowest-speed-limit must be greater than or equal to 0" msgstr "upload-limit должен быть не меньше 0." -#: src/main.cc:547 +#: src/main.cc:576 msgid "split must be between 1 and 5." msgstr "split должен быть находитÑ�Ñ� в пределах 1..5." -#: src/main.cc:559 +#: src/main.cc:588 msgid "timeout must be between 1 and 600" msgstr "таймаут должен быть в пределах 1..600" -#: src/main.cc:568 +#: src/main.cc:597 msgid "max-tries invalid" msgstr "неверный max-tries" -#: src/main.cc:590 +#: src/main.cc:619 msgid "metalink-servers must be greater than 0." msgstr "metalink-servers должен быть больше 0" -#: src/main.cc:610 +#: src/main.cc:639 msgid "specify at least one URL" msgstr "укажите по крайней мере один URL" -#: src/main.cc:617 +#: src/main.cc:646 msgid "daemon failed" msgstr "ошибка демона" -#: src/main.cc:679 +#: src/main.cc:710 msgid "" "Now verifying checksum.\n" "This may take some time depending on your PC environment and the size of " "file." msgstr "" -#: src/main.cc:683 +#: src/main.cc:714 msgid "checksum OK." msgstr "" -#: src/main.cc:686 +#: src/main.cc:717 msgid "checksum ERROR." msgstr "" diff --git a/src/HandshakeMessage.cc b/src/HandshakeMessage.cc index fd64afde..c2a72519 100644 --- a/src/HandshakeMessage.cc +++ b/src/HandshakeMessage.cc @@ -74,7 +74,7 @@ int HandshakeMessage::getMessageLength() { string HandshakeMessage::toString() const { return "handshake peerId="+ - Util::urlencode(peerId, sizeof(peerId))+ + Util::urlencode((unsigned char*)peerId, sizeof(peerId))+ " reserved="+Util::toHex(reserved, sizeof(reserved)); } diff --git a/src/TorrentMan.cc b/src/TorrentMan.cc index 904e387d..46987f73 100644 --- a/src/TorrentMan.cc +++ b/src/TorrentMan.cc @@ -653,10 +653,10 @@ void TorrentMan::onDownloadComplete() { save(); diskAdaptor->onDownloadComplete(); if(isSelectiveDownloadingMode()) { - logger->notice("Download of selected files was complete."); + logger->notice(_("Download of selected files was complete.")); finishSelectiveDownloadingMode(); } else { - logger->info("The download was complete."); + logger->info(_("The download was complete.")); } } diff --git a/src/TrackerWatcherCommand.cc b/src/TrackerWatcherCommand.cc index 42ce6c63..7e4cbe67 100644 --- a/src/TrackerWatcherCommand.cc +++ b/src/TrackerWatcherCommand.cc @@ -85,7 +85,7 @@ bool TrackerWatcherCommand::execute() { break; } string url = e->torrentMan->announce+"?"+ - "info_hash="+Util::torrentUrlencode((const char*)e->torrentMan->getInfoHash(), 20)+"&"+ + "info_hash="+Util::torrentUrlencode(e->torrentMan->getInfoHash(), 20)+"&"+ "peer_id="+e->torrentMan->peerId+"&"+ "port="+Util::itos(e->torrentMan->getPort())+"&"+ "uploaded="+Util::llitos(e->torrentMan->getSessionUploadLength())+"&"+ diff --git a/src/Util.cc b/src/Util.cc index 9415d658..dc3c99cd 100644 --- a/src/Util.cc +++ b/src/Util.cc @@ -166,7 +166,7 @@ string Util::replace(const string& target, const string& oldstr, const string& n return result; } -string Util::urlencode(const char* target, int len) { +string Util::urlencode(const unsigned char* target, int len) { string dest; for(int i = 0; i < len; i++) { if(!('0' <= target[i] && target[i] <= '9' || @@ -189,7 +189,7 @@ string Util::urlencode(const char* target, int len) { return dest; } -string Util::torrentUrlencode(const char* target, int len) { +string Util::torrentUrlencode(const unsigned char* target, int len) { string dest; for(int i = 0; i < len; i++) { if(isalpha(target[i]) || isdigit(target[i])) { @@ -62,11 +62,11 @@ public: static string replace(const string& target, const string& oldstr, const string& newstr); - static string urlencode(const char* target, int len); + static string urlencode(const unsigned char* target, int len); static string urldecode(const string& target); - static string torrentUrlencode(const char* target, int len); + static string torrentUrlencode(const unsigned char* target, int len); static string toHex(const unsigned char* src, int len); diff --git a/src/main.cc b/src/main.cc index 58436990..3914d375 100644 --- a/src/main.cc +++ b/src/main.cc @@ -177,10 +177,11 @@ void showUsage() { " ',' and '-' can be used together.") << endl; cout << _(" --seed-time=MINUTES Specify seeding time in minutes. See also\n" " --seed-ratio option.") << endl; - cout << _(" --seed-ratio=RATIO Specify seed share ratio. 1.0 is encouraged.\n" + cout << _(" --seed-ratio=RATIO Specify share ratio. Seed completed torrents until\n" + " share ratio reaches RATIO. 1.0 is encouraged.\n" " If --seed-time option is specified along with\n" " this option, seeding ends when at least one of\n" - " the condition is met.") << endl; + " the conditions is satisfied.") << endl; #endif // ENABLE_BITTORRENT #ifdef ENABLE_METALINK cout << _(" -M, --metalink-file=METALINK_FILE The file path to .metalink file.") << endl; |
