diff --git a/ChangeLog b/ChangeLog index 0326d19b..5996885f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2007-11-18 Tatsuhiro Tsujikawa + + * src/version_usage.cc + (showVersion): Reworked. + (showUsage): Added examples. + + Removed Hint for total length and file name. + * src/Metalink2RequestGroup.cc + * src/RequestGroup.{h, cc} + * src/HttpResponseCommand.cc + * src/FtpNegotiationCommand.cc + + Now --follow-torrent and --follow-metalink option work properly. + * src/RequestGroup.cc + + Updated man page + * doc/aria2c.1.txt + * doc/aria2c.1 + 2007-11-18 Tatsuhiro Tsujikawa Removed. diff --git a/README b/README index 9fc2ec0d..febe9f9b 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -aria2 - The high speed download utility +aria2 - The ultra fast download utility 1. Disclaimer ------------- diff --git a/TODO b/TODO index c31e36d4..769ee24e 100644 --- a/TODO +++ b/TODO @@ -56,5 +56,4 @@ FatalException .... Program should abort. -- remaining issues to be implemented for 0.12.0 release -* Update man page * Update translation diff --git a/configure b/configure index 7bce3a57..93a98b48 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for aria2c 0.12.0alpha. +# Generated by GNU Autoconf 2.61 for aria2c 0.12.0rc. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='aria2c' PACKAGE_TARNAME='aria2c' -PACKAGE_VERSION='0.12.0alpha' -PACKAGE_STRING='aria2c 0.12.0alpha' +PACKAGE_VERSION='0.12.0rc' +PACKAGE_STRING='aria2c 0.12.0rc' PACKAGE_BUGREPORT='t-tujikawa@users.sourceforge.net' ac_unique_file="src/Socket.h" @@ -1298,7 +1298,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.12.0alpha to adapt to many kinds of systems. +\`configure' configures aria2c 0.12.0rc to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1369,7 +1369,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of aria2c 0.12.0alpha:";; + short | recursive ) echo "Configuration of aria2c 0.12.0rc:";; esac cat <<\_ACEOF @@ -1490,7 +1490,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -aria2c configure 0.12.0alpha +aria2c configure 0.12.0rc generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1504,7 +1504,7 @@ cat >config.log <<_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.12.0alpha, which was +It was created by aria2c $as_me 0.12.0rc, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2300,7 +2300,7 @@ fi # Define the identity of the package. PACKAGE='aria2c' - VERSION='0.12.0alpha' + VERSION='0.12.0rc' cat >>confdefs.h <<_ACEOF @@ -14335,7 +14335,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by aria2c $as_me 0.12.0alpha, which was +This file was extended by aria2c $as_me 0.12.0rc, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14388,7 +14388,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -aria2c config.status 0.12.0alpha +aria2c config.status 0.12.0rc configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 36431f3d..decb6a03 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.12.0alpha, t-tujikawa@users.sourceforge.net) +AC_INIT(aria2c, 0.12.0rc, t-tujikawa@users.sourceforge.net) AC_CANONICAL_HOST AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE() diff --git a/doc/aria2c.1 b/doc/aria2c.1 index b674faf0..2dba73ce 100644 --- a/doc/aria2c.1 +++ b/doc/aria2c.1 @@ -1,28 +1,30 @@ .\" Title: aria2c .\" Author: .\" Generator: DocBook XSL Stylesheets v1.73.1 -.\" Date: 11/13/2007 +.\" Date: 11/18/2007 .\" Manual: .\" Source: .\" -.TH "ARIA2C" "1" "11/13/2007" "" "" +.TH "ARIA2C" "1" "11/18/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -aria2c - The high speed download utility +aria2c - The ultra fast download utility .SH "SYNOPSIS" .sp .RS 4 .nf aria2c [OPTIONS] URL \.\.\. -aria2c [OPTIONS] \-T TORRENT_FILE FILE \.\.\. +aria2c [OPTIONS] \-T TORRENT_FILE URL \.\.\. aria2c [OPTIONS] \-M METALINK_FILE .fi .RE .SH "DESCRIPTION" -aria2 is a utility for downloading files\. It has completely new design concept from its predecessor, Aria, and is written from scratch\. aria2 has a segmented downloading engine in its core\. It can download one file from multiple URLs or multiple connections from one URL\. This results in very high speed downloading, much faster than ordinary browsers\. This engine in was implemented in a single\-thread model\. The architecture is clean and easy to extend\. aria2 currently supports HTTP, FTP, and BitTorrent\. It also supports Metalink version 3\.0\. +aria2 is a utility for downloading files\. The supporting protocols are http(s)/ftp/BitTorrent/Metalink\. aria2 has powerful segmented downloading ability, downloading a file from multiple sources and multiple protocols, utilizing your download bandwidth to the max\. It even supports downloading a file from http/ftp and BitTorrent at the same time, while the data downloaded form http/ftp is uploaded to BitTorrent swarm\. +.sp +aria2 also provides most reliable http/ftp downloading experience ever\. Using Metalink\'s chunk checksums, aria2 automatically validates chunk of data while downloading like BitTorrent\. .sp Please visit the project web site at http://aria2\.sourceforge\.net/ .sp @@ -250,9 +252,19 @@ Default: false .fi .RE .PP +\-\-enable\-http\-keep\-alive[=true|false] +.RS 4 +Enable HTTP/1\.1 persistent connection\. Default: false +.RE +.PP +\-\-enable\-http\-pipelining[=true|false] +.RS 4 +Enable HTTP/1\.1 pipelining\. Default: false +.RE +.PP \-\-check\-integrity=true|false .RS 4 -Check file integrity by validating piece hash\. This option only affects in BitTorrent downloads and Metalink downloads with chunk checksums\. Use this option to re\-download a damaged portion of a file\. You may need to specify \-\-allow\-overwrite=true if the \.aria2 file doesn\'t exist\. Default: false +Check file integrity by validating piece hash\. This option only affects in BitTorrent downloads and Metalink downloads with chunk checksums\. Use this option to re\-download a damaged portion of a file\. Default: false .RE .PP \-\-realtime\-chunk\-checksum=true|false @@ -404,12 +416,7 @@ Print this message and exit\. .PP URL .RS 4 -You can specify multiple URLs\. All URLs must point to the same file or downloading will fail\. -.RE -.PP -FILE -.RS 4 -Specify files in multi\-file torrent to download\. Use in conjunction with the \-T option\. This argument is ignored if you specify the \-\-select\-file option\. +You can specify multiple URLs\. Unless you specify \-Z option, all URLs must point to the same file or downloading will fail\. You can specify both torrent file with \-T option and URLs\. By doing this, download a file from both torrent swarm and http/ftp server at the same time, while the data from http/ftp are uploaded to the torrent swarm\. Note that only single file torrent can be integrated with http/ftp\. .RE .SH "EXAMPLES" .PP @@ -480,7 +487,7 @@ aria2c \-T test\.torrent \-\-select\-file 1,3\-5 .PP Print file listing of \.torrent file .RS 4 -aria2c \-T test\.torrent \-S +aria2c \-T test\.torrent \-S Download a file using torrent and http/ftp server aria2c \-T test\.torrent http://host1/file ftp://host2/file .RE .PP Metalink downloading @@ -493,6 +500,11 @@ Download a file using a local \.metalink file aria2c \-M test\.metalink .RE .PP +Download a file using a local \.metalink file with preferred server locations +.RS 4 +aria2c \-M test\.metalink \-\-metalink\-location=JP,US +.RE +.PP Metalink downloading with preferences .RS 4 aria2c \-M test\.metalink \-\-metalink\-version=1\.1\.1 \-\-metalink\-language=en\-US diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt index 2c6e8332..81431ec3 100644 --- a/doc/aria2c.1.txt +++ b/doc/aria2c.1.txt @@ -4,26 +4,27 @@ Tatsuhiro Tsujikawa NAME ---- -aria2c - The high speed download utility +aria2c - The ultra fast download utility SYNOPSIS -------- ----------------------------------------- aria2c [OPTIONS] URL ... -aria2c [OPTIONS] -T TORRENT_FILE FILE ... +aria2c [OPTIONS] -T TORRENT_FILE URL ... aria2c [OPTIONS] -M METALINK_FILE ----------------------------------------- DESCRIPTION ----------- -aria2 is a utility for downloading files. It has completely new design -concept from its predecessor, Aria, and is written from scratch. -aria2 has a segmented downloading engine in its core. -It can download one file from multiple URLs or multiple connections from one -URL. This results in very high speed downloading, much faster than ordinary -browsers. This engine in was implemented in a single-thread model. -The architecture is clean and easy to extend. aria2 currently supports HTTP, -FTP, and BitTorrent. It also supports Metalink version 3.0. +aria2 is a utility for downloading files. +The supporting protocols are http(s)/ftp/BitTorrent/Metalink. +aria2 has powerful segmented downloading ability, downloading a file +from multiple sources and multiple protocols, utilizing your download bandwidth to the max. +It even supports downloading a file from http/ftp and BitTorrent at the same time, while the data downloaded form http/ftp is uploaded to BitTorrent swarm. + +aria2 also provides most reliable http/ftp downloading experience ever. +Using Metalink's chunk checksums, aria2 automatically validates chunk of data +while downloading like BitTorrent. Please visit the project web site at http://aria2.sourceforge.net/ @@ -172,14 +173,20 @@ http://host/image[000-100:2].img required. Default: false + --enable-http-keep-alive[=true|false]:: + Enable HTTP/1.1 persistent connection. + Default: false + + --enable-http-pipelining[=true|false]:: + Enable HTTP/1.1 pipelining. + Default: false + --check-integrity=true|false:: Check file integrity by validating piece hash. This option only affects in BitTorrent downloads and Metalink downloads with chunk checksums. Use this option to re-download a damaged portion of a file. - You may need to specify --allow-overwrite=true - if the .aria2 file doesn't exist. Default: false --realtime-chunk-checksum=true|false:: @@ -309,12 +316,12 @@ http://host/image[000-100:2].img Print this message and exit. URL:: - You can specify multiple URLs. All URLs must point to the same file - or downloading will fail. - -FILE:: - Specify files in multi-file torrent to download. Use in conjunction with the - -T option. This argument is ignored if you specify the --select-file option. + You can specify multiple URLs. Unless you specify -Z option, all URLs must + point to the same file or downloading will fail. + You can specify both torrent file with -T option and URLs. By doing this, + download a file from both torrent swarm and http/ftp server at the same time, + while the data from http/ftp are uploaded to the torrent swarm. Note that + only single file torrent can be integrated with http/ftp. EXAMPLES -------- @@ -348,11 +355,15 @@ EXAMPLES aria2c -T test.torrent --select-file 1,3-5 Print file listing of .torrent file:: aria2c -T test.torrent -S + Download a file using torrent and http/ftp server + aria2c -T test.torrent http://host1/file ftp://host2/file Metalink downloading:: aria2c --lowest-speed-limit 10K http://AAA.BBB.CCC/file.metalink Download a file using a local .metalink file:: aria2c -M test.metalink + Download a file using a local .metalink file with preferred server locations:: + aria2c -M test.metalink --metalink-location=JP,US Metalink downloading with preferences:: aria2c -M test.metalink --metalink-version=1.1.1 --metalink-language=en-US Download only selected files:: diff --git a/po/Makefile.in b/po/Makefile.in index 1495014b..603be5c4 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.12.0alpha +VERSION = 0.12.0rc SHELL = /bin/sh diff --git a/po/POTFILES b/po/POTFILES index ea613793..b089f4cb 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,5 +1,4 @@ ../src/OptionHandlerImpl.h \ - ../src/RequestInfo.h \ ../src/message.h \ ../src/DownloadEngineFactory.cc \ ../src/MultiUrlRequestInfo.cc \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 8dc58467..9ea375d1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,4 @@ src/OptionHandlerImpl.h -src/RequestInfo.h src/message.h src/DownloadEngineFactory.cc src/MultiUrlRequestInfo.cc diff --git a/po/aria2c.pot b/po/aria2c.pot index 5b7f132a..34795aac 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: 2007-11-17 23:02+0900\n" +"POT-Creation-Date: 2007-11-18 20:58+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -62,21 +62,6 @@ msgstr "" msgid "unrecognized proxy format" msgstr "" -#: src/RequestInfo.h:54 -#, c-format -msgid "" -"\n" -"The download was complete. <%s>\n" -msgstr "" - -#: src/RequestInfo.h:62 -#, c-format -msgid "" -"\n" -"Some downloads were not complete because of errors. Check the log.\n" -"aria2 will resume download if the transfer is restarted." -msgstr "" - #: src/message.h:40 #, c-format msgid "CUID#%d - The download for one segment completed successfully." @@ -859,7 +844,7 @@ msgstr "" msgid "Download Results:" msgstr "" -#: src/Util.cc:644 +#: src/Util.cc:628 msgid "Files:" msgstr "" @@ -867,7 +852,7 @@ msgstr "" msgid " version " msgstr "" -#: src/version_usage.cc:52 +#: src/version_usage.cc:46 msgid "" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -885,49 +870,49 @@ msgid "" "USA\n" msgstr "" -#: src/version_usage.cc:66 +#: src/version_usage.cc:81 msgid "Contact Info:" msgstr "" -#: src/version_usage.cc:73 +#: src/version_usage.cc:87 #, c-format msgid "Usage: %s [options] URL ...\n" msgstr "" -#: src/version_usage.cc:75 +#: src/version_usage.cc:89 #, c-format msgid " %s [options] -T TORRENT_FILE URL ...\n" msgstr "" -#: src/version_usage.cc:78 +#: src/version_usage.cc:92 #, c-format msgid " %s [options] -M METALINK_FILE\n" msgstr "" -#: src/version_usage.cc:81 +#: src/version_usage.cc:95 msgid "Options:" msgstr "" -#: src/version_usage.cc:82 +#: src/version_usage.cc:96 msgid "" " -d, --dir=DIR The directory to store the downloaded file." msgstr "" -#: src/version_usage.cc:83 +#: src/version_usage.cc:97 msgid " -o, --out=FILE The file name of the downloaded file." msgstr "" -#: src/version_usage.cc:84 +#: src/version_usage.cc:98 msgid "" " -l, --log=LOG The file name of the log file. If '-' is\n" " specified, log is written to stdout." msgstr "" -#: src/version_usage.cc:87 +#: src/version_usage.cc:101 msgid " -D, --daemon Run as daemon." msgstr "" -#: src/version_usage.cc:89 +#: src/version_usage.cc:103 msgid "" " -s, --split=N Download a file using N connections. N must " "be\n" @@ -938,7 +923,7 @@ msgid "" " Default: 1" msgstr "" -#: src/version_usage.cc:94 +#: src/version_usage.cc:108 msgid "" " --retry-wait=SEC Set the seconds to wait to retry after an " "error\n" @@ -947,47 +932,47 @@ msgid "" " Default: 5" msgstr "" -#: src/version_usage.cc:97 +#: src/version_usage.cc:111 msgid " -t, --timeout=SEC Set timeout in seconds. Default: 60" msgstr "" -#: src/version_usage.cc:98 +#: src/version_usage.cc:112 msgid "" " -m, --max-tries=N Set number of tries. 0 means unlimited.\n" " Default: 5" msgstr "" -#: src/version_usage.cc:106 +#: src/version_usage.cc:120 msgid "" " --http-proxy=HOST:PORT Use HTTP proxy server. This affects all URLs." msgstr "" -#: src/version_usage.cc:107 +#: src/version_usage.cc:121 msgid " --http-user=USER Set HTTP user. This affects all URLs." msgstr "" -#: src/version_usage.cc:108 +#: src/version_usage.cc:122 msgid " --http-passwd=PASSWD Set HTTP password. This affects all URLs." msgstr "" -#: src/version_usage.cc:109 +#: src/version_usage.cc:123 msgid "" " --http-proxy-user=USER Set HTTP proxy user. This affects all URLs." msgstr "" -#: src/version_usage.cc:110 +#: src/version_usage.cc:124 msgid "" " --http-proxy-passwd=PASSWD Set HTTP proxy password. This affects all URLs." msgstr "" -#: src/version_usage.cc:111 +#: src/version_usage.cc:125 msgid "" " --http-proxy-method=METHOD Set the method to use in proxy request.\n" " METHOD is either 'get' or 'tunnel'.\n" " Default: tunnel" msgstr "" -#: src/version_usage.cc:114 +#: src/version_usage.cc:128 msgid "" " --http-auth-scheme=SCHEME Set HTTP authentication scheme. Currently, " "basic\n" @@ -995,23 +980,23 @@ msgid "" " Default: basic" msgstr "" -#: src/version_usage.cc:117 +#: src/version_usage.cc:131 msgid " --referer=REFERER Set Referer. This affects all URLs." msgstr "" -#: src/version_usage.cc:118 +#: src/version_usage.cc:132 msgid "" " --ftp-user=USER Set FTP user. This affects all URLs.\n" " Default: anonymous" msgstr "" -#: src/version_usage.cc:120 +#: src/version_usage.cc:134 msgid "" " --ftp-passwd=PASSWD Set FTP password. This affects all URLs.\n" " Default: ARIA2USER@" msgstr "" -#: src/version_usage.cc:122 +#: src/version_usage.cc:136 msgid "" " --ftp-type=TYPE Set FTP transfer type. TYPE is either " "'binary'\n" @@ -1019,11 +1004,11 @@ msgid "" " Default: binary" msgstr "" -#: src/version_usage.cc:125 +#: src/version_usage.cc:139 msgid " -p, --ftp-pasv Use passive mode in FTP." msgstr "" -#: src/version_usage.cc:126 +#: src/version_usage.cc:140 msgid "" " --ftp-via-http-proxy=METHOD Use HTTP proxy in FTP. METHOD is either 'get' " "or\n" @@ -1031,7 +1016,7 @@ msgid "" " Default: tunnel" msgstr "" -#: src/version_usage.cc:129 +#: src/version_usage.cc:143 msgid "" " --lowest-speed-limit=SPEED Close connection if download speed is lower " "than\n" @@ -1044,7 +1029,7 @@ msgid "" " Default: 0" msgstr "" -#: src/version_usage.cc:136 +#: src/version_usage.cc:150 msgid "" " --max-download-limit=SPEED Set max download speed in bytes per sec.\n" " 0 means unrestricted.\n" @@ -1052,7 +1037,7 @@ msgid "" " Default: 0" msgstr "" -#: src/version_usage.cc:140 +#: src/version_usage.cc:154 msgid "" " --file-allocation=METHOD Specify file allocation method. METHOD is " "either\n" @@ -1066,7 +1051,7 @@ msgid "" " Default: prealloc" msgstr "" -#: src/version_usage.cc:146 +#: src/version_usage.cc:160 msgid "" " --no-file-allocation-limit=SIZE No file allocation is made for files whose\n" " size is smaller than SIZE.\n" @@ -1075,7 +1060,7 @@ msgid "" " Default: 5M" msgstr "" -#: src/version_usage.cc:151 +#: src/version_usage.cc:165 msgid "" " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n" " already exists but the corresponding .aria2 " @@ -1084,7 +1069,7 @@ msgid "" " Default: false" msgstr "" -#: src/version_usage.cc:155 +#: src/version_usage.cc:169 msgid "" " -Z, --force-sequential[=true|false] Fetch URIs in the command-line " "sequentially\n" @@ -1094,7 +1079,7 @@ msgid "" " Default: false" msgstr "" -#: src/version_usage.cc:159 +#: src/version_usage.cc:173 msgid "" " --auto-file-renaming[=true|false] Rename file name if the same file " "already\n" @@ -1106,7 +1091,7 @@ msgid "" " Default: true" msgstr "" -#: src/version_usage.cc:165 +#: src/version_usage.cc:179 msgid "" " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n" " You can specify set of parts:\n" @@ -1123,20 +1108,20 @@ msgid "" " Default: false" msgstr "" -#: src/version_usage.cc:176 +#: src/version_usage.cc:190 msgid "" " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent " "connection.\n" " Default: false" msgstr "" -#: src/version_usage.cc:178 +#: src/version_usage.cc:192 msgid "" " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n" " Default: false" msgstr "" -#: src/version_usage.cc:181 +#: src/version_usage.cc:195 msgid "" " --check-integrity=true|false Check file integrity by validating piece " "hash.\n" @@ -1146,13 +1131,10 @@ msgid "" " Use this option to re-download a damaged " "portion\n" " of a file.\n" -" You may need to specify --allow-" -"overwrite=true\n" -" if the .aria2 file doesn't exist.\n" " Default: false" msgstr "" -#: src/version_usage.cc:189 +#: src/version_usage.cc:201 msgid "" " --realtime-chunk-checksum=true|false Validate chunk checksum while\n" " downloading a file in Metalink mode. This " @@ -1162,7 +1144,7 @@ msgid "" " Default: true" msgstr "" -#: src/version_usage.cc:194 +#: src/version_usage.cc:206 msgid "" " -c, --continue Continue downloading a partially downloaded\n" " file. Use this option to resume a download\n" @@ -1172,15 +1154,15 @@ msgid "" " applicable to http(s)/ftp downloads." msgstr "" -#: src/version_usage.cc:200 +#: src/version_usage.cc:212 msgid " -U, --user-agent=USER_AGENT Set user agent for http(s) downloads." msgstr "" -#: src/version_usage.cc:201 +#: src/version_usage.cc:213 msgid " -n, --no-netrc Disables netrc support." msgstr "" -#: src/version_usage.cc:202 +#: src/version_usage.cc:214 msgid "" " -i, --input-file=FILE Downloads URIs found in FILE. You can specify\n" " multiple URIs for a single entity: separate\n" @@ -1189,7 +1171,7 @@ msgid "" " Reads input from stdin when '-' is specified." msgstr "" -#: src/version_usage.cc:206 +#: src/version_usage.cc:218 msgid "" " -j, --max-concurrent-downloads=N Set maximum number of concurrent " "downloads.\n" @@ -1197,20 +1179,22 @@ msgid "" " Default: 5" msgstr "" -#: src/version_usage.cc:209 +#: src/version_usage.cc:221 msgid "" " --load-cookies=FILE Load cookies from FILE. The format of FILE is\n" " the same used by Netscape and Mozilla." msgstr "" -#: src/version_usage.cc:212 +#: src/version_usage.cc:224 msgid "" " -S, --show-files Print file listing of .torrent or .metalink " "file\n" -" and exit." +" and exit. More detailed information will be " +"listed\n" +" in case of torrent file." msgstr "" -#: src/version_usage.cc:214 +#: src/version_usage.cc:227 msgid "" " --select-file=INDEX... Set file to download by specifing its index.\n" " You can find the file index using the\n" @@ -1224,11 +1208,11 @@ msgid "" "options)." msgstr "" -#: src/version_usage.cc:224 +#: src/version_usage.cc:237 msgid " -T, --torrent-file=TORRENT_FILE The path to the .torrent file." msgstr "" -#: src/version_usage.cc:225 +#: src/version_usage.cc:238 msgid "" " --follow-torrent=true|false Set to false to prevent aria2 from\n" " entering BitTorrent mode even if the filename " @@ -1237,20 +1221,20 @@ msgid "" " Default: true" msgstr "" -#: src/version_usage.cc:229 +#: src/version_usage.cc:242 msgid "" " --direct-file-mapping=true|false Directly read from and write to each file\n" " mentioned in .torrent file.\n" " Default: true" msgstr "" -#: src/version_usage.cc:232 +#: src/version_usage.cc:245 msgid "" " --listen-port=PORT Set TCP port number for BitTorrent downloads.\n" " Default: 6881-6999" msgstr "" -#: src/version_usage.cc:234 +#: src/version_usage.cc:247 msgid "" " --max-upload-limit=SPEED Set max upload speed in bytes per sec.\n" " 0 means unrestricted.\n" @@ -1258,13 +1242,13 @@ msgid "" " Default: 0" msgstr "" -#: src/version_usage.cc:238 +#: src/version_usage.cc:251 msgid "" " --seed-time=MINUTES Specify seeding time in minutes. Also see the\n" " --seed-ratio option." msgstr "" -#: src/version_usage.cc:240 +#: src/version_usage.cc:253 msgid "" " --seed-ratio=RATIO Specify share ratio. Seed completed torrents\n" " until share ratio reaches RATIO. 1.0 is\n" @@ -1274,7 +1258,7 @@ msgid "" " least one of the conditions is satisfied." msgstr "" -#: src/version_usage.cc:245 +#: src/version_usage.cc:258 msgid "" " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID " "in\n" @@ -1287,38 +1271,38 @@ msgid "" " Default: -aria2-" msgstr "" -#: src/version_usage.cc:254 +#: src/version_usage.cc:267 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file." msgstr "" -#: src/version_usage.cc:255 +#: src/version_usage.cc:268 msgid "" " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" " simultaneously.\n" " Default: 5" msgstr "" -#: src/version_usage.cc:258 +#: src/version_usage.cc:271 msgid " --metalink-version=VERSION The version of the file to download." msgstr "" -#: src/version_usage.cc:259 +#: src/version_usage.cc:272 msgid " --metalink-language=LANGUAGE The language of the file to download." msgstr "" -#: src/version_usage.cc:260 +#: src/version_usage.cc:273 msgid "" " --metalink-os=OS The operating system of the file to download." msgstr "" -#: src/version_usage.cc:261 +#: src/version_usage.cc:274 msgid "" " --metalink-location=LOCATION[,...] The location of the preferred server.\n" " A comma-deliminated list of locations is\n" " acceptable." msgstr "" -#: src/version_usage.cc:264 +#: src/version_usage.cc:277 msgid "" " --follow-metalink=true|false Set to false to prevent aria2 from\n" " entering Metalink mode even if the filename " @@ -1327,90 +1311,109 @@ msgid "" " Default: true" msgstr "" -#: src/version_usage.cc:269 +#: src/version_usage.cc:282 msgid " -v, --version Print the version number and exit." msgstr "" -#: src/version_usage.cc:270 +#: src/version_usage.cc:283 msgid " -h, --help Print this message and exit." msgstr "" -#: src/version_usage.cc:273 +#: src/version_usage.cc:286 msgid "" -" You can specify multiple URLs. All URLs must point to the same file\n" -" or downloading will fail." +" You can specify multiple URLs. Unless you specify -Z option, all URLs must\n" +" point to the same file or downloading will fail." msgstr "" -#: src/version_usage.cc:276 +#: src/version_usage.cc:288 +msgid "" +" You can specify both torrent file with -T option and URLs. By doing this,\n" +" download a file from both torrent swarm and http/ftp server at the same " +"time,\n" +" while the data from http/ftp are uploaded to the torrent swarm. Note that\n" +" only single file torrent can be integrated with http/ftp." +msgstr "" + +#: src/version_usage.cc:293 msgid "Examples:" msgstr "" -#: src/version_usage.cc:277 +#: src/version_usage.cc:294 msgid " Download a file using 1 connection:" msgstr "" -#: src/version_usage.cc:279 +#: src/version_usage.cc:296 msgid " Download a file using 2 connections:" msgstr "" -#: src/version_usage.cc:281 +#: src/version_usage.cc:298 msgid "" " Download a file using 2 connections, each connects to a different server:" msgstr "" -#: src/version_usage.cc:283 +#: src/version_usage.cc:300 msgid " You can mix up different protocols:" msgstr "" -#: src/version_usage.cc:285 +#: src/version_usage.cc:302 msgid " Parameterized URI:" msgstr "" -#: src/version_usage.cc:287 +#: src/version_usage.cc:304 msgid " Parameterized URI. -Z option is required in this case:" msgstr "" -#: src/version_usage.cc:291 +#: src/version_usage.cc:308 msgid " Download a torrent:" msgstr "" -#: src/version_usage.cc:293 +#: src/version_usage.cc:310 msgid " Download a torrent using a local .torrent file:" msgstr "" -#: src/version_usage.cc:295 src/version_usage.cc:308 +#: src/version_usage.cc:312 src/version_usage.cc:330 msgid " Download only selected files:" msgstr "" -#: src/version_usage.cc:297 +#: src/version_usage.cc:314 msgid " Print file listing of .torrent file:" msgstr "" -#: src/version_usage.cc:302 +#: src/version_usage.cc:316 +msgid " Download a file using torrent and http/ftp server" +msgstr "" + +#: src/version_usage.cc:321 msgid " Metalink downloading:" msgstr "" -#: src/version_usage.cc:304 +#: src/version_usage.cc:323 msgid " Download a file using local .metalink file:" msgstr "" -#: src/version_usage.cc:306 +#: src/version_usage.cc:326 +msgid "" +" Download a file using a local .metalink file with preferred server " +"locations:" +msgstr "" + +#: src/version_usage.cc:328 msgid " Metalink downloading with preferences:" msgstr "" -#: src/version_usage.cc:310 +#: src/version_usage.cc:332 msgid " Download only selected files using index:" msgstr "" -#: src/version_usage.cc:312 +#: src/version_usage.cc:334 msgid " Print file listing of .metalink file:" msgstr "" -#: src/version_usage.cc:316 +#: src/version_usage.cc:338 #, c-format msgid "Report bugs to %s" msgstr "" -#: src/BtSetup.cc:111 +#: src/BtSetup.cc:109 msgid "Errors occurred while binding port.\n" msgstr "" diff --git a/po/de.gmo b/po/de.gmo index d8cd34b6..ad02c831 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 84e261db..bd6dde55 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2007-11-17 23:02+0900\n" +"POT-Creation-Date: 2007-11-18 20:58+0900\n" "PO-Revision-Date: 2007-09-09 12:17+0100\n" "Last-Translator: Patrick Ruckstuhl \n" "Language-Team: deutsch \n" @@ -62,26 +62,6 @@ msgstr "" msgid "unrecognized proxy format" msgstr "" -#: src/RequestInfo.h:54 -#, c-format -msgid "" -"\n" -"The download was complete. <%s>\n" -msgstr "" -"\n" -"Abruf ist vollständig. <%s>\n" - -#: src/RequestInfo.h:62 -#, c-format -msgid "" -"\n" -"Some downloads were not complete because of errors. Check the log.\n" -"aria2 will resume download if the transfer is restarted." -msgstr "" -"\n" -"Abruf wegen Fehlern nicht vollständig. Überprüfen Sie die Log-Datei.\n" -"aria2 wird den Download wiederaufnehmen wenn der Transfer neu gestartet wird." - #: src/message.h:40 #, c-format msgid "CUID#%d - The download for one segment completed successfully." @@ -897,7 +877,7 @@ msgstr "" msgid "Download Results:" msgstr " Einen torrent abrufen:" -#: src/Util.cc:644 +#: src/Util.cc:628 msgid "Files:" msgstr "" @@ -905,7 +885,7 @@ msgstr "" msgid " version " msgstr " Version " -#: src/version_usage.cc:52 +#: src/version_usage.cc:46 msgid "" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -923,41 +903,41 @@ msgid "" "USA\n" msgstr "" -#: src/version_usage.cc:66 +#: src/version_usage.cc:81 msgid "Contact Info:" msgstr "" -#: src/version_usage.cc:73 +#: src/version_usage.cc:87 #, c-format msgid "Usage: %s [options] URL ...\n" msgstr "Aufruf: %s [Optionen] URL ...\n" -#: src/version_usage.cc:75 +#: src/version_usage.cc:89 #, c-format msgid " %s [options] -T TORRENT_FILE URL ...\n" msgstr " %s [Optionen] -T TORRENT_FILE URL ...\n" -#: src/version_usage.cc:78 +#: src/version_usage.cc:92 #, fuzzy, c-format msgid " %s [options] -M METALINK_FILE\n" msgstr " %s [Optionen] -T TORRENT_FILE URL ...\n" -#: src/version_usage.cc:81 +#: src/version_usage.cc:95 msgid "Options:" msgstr "Optionen:" -#: src/version_usage.cc:82 +#: src/version_usage.cc:96 msgid "" " -d, --dir=DIR The directory to store the downloaded file." msgstr "" " -d, --dir=DIR Verzeichnis zum Speichern der abgerufenen " "Datei." -#: src/version_usage.cc:83 +#: src/version_usage.cc:97 msgid " -o, --out=FILE The file name of the downloaded file." msgstr " -o, --out=FILE Dateiname für die abgerufene Datei." -#: src/version_usage.cc:84 +#: src/version_usage.cc:98 msgid "" " -l, --log=LOG The file name of the log file. If '-' is\n" " specified, log is written to stdout." @@ -967,11 +947,11 @@ msgstr "" " wird das Log auf die Standardausgabe " "geschrieben." -#: src/version_usage.cc:87 +#: src/version_usage.cc:101 msgid " -D, --daemon Run as daemon." msgstr " -D, --daemon Start als Daemon-Prozeß." -#: src/version_usage.cc:89 +#: src/version_usage.cc:103 msgid "" " -s, --split=N Download a file using N connections. N must " "be\n" @@ -982,7 +962,7 @@ msgid "" " Default: 1" msgstr "" -#: src/version_usage.cc:94 +#: src/version_usage.cc:108 msgid "" " --retry-wait=SEC Set the seconds to wait to retry after an " "error\n" @@ -996,12 +976,12 @@ msgstr "" "und 60 an.\n" " Fehlwert: 5" -#: src/version_usage.cc:97 +#: src/version_usage.cc:111 msgid " -t, --timeout=SEC Set timeout in seconds. Default: 60" msgstr "" " -t, --timeout=SEC Setzt Wartezeit in Sekunden. Fehlwert: 60" -#: src/version_usage.cc:98 +#: src/version_usage.cc:112 msgid "" " -m, --max-tries=N Set number of tries. 0 means unlimited.\n" " Default: 5" @@ -1009,7 +989,7 @@ msgstr "" " -m, --max-tries=N Anzahl Versuche. 0 bedeutet unbegrenzt.\n" " Fehlwert: 5" -#: src/version_usage.cc:106 +#: src/version_usage.cc:120 #, fuzzy msgid "" " --http-proxy=HOST:PORT Use HTTP proxy server. This affects all URLs." @@ -1017,32 +997,32 @@ msgstr "" " --http-proxy-user=USER HTTP-Proxy-Anwender setzen. Dies betrifft alle " "URLs." -#: src/version_usage.cc:107 +#: src/version_usage.cc:121 msgid " --http-user=USER Set HTTP user. This affects all URLs." msgstr "" " --http-user=USER HTTP-Anwendername angeben. Dies betrifft alle " "URLs." -#: src/version_usage.cc:108 +#: src/version_usage.cc:122 msgid " --http-passwd=PASSWD Set HTTP password. This affects all URLs." msgstr "" " --http-passwd=PASSWD HTTP-Passwort setzen. Dies betrifft alle URLs." -#: src/version_usage.cc:109 +#: src/version_usage.cc:123 msgid "" " --http-proxy-user=USER Set HTTP proxy user. This affects all URLs." msgstr "" " --http-proxy-user=USER HTTP-Proxy-Anwender setzen. Dies betrifft alle " "URLs." -#: src/version_usage.cc:110 +#: src/version_usage.cc:124 msgid "" " --http-proxy-passwd=PASSWD Set HTTP proxy password. This affects all URLs." msgstr "" " --http-proxy-passwd=PASSWD HTTP-Proxy-Passwort setzen. Dies betrifft alle " "URLs." -#: src/version_usage.cc:111 +#: src/version_usage.cc:125 msgid "" " --http-proxy-method=METHOD Set the method to use in proxy request.\n" " METHOD is either 'get' or 'tunnel'.\n" @@ -1053,7 +1033,7 @@ msgstr "" " METHOD ist entweder 'get' oder 'tunnel'.\n" " Fehlwert: tunnel" -#: src/version_usage.cc:114 +#: src/version_usage.cc:128 msgid "" " --http-auth-scheme=SCHEME Set HTTP authentication scheme. Currently, " "basic\n" @@ -1065,11 +1045,11 @@ msgstr "" " das einzig zulässige Schema.\n" " Fehlwert: basic" -#: src/version_usage.cc:117 +#: src/version_usage.cc:131 msgid " --referer=REFERER Set Referer. This affects all URLs." msgstr " --referer=REFERER Referer setzen. Dies betrifft alle URLs." -#: src/version_usage.cc:118 +#: src/version_usage.cc:132 msgid "" " --ftp-user=USER Set FTP user. This affects all URLs.\n" " Default: anonymous" @@ -1077,7 +1057,7 @@ msgstr "" " --ftp-user=USER FTP-Anwender setzen. Dies betrifft alle URLs.\n" " Fehlwert: anonymous" -#: src/version_usage.cc:120 +#: src/version_usage.cc:134 msgid "" " --ftp-passwd=PASSWD Set FTP password. This affects all URLs.\n" " Default: ARIA2USER@" @@ -1085,7 +1065,7 @@ msgstr "" " --ftp-passwd=PASSWD FTP-Passwort setzen. Dies betrifft alle URLs.\n" " Fehlwert: ARIA2USER@" -#: src/version_usage.cc:122 +#: src/version_usage.cc:136 msgid "" " --ftp-type=TYPE Set FTP transfer type. TYPE is either " "'binary'\n" @@ -1097,11 +1077,11 @@ msgstr "" " oder 'ascii'.\n" " Fehlwert: binary" -#: src/version_usage.cc:125 +#: src/version_usage.cc:139 msgid " -p, --ftp-pasv Use passive mode in FTP." msgstr " -p, --ftp-pasv Passiv-Modus für FTP benutzen." -#: src/version_usage.cc:126 +#: src/version_usage.cc:140 msgid "" " --ftp-via-http-proxy=METHOD Use HTTP proxy in FTP. METHOD is either 'get' " "or\n" @@ -1113,7 +1093,7 @@ msgstr "" " 'tunnel'.\n" " Fehlwert: tunnel" -#: src/version_usage.cc:129 +#: src/version_usage.cc:143 msgid "" " --lowest-speed-limit=SPEED Close connection if download speed is lower " "than\n" @@ -1126,7 +1106,7 @@ msgid "" " Default: 0" msgstr "" -#: src/version_usage.cc:136 +#: src/version_usage.cc:150 #, fuzzy msgid "" " --max-download-limit=SPEED Set max download speed in bytes per sec.\n" @@ -1141,7 +1121,7 @@ msgstr "" " auf .torrent endet.\n" " Standart: true" -#: src/version_usage.cc:140 +#: src/version_usage.cc:154 msgid "" " --file-allocation=METHOD Specify file allocation method. METHOD is " "either\n" @@ -1155,7 +1135,7 @@ msgid "" " Default: prealloc" msgstr "" -#: src/version_usage.cc:146 +#: src/version_usage.cc:160 msgid "" " --no-file-allocation-limit=SIZE No file allocation is made for files whose\n" " size is smaller than SIZE.\n" @@ -1164,7 +1144,7 @@ msgid "" " Default: 5M" msgstr "" -#: src/version_usage.cc:151 +#: src/version_usage.cc:165 #, fuzzy msgid "" " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n" @@ -1180,7 +1160,7 @@ msgstr "" " auf .torrent endet.\n" " Standart: true" -#: src/version_usage.cc:155 +#: src/version_usage.cc:169 #, fuzzy msgid "" " -Z, --force-sequential[=true|false] Fetch URIs in the command-line " @@ -1197,7 +1177,7 @@ msgstr "" " auf .metalink endet.\n" " Standart: true" -#: src/version_usage.cc:159 +#: src/version_usage.cc:173 msgid "" " --auto-file-renaming[=true|false] Rename file name if the same file " "already\n" @@ -1209,7 +1189,7 @@ msgid "" " Default: true" msgstr "" -#: src/version_usage.cc:165 +#: src/version_usage.cc:179 msgid "" " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n" " You can specify set of parts:\n" @@ -1226,20 +1206,20 @@ msgid "" " Default: false" msgstr "" -#: src/version_usage.cc:176 +#: src/version_usage.cc:190 msgid "" " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent " "connection.\n" " Default: false" msgstr "" -#: src/version_usage.cc:178 +#: src/version_usage.cc:192 msgid "" " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n" " Default: false" msgstr "" -#: src/version_usage.cc:181 +#: src/version_usage.cc:195 msgid "" " --check-integrity=true|false Check file integrity by validating piece " "hash.\n" @@ -1249,13 +1229,10 @@ msgid "" " Use this option to re-download a damaged " "portion\n" " of a file.\n" -" You may need to specify --allow-" -"overwrite=true\n" -" if the .aria2 file doesn't exist.\n" " Default: false" msgstr "" -#: src/version_usage.cc:189 +#: src/version_usage.cc:201 #, fuzzy msgid "" " --realtime-chunk-checksum=true|false Validate chunk checksum while\n" @@ -1272,7 +1249,7 @@ msgstr "" " auf .metalink endet.\n" " Standart: true" -#: src/version_usage.cc:194 +#: src/version_usage.cc:206 msgid "" " -c, --continue Continue downloading a partially downloaded\n" " file. Use this option to resume a download\n" @@ -1282,15 +1259,15 @@ msgid "" " applicable to http(s)/ftp downloads." msgstr "" -#: src/version_usage.cc:200 +#: src/version_usage.cc:212 msgid " -U, --user-agent=USER_AGENT Set user agent for http(s) downloads." msgstr "" -#: src/version_usage.cc:201 +#: src/version_usage.cc:213 msgid " -n, --no-netrc Disables netrc support." msgstr " -n, --no-netrc Deaktiviert netrc Unterstützung." -#: src/version_usage.cc:202 +#: src/version_usage.cc:214 msgid "" " -i, --input-file=FILE Downloads URIs found in FILE. You can specify\n" " multiple URIs for a single entity: separate\n" @@ -1299,7 +1276,7 @@ msgid "" " Reads input from stdin when '-' is specified." msgstr "" -#: src/version_usage.cc:206 +#: src/version_usage.cc:218 #, fuzzy msgid "" " -j, --max-concurrent-downloads=N Set maximum number of concurrent " @@ -1311,22 +1288,25 @@ msgstr "" " gleichzeitig verbunden wird\n" " Standart: 5" -#: src/version_usage.cc:209 +#: src/version_usage.cc:221 msgid "" " --load-cookies=FILE Load cookies from FILE. The format of FILE is\n" " the same used by Netscape and Mozilla." msgstr "" -#: src/version_usage.cc:212 +#: src/version_usage.cc:224 +#, fuzzy msgid "" " -S, --show-files Print file listing of .torrent or .metalink " "file\n" -" and exit." +" and exit. More detailed information will be " +"listed\n" +" in case of torrent file." msgstr "" " -S, --show-files Dateiliste der torrent-Datei oder metalink-" "Datei ausgeben und beenden." -#: src/version_usage.cc:214 +#: src/version_usage.cc:227 msgid "" " --select-file=INDEX... Set file to download by specifing its index.\n" " You can find the file index using the\n" @@ -1352,11 +1332,11 @@ msgstr "" " der Index sich verändernd abhängig von der\n" " Anfrage (beachte --metalink-* Optionen)." -#: src/version_usage.cc:224 +#: src/version_usage.cc:237 msgid " -T, --torrent-file=TORRENT_FILE The path to the .torrent file." msgstr " -T, --torrent-file=TORRENT_FILE Datenpfad zur torrent-Datei." -#: src/version_usage.cc:225 +#: src/version_usage.cc:238 msgid "" " --follow-torrent=true|false Set to false to prevent aria2 from\n" " entering BitTorrent mode even if the filename " @@ -1371,7 +1351,7 @@ msgstr "" " auf .torrent endet.\n" " Standart: true" -#: src/version_usage.cc:229 +#: src/version_usage.cc:242 msgid "" " --direct-file-mapping=true|false Directly read from and write to each file\n" " mentioned in .torrent file.\n" @@ -1381,7 +1361,7 @@ msgstr "" " .torrent-Datei erwähnten Datei.\n" " Fehlwert: true" -#: src/version_usage.cc:232 +#: src/version_usage.cc:245 msgid "" " --listen-port=PORT Set TCP port number for BitTorrent downloads.\n" " Default: 6881-6999" @@ -1390,7 +1370,7 @@ msgstr "" "setzen.\n" " Standart: 6881-6999" -#: src/version_usage.cc:234 +#: src/version_usage.cc:247 msgid "" " --max-upload-limit=SPEED Set max upload speed in bytes per sec.\n" " 0 means unrestricted.\n" @@ -1398,7 +1378,7 @@ msgid "" " Default: 0" msgstr "" -#: src/version_usage.cc:238 +#: src/version_usage.cc:251 #, fuzzy msgid "" " --seed-time=MINUTES Specify seeding time in minutes. Also see the\n" @@ -1407,7 +1387,7 @@ msgstr "" " -m, --max-tries=N Anzahl Versuche. 0 bedeutet unbegrenzt.\n" " Fehlwert: 5" -#: src/version_usage.cc:240 +#: src/version_usage.cc:253 msgid "" " --seed-ratio=RATIO Specify share ratio. Seed completed torrents\n" " until share ratio reaches RATIO. 1.0 is\n" @@ -1417,7 +1397,7 @@ msgid "" " least one of the conditions is satisfied." msgstr "" -#: src/version_usage.cc:245 +#: src/version_usage.cc:258 msgid "" " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID " "in\n" @@ -1430,11 +1410,11 @@ msgid "" " Default: -aria2-" msgstr "" -#: src/version_usage.cc:254 +#: src/version_usage.cc:267 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file." msgstr " -M, --metalink-file=METALINK_FILE Datenpfad zur metalink-Datei." -#: src/version_usage.cc:255 +#: src/version_usage.cc:268 msgid "" " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" " simultaneously.\n" @@ -1444,28 +1424,28 @@ msgstr "" " gleichzeitig verbunden wird\n" " Standart: 5" -#: src/version_usage.cc:258 +#: src/version_usage.cc:271 msgid " --metalink-version=VERSION The version of the file to download." msgstr " --metalink-version=VERSION Die Version der Datei zum herunterladen." -#: src/version_usage.cc:259 +#: src/version_usage.cc:272 msgid " --metalink-language=LANGUAGE The language of the file to download." msgstr " --metalink-language=LANGUAGE Die Sprache der Datei zum herunterladen." -#: src/version_usage.cc:260 +#: src/version_usage.cc:273 msgid "" " --metalink-os=OS The operating system of the file to download." msgstr "" " --metalink-os=OS Das Betriebssystem der Datei zum herunterladen." -#: src/version_usage.cc:261 +#: src/version_usage.cc:274 msgid "" " --metalink-location=LOCATION[,...] The location of the preferred server.\n" " A comma-deliminated list of locations is\n" " acceptable." msgstr "" -#: src/version_usage.cc:264 +#: src/version_usage.cc:277 msgid "" " --follow-metalink=true|false Set to false to prevent aria2 from\n" " entering Metalink mode even if the filename " @@ -1480,95 +1460,134 @@ msgstr "" " auf .metalink endet.\n" " Standart: true" -#: src/version_usage.cc:269 +#: src/version_usage.cc:282 msgid " -v, --version Print the version number and exit." msgstr " -v, --version Versionsnummer ausgeben und beenden." -#: src/version_usage.cc:270 +#: src/version_usage.cc:283 msgid " -h, --help Print this message and exit." msgstr " -h, --help Diese Anzeige ausgeben und beenden." -#: src/version_usage.cc:273 +#: src/version_usage.cc:286 +#, fuzzy msgid "" -" You can specify multiple URLs. All URLs must point to the same file\n" -" or downloading will fail." +" You can specify multiple URLs. Unless you specify -Z option, all URLs must\n" +" point to the same file or downloading will fail." msgstr "" " Sie können mehrere URLs angeben. Alle URLs müssen auf die gleiche Datei " "verweisen\n" "oder der Abruf schlägt fehl." -#: src/version_usage.cc:276 +#: src/version_usage.cc:288 +msgid "" +" You can specify both torrent file with -T option and URLs. By doing this,\n" +" download a file from both torrent swarm and http/ftp server at the same " +"time,\n" +" while the data from http/ftp are uploaded to the torrent swarm. Note that\n" +" only single file torrent can be integrated with http/ftp." +msgstr "" + +#: src/version_usage.cc:293 msgid "Examples:" msgstr "Beispiele:" -#: src/version_usage.cc:277 +#: src/version_usage.cc:294 msgid " Download a file using 1 connection:" msgstr " Abruf einer Datei über 1 Verbindung:" -#: src/version_usage.cc:279 +#: src/version_usage.cc:296 msgid " Download a file using 2 connections:" msgstr " Abruf einer Datei mit 2 Verbindungen:" -#: src/version_usage.cc:281 +#: src/version_usage.cc:298 msgid "" " Download a file using 2 connections, each connects to a different server:" msgstr "" " Abruf einer Datei über 2 Verbindungen, jede verbindet zu einem anderen " "Server:" -#: src/version_usage.cc:283 +#: src/version_usage.cc:300 msgid " You can mix up different protocols:" msgstr " Sie können verschiedene Protokolle mischen:" -#: src/version_usage.cc:285 +#: src/version_usage.cc:302 msgid " Parameterized URI:" msgstr "Parameterisierte URI:" -#: src/version_usage.cc:287 +#: src/version_usage.cc:304 msgid " Parameterized URI. -Z option is required in this case:" msgstr "Parameterisierte URI. -Z Option wird benötigt:" -#: src/version_usage.cc:291 +#: src/version_usage.cc:308 msgid " Download a torrent:" msgstr " Einen torrent abrufen:" -#: src/version_usage.cc:293 +#: src/version_usage.cc:310 msgid " Download a torrent using a local .torrent file:" msgstr " Einen torrent mit einer lokalen .torrent-Datei abrufen:" -#: src/version_usage.cc:295 src/version_usage.cc:308 +#: src/version_usage.cc:312 src/version_usage.cc:330 msgid " Download only selected files:" msgstr " Nur ausgewählte Dateien abrufen:" -#: src/version_usage.cc:297 +#: src/version_usage.cc:314 msgid " Print file listing of .torrent file:" msgstr " Dateiliste einer .torrent-Datei ausgeben:" -#: src/version_usage.cc:302 +#: src/version_usage.cc:316 +#, fuzzy +msgid " Download a file using torrent and http/ftp server" +msgstr " Einen torrent mit einer lokalen .metalink-Datei abrufen:" + +#: src/version_usage.cc:321 msgid " Metalink downloading:" msgstr "Metalink am herunterladen:" -#: src/version_usage.cc:304 +#: src/version_usage.cc:323 msgid " Download a file using local .metalink file:" msgstr " Einen torrent mit einer lokalen .metalink-Datei abrufen:" -#: src/version_usage.cc:306 +#: src/version_usage.cc:326 +#, fuzzy +msgid "" +" Download a file using a local .metalink file with preferred server " +"locations:" +msgstr " Einen torrent mit einer lokalen .metalink-Datei abrufen:" + +#: src/version_usage.cc:328 msgid " Metalink downloading with preferences:" msgstr "Metalink am herunterladen mit Einstellungen:" -#: src/version_usage.cc:310 +#: src/version_usage.cc:332 msgid " Download only selected files using index:" msgstr " Nur ausgewählte Dateien mittels Index abrufen:" -#: src/version_usage.cc:312 +#: src/version_usage.cc:334 msgid " Print file listing of .metalink file:" msgstr " Dateiliste einer .metalink-Datei ausgeben:" -#: src/version_usage.cc:316 +#: src/version_usage.cc:338 #, c-format msgid "Report bugs to %s" msgstr "Fehler an %s melden" -#: src/BtSetup.cc:111 +#: src/BtSetup.cc:109 msgid "Errors occurred while binding port.\n" msgstr "Fehler beim Binden an Port aufgetreten.\n" + +#~ msgid "" +#~ "\n" +#~ "The download was complete. <%s>\n" +#~ msgstr "" +#~ "\n" +#~ "Abruf ist vollständig. <%s>\n" + +#~ msgid "" +#~ "\n" +#~ "Some downloads were not complete because of errors. Check the log.\n" +#~ "aria2 will resume download if the transfer is restarted." +#~ msgstr "" +#~ "\n" +#~ "Abruf wegen Fehlern nicht vollständig. Überprüfen Sie die Log-Datei.\n" +#~ "aria2 wird den Download wiederaufnehmen wenn der Transfer neu gestartet " +#~ "wird." diff --git a/po/fr.gmo b/po/fr.gmo index 60e7844d..20ba24d1 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 755c9ed5..b9a90dfa 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aria2 0.11.2\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2007-11-17 23:02+0900\n" +"POT-Creation-Date: 2007-11-18 20:58+0900\n" "PO-Revision-Date: 2007-09-06 21:47+0100\n" "Last-Translator: Sebastien WILLEMIJNS \n" "Language-Team: Français\n" @@ -61,27 +61,6 @@ msgstr "" msgid "unrecognized proxy format" msgstr "" -#: src/RequestInfo.h:54 -#, c-format -msgid "" -"\n" -"The download was complete. <%s>\n" -msgstr "" -"\n" -"Le téléchargement est complet. <%s>\n" - -#: src/RequestInfo.h:62 -#, c-format -msgid "" -"\n" -"Some downloads were not complete because of errors. Check the log.\n" -"aria2 will resume download if the transfer is restarted." -msgstr "" -"\n" -"Certains téléchargements ne sont pas complets à cause " -"d'érreurs. Vérifiez le log.\n" -"aria2 reprendra le transfert si le transfert est relancé." - #: src/message.h:40 #, c-format msgid "CUID#%d - The download for one segment completed successfully." @@ -905,7 +884,7 @@ msgstr "" msgid "Download Results:" msgstr "Téléchargez un torrent:" -#: src/Util.cc:644 +#: src/Util.cc:628 msgid "Files:" msgstr "" @@ -913,7 +892,7 @@ msgstr "" msgid " version " msgstr " version " -#: src/version_usage.cc:52 +#: src/version_usage.cc:46 msgid "" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -947,40 +926,40 @@ msgstr "" "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 " "USA\n" -#: src/version_usage.cc:66 +#: src/version_usage.cc:81 msgid "Contact Info:" msgstr "Informations de Contact:" -#: src/version_usage.cc:73 +#: src/version_usage.cc:87 #, c-format msgid "Usage: %s [options] URL ...\n" msgstr "Utilisation: %s [options] URL ...\n" -#: src/version_usage.cc:75 +#: src/version_usage.cc:89 #, fuzzy, c-format msgid " %s [options] -T TORRENT_FILE URL ...\n" msgstr " %s [options] -M FICHIER_METALINK\n" -#: src/version_usage.cc:78 +#: src/version_usage.cc:92 #, c-format msgid " %s [options] -M METALINK_FILE\n" msgstr " %s [options] -M FICHIER_METALINK\n" -#: src/version_usage.cc:81 +#: src/version_usage.cc:95 msgid "Options:" msgstr "Options:" -#: src/version_usage.cc:82 +#: src/version_usage.cc:96 msgid "" " -d, --dir=DIR The directory to store the downloaded file." msgstr " -d, --dir=DIR Le dossier pour enregistrer le fichier." -#: src/version_usage.cc:83 +#: src/version_usage.cc:97 msgid " -o, --out=FILE The file name of the downloaded file." msgstr "" " -o, --out=FILE Le nom de fichier pour le fichier téléchargé." -#: src/version_usage.cc:84 +#: src/version_usage.cc:98 msgid "" " -l, --log=LOG The file name of the log file. If '-' is\n" " specified, log is written to stdout." @@ -989,11 +968,11 @@ msgstr "" "Si '-' est spécifié,\n" " le log est redirigé vers stdout." -#: src/version_usage.cc:87 +#: src/version_usage.cc:101 msgid " -D, --daemon Run as daemon." msgstr " -D, --daemon Exécuter en tant que service." -#: src/version_usage.cc:89 +#: src/version_usage.cc:103 msgid "" " -s, --split=N Download a file using N connections. N must " "be\n" @@ -1012,7 +991,7 @@ msgstr "" " N connexions.\n" " Défaut: 1" -#: src/version_usage.cc:94 +#: src/version_usage.cc:108 msgid "" " --retry-wait=SEC Set the seconds to wait to retry after an " "error\n" @@ -1025,13 +1004,13 @@ msgstr "" "et 60.\n" " Défaut: 5" -#: src/version_usage.cc:97 +#: src/version_usage.cc:111 msgid " -t, --timeout=SEC Set timeout in seconds. Default: 60" msgstr "" " -t, --timeout=SEC Définir le délai d'expiration en secondes. " "Défaut: 60" -#: src/version_usage.cc:98 +#: src/version_usage.cc:112 msgid "" " -m, --max-tries=N Set number of tries. 0 means unlimited.\n" " Default: 5" @@ -1040,7 +1019,7 @@ msgstr "" "illimité.\n" " Défaut: 5" -#: src/version_usage.cc:106 +#: src/version_usage.cc:120 msgid "" " --http-proxy=HOST:PORT Use HTTP proxy server. This affects all URLs." msgstr "" @@ -1048,33 +1027,33 @@ msgstr "" "tous\n" " les URLs." -#: src/version_usage.cc:107 +#: src/version_usage.cc:121 msgid " --http-user=USER Set HTTP user. This affects all URLs." msgstr "" " --http-user=USER Définir un utilisateur HTTP. Ceci affecte tous " "les URLs." -#: src/version_usage.cc:108 +#: src/version_usage.cc:122 msgid " --http-passwd=PASSWD Set HTTP password. This affects all URLs." msgstr "" " --http-passwd=PASSWD Définir un mot de passe HTTP. Ceci affecte " "tous les URLs." -#: src/version_usage.cc:109 +#: src/version_usage.cc:123 msgid "" " --http-proxy-user=USER Set HTTP proxy user. This affects all URLs." msgstr "" " --http-proxy-user=USER Définir un utilisateur proxy HTTP. Ceci " "affecte tous les URLs" -#: src/version_usage.cc:110 +#: src/version_usage.cc:124 msgid "" " --http-proxy-passwd=PASSWD Set HTTP proxy password. This affects all URLs." msgstr "" " --http-proxy-passwd=PASSWD Définir un mot de passe HTTP. Ceci affecte " "tous les URLs." -#: src/version_usage.cc:111 +#: src/version_usage.cc:125 msgid "" " --http-proxy-method=METHOD Set the method to use in proxy request.\n" " METHOD is either 'get' or 'tunnel'.\n" @@ -1085,7 +1064,7 @@ msgstr "" " METHOD est soit 'get' ou 'tunnel'.\n" " Défaut: tunnel" -#: src/version_usage.cc:114 +#: src/version_usage.cc:128 msgid "" " --http-auth-scheme=SCHEME Set HTTP authentication scheme. Currently, " "basic\n" @@ -1097,13 +1076,13 @@ msgstr "" " est le seul type d'identification supporté.\n" " Défaut: basic" -#: src/version_usage.cc:117 +#: src/version_usage.cc:131 msgid " --referer=REFERER Set Referer. This affects all URLs." msgstr "" " --referer=REFERER Définir le Référant. Ceci affecte tous les " "URLs." -#: src/version_usage.cc:118 +#: src/version_usage.cc:132 msgid "" " --ftp-user=USER Set FTP user. This affects all URLs.\n" " Default: anonymous" @@ -1112,7 +1091,7 @@ msgstr "" "les URLs.\n" " Défaut: anonymous" -#: src/version_usage.cc:120 +#: src/version_usage.cc:134 msgid "" " --ftp-passwd=PASSWD Set FTP password. This affects all URLs.\n" " Default: ARIA2USER@" @@ -1121,7 +1100,7 @@ msgstr "" "les URLs.\n" " Default: ARIA2USER@" -#: src/version_usage.cc:122 +#: src/version_usage.cc:136 msgid "" " --ftp-type=TYPE Set FTP transfer type. TYPE is either " "'binary'\n" @@ -1133,11 +1112,11 @@ msgstr "" " ou 'ascii'.\n" " Défaut: binary" -#: src/version_usage.cc:125 +#: src/version_usage.cc:139 msgid " -p, --ftp-pasv Use passive mode in FTP." msgstr " -p, --ftp-pasv Utiliser le mode passif de FTP." -#: src/version_usage.cc:126 +#: src/version_usage.cc:140 msgid "" " --ftp-via-http-proxy=METHOD Use HTTP proxy in FTP. METHOD is either 'get' " "or\n" @@ -1149,7 +1128,7 @@ msgstr "" " 'tunnel'.\n" " Défaut: tunnel" -#: src/version_usage.cc:129 +#: src/version_usage.cc:143 msgid "" " --lowest-speed-limit=SPEED Close connection if download speed is lower " "than\n" @@ -1172,7 +1151,7 @@ msgstr "" "BitTorrent .\n" " Default: 0" -#: src/version_usage.cc:136 +#: src/version_usage.cc:150 msgid "" " --max-download-limit=SPEED Set max download speed in bytes per sec.\n" " 0 means unrestricted.\n" @@ -1186,7 +1165,7 @@ msgstr "" "1024K).\n" " Défaut: 0" -#: src/version_usage.cc:140 +#: src/version_usage.cc:154 msgid "" " --file-allocation=METHOD Specify file allocation method. METHOD is " "either\n" @@ -1210,7 +1189,7 @@ msgstr "" "fichier\n" " Défaut: prealloc" -#: src/version_usage.cc:146 +#: src/version_usage.cc:160 #, fuzzy msgid "" " --no-file-allocation-limit=SIZE No file allocation is made for files whose\n" @@ -1230,7 +1209,7 @@ msgstr "" "BitTorrent .\n" " Default: 0" -#: src/version_usage.cc:151 +#: src/version_usage.cc:165 msgid "" " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n" " already exists but the corresponding .aria2 " @@ -1244,7 +1223,7 @@ msgstr "" " l'ordinateur\n" " Défaut: false" -#: src/version_usage.cc:155 +#: src/version_usage.cc:169 msgid "" " -Z, --force-sequential[=true|false] Fetch URIs in the command-line " "sequentially\n" @@ -1254,7 +1233,7 @@ msgid "" " Default: false" msgstr "" -#: src/version_usage.cc:159 +#: src/version_usage.cc:173 msgid "" " --auto-file-renaming[=true|false] Rename file name if the same file " "already\n" @@ -1266,7 +1245,7 @@ msgid "" " Default: true" msgstr "" -#: src/version_usage.cc:165 +#: src/version_usage.cc:179 msgid "" " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n" " You can specify set of parts:\n" @@ -1283,20 +1262,21 @@ msgid "" " Default: false" msgstr "" -#: src/version_usage.cc:176 +#: src/version_usage.cc:190 msgid "" " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent " "connection.\n" " Default: false" msgstr "" -#: src/version_usage.cc:178 +#: src/version_usage.cc:192 msgid "" " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n" " Default: false" msgstr "" -#: src/version_usage.cc:181 +#: src/version_usage.cc:195 +#, fuzzy msgid "" " --check-integrity=true|false Check file integrity by validating piece " "hash.\n" @@ -1306,9 +1286,6 @@ msgid "" " Use this option to re-download a damaged " "portion\n" " of a file.\n" -" You may need to specify --allow-" -"overwrite=true\n" -" if the .aria2 file doesn't exist.\n" " Default: false" msgstr "" " --check-integrity=true|false Vérifier l'intégrité en utilisant le hash.\n" @@ -1323,7 +1300,7 @@ msgstr "" " si le fichier .aria2 n'existe pas.\n" " Défaut: false" -#: src/version_usage.cc:189 +#: src/version_usage.cc:201 msgid "" " --realtime-chunk-checksum=true|false Validate chunk checksum while\n" " downloading a file in Metalink mode. This " @@ -1339,7 +1316,7 @@ msgstr "" " Metalink avec vérification d'intégrité.\n" " Défaut: true" -#: src/version_usage.cc:194 +#: src/version_usage.cc:206 msgid "" " -c, --continue Continue downloading a partially downloaded\n" " file. Use this option to resume a download\n" @@ -1359,17 +1336,17 @@ msgstr "" " En ce moment cette option s'applique aux\n" " téléchargements http(s)/ftp." -#: src/version_usage.cc:200 +#: src/version_usage.cc:212 msgid " -U, --user-agent=USER_AGENT Set user agent for http(s) downloads." msgstr "" " -U, --user-agent=USER_AGENT Définit le nom du programme pour les " "téléchargements http(s)." -#: src/version_usage.cc:201 +#: src/version_usage.cc:213 msgid " -n, --no-netrc Disables netrc support." msgstr " -n, --no-netrc Désactiver le support netrc." -#: src/version_usage.cc:202 +#: src/version_usage.cc:214 msgid "" " -i, --input-file=FILE Downloads URIs found in FILE. You can specify\n" " multiple URIs for a single entity: separate\n" @@ -1384,7 +1361,7 @@ msgstr "" " URIs par des tabulations sur une seule ligne.\n" " Lit la sortie de stdin quand '-' est spécifié." -#: src/version_usage.cc:206 +#: src/version_usage.cc:218 msgid "" " -j, --max-concurrent-downloads=N Set maximum number of concurrent " "downloads.\n" @@ -1396,7 +1373,7 @@ msgstr "" " Doit être utilisé avec l'option -i.\n" " Défaut: 5" -#: src/version_usage.cc:209 +#: src/version_usage.cc:221 msgid "" " --load-cookies=FILE Load cookies from FILE. The format of FILE is\n" " the same used by Netscape and Mozilla." @@ -1405,17 +1382,20 @@ msgstr "" "est\n" " celui utilisé par Netscape et Mozilla." -#: src/version_usage.cc:212 +#: src/version_usage.cc:224 +#, fuzzy msgid "" " -S, --show-files Print file listing of .torrent or .metalink " "file\n" -" and exit." +" and exit. More detailed information will be " +"listed\n" +" in case of torrent file." msgstr "" " -S, --show-files Imprime la liste des fichiers .torrent ou ." "metalink\n" " et quitte." -#: src/version_usage.cc:214 +#: src/version_usage.cc:227 msgid "" " --select-file=INDEX... Set file to download by specifing its index.\n" " You can find the file index using the\n" @@ -1442,12 +1422,12 @@ msgstr "" "varier selon\n" " la requête (consultez l'option --metalink-*)." -#: src/version_usage.cc:224 +#: src/version_usage.cc:237 msgid " -T, --torrent-file=TORRENT_FILE The path to the .torrent file." msgstr "" " -T, --torrent-file=TORRENT_FILE Le chemin complet du fichier .torrent." -#: src/version_usage.cc:225 +#: src/version_usage.cc:238 msgid "" " --follow-torrent=true|false Set to false to prevent aria2 from\n" " entering BitTorrent mode even if the filename " @@ -1462,7 +1442,7 @@ msgstr "" " téléchargé termine pas l'extension .torrent.\n" " Défaut: true" -#: src/version_usage.cc:229 +#: src/version_usage.cc:242 msgid "" " --direct-file-mapping=true|false Directly read from and write to each file\n" " mentioned in .torrent file.\n" @@ -1473,7 +1453,7 @@ msgstr "" " mentioné dans le fichier .torrent.\n" " Défaut: true" -#: src/version_usage.cc:232 +#: src/version_usage.cc:245 msgid "" " --listen-port=PORT Set TCP port number for BitTorrent downloads.\n" " Default: 6881-6999" @@ -1482,7 +1462,7 @@ msgstr "" "cas d'une connexion P2P.\n" " Default: 6881-6999" -#: src/version_usage.cc:234 +#: src/version_usage.cc:247 msgid "" " --max-upload-limit=SPEED Set max upload speed in bytes per sec.\n" " 0 means unrestricted.\n" @@ -1496,7 +1476,7 @@ msgstr "" "1024K).\n" " Défaut: 0" -#: src/version_usage.cc:238 +#: src/version_usage.cc:251 msgid "" " --seed-time=MINUTES Specify seeding time in minutes. Also see the\n" " --seed-ratio option." @@ -1505,7 +1485,7 @@ msgstr "" "Consultez aussi\n" " l'option --seed-ratio." -#: src/version_usage.cc:240 +#: src/version_usage.cc:253 msgid "" " --seed-ratio=RATIO Specify share ratio. Seed completed torrents\n" " until share ratio reaches RATIO. 1.0 is\n" @@ -1524,7 +1504,7 @@ msgstr "" "conditions\n" " est satisfaite." -#: src/version_usage.cc:245 +#: src/version_usage.cc:258 msgid "" " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID " "in\n" @@ -1537,12 +1517,12 @@ msgid "" " Default: -aria2-" msgstr "" -#: src/version_usage.cc:254 +#: src/version_usage.cc:267 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file." msgstr "" " -M, --metalink-file=METALINK_FILE Le chemin vers le fichier .metalink." -#: src/version_usage.cc:255 +#: src/version_usage.cc:268 msgid "" " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" " simultaneously.\n" @@ -1553,29 +1533,29 @@ msgstr "" " simultanément.\n" " Défaut: 5" -#: src/version_usage.cc:258 +#: src/version_usage.cc:271 msgid " --metalink-version=VERSION The version of the file to download." msgstr " --metalink-version=VERSION La version du fichier à télécharger." -#: src/version_usage.cc:259 +#: src/version_usage.cc:272 msgid " --metalink-language=LANGUAGE The language of the file to download." msgstr " --metalink-language=LANGUAGE La langua du fichier à télécharger." -#: src/version_usage.cc:260 +#: src/version_usage.cc:273 msgid "" " --metalink-os=OS The operating system of the file to download." msgstr "" " --metalink-os=OS Le système d'exploitation auquel est destiné " "le fichier." -#: src/version_usage.cc:261 +#: src/version_usage.cc:274 msgid "" " --metalink-location=LOCATION[,...] The location of the preferred server.\n" " A comma-deliminated list of locations is\n" " acceptable." msgstr "" -#: src/version_usage.cc:264 +#: src/version_usage.cc:277 msgid "" " --follow-metalink=true|false Set to false to prevent aria2 from\n" " entering Metalink mode even if the filename " @@ -1591,95 +1571,134 @@ msgstr "" "metalink.\n" " Défaut: true" -#: src/version_usage.cc:269 +#: src/version_usage.cc:282 msgid " -v, --version Print the version number and exit." msgstr " -v, --version Imprime le numéro de version et quitte." -#: src/version_usage.cc:270 +#: src/version_usage.cc:283 msgid " -h, --help Print this message and exit." msgstr " -h, --help Imprime ce message et quitte." -#: src/version_usage.cc:273 +#: src/version_usage.cc:286 +#, fuzzy msgid "" -" You can specify multiple URLs. All URLs must point to the same file\n" -" or downloading will fail." +" You can specify multiple URLs. Unless you specify -Z option, all URLs must\n" +" point to the same file or downloading will fail." msgstr "" " Vous pouvez spécifier plusieurs URLs. Tous les URLs doivent pointer vers le " "même fichier\n" " sinon le téléchargement échoue." -#: src/version_usage.cc:276 +#: src/version_usage.cc:288 +msgid "" +" You can specify both torrent file with -T option and URLs. By doing this,\n" +" download a file from both torrent swarm and http/ftp server at the same " +"time,\n" +" while the data from http/ftp are uploaded to the torrent swarm. Note that\n" +" only single file torrent can be integrated with http/ftp." +msgstr "" + +#: src/version_usage.cc:293 msgid "Examples:" msgstr " Exemples:" -#: src/version_usage.cc:277 +#: src/version_usage.cc:294 msgid " Download a file using 1 connection:" msgstr "Téléchargez un fichier avec 1 connexion:" -#: src/version_usage.cc:279 +#: src/version_usage.cc:296 msgid " Download a file using 2 connections:" msgstr "Téléchargez un fichier avec 2 connexions:" -#: src/version_usage.cc:281 +#: src/version_usage.cc:298 msgid "" " Download a file using 2 connections, each connects to a different server:" msgstr "" "Téléchargez un fichier avec 2 connexions, chacune se connectant à un serveur " "différent:" -#: src/version_usage.cc:283 +#: src/version_usage.cc:300 msgid " You can mix up different protocols:" msgstr "Vous pouvez mélanger différents protocoles:" -#: src/version_usage.cc:285 +#: src/version_usage.cc:302 msgid " Parameterized URI:" msgstr "" -#: src/version_usage.cc:287 +#: src/version_usage.cc:304 msgid " Parameterized URI. -Z option is required in this case:" msgstr "" -#: src/version_usage.cc:291 +#: src/version_usage.cc:308 msgid " Download a torrent:" msgstr "Téléchargez un torrent:" -#: src/version_usage.cc:293 +#: src/version_usage.cc:310 msgid " Download a torrent using a local .torrent file:" msgstr "Téléchargez un torrent en utilisant un fichier local .torrent:" -#: src/version_usage.cc:295 src/version_usage.cc:308 +#: src/version_usage.cc:312 src/version_usage.cc:330 msgid " Download only selected files:" msgstr "Télécharger seulement les fichiers séléctionnés:" -#: src/version_usage.cc:297 +#: src/version_usage.cc:314 msgid " Print file listing of .torrent file:" msgstr "Imprimer la liste des fichiers .torrent:" -#: src/version_usage.cc:302 +#: src/version_usage.cc:316 +#, fuzzy +msgid " Download a file using torrent and http/ftp server" +msgstr "Télécharger un fichier en utilisant un fichier local .metalink:" + +#: src/version_usage.cc:321 msgid " Metalink downloading:" msgstr "Téléchargement Metalink:" -#: src/version_usage.cc:304 +#: src/version_usage.cc:323 msgid " Download a file using local .metalink file:" msgstr "Télécharger un fichier en utilisant un fichier local .metalink:" -#: src/version_usage.cc:306 +#: src/version_usage.cc:326 +#, fuzzy +msgid "" +" Download a file using a local .metalink file with preferred server " +"locations:" +msgstr "Télécharger un fichier en utilisant un fichier local .metalink:" + +#: src/version_usage.cc:328 msgid " Metalink downloading with preferences:" msgstr "Téléchargement Metalink avec comme préférences:" -#: src/version_usage.cc:310 +#: src/version_usage.cc:332 msgid " Download only selected files using index:" msgstr "Télécharger seulement les fichiers sélectionnés en utilisant l'index:" -#: src/version_usage.cc:312 +#: src/version_usage.cc:334 msgid " Print file listing of .metalink file:" msgstr "Imprimer la liste de fichiers du fichier .metalink:" -#: src/version_usage.cc:316 +#: src/version_usage.cc:338 #, c-format msgid "Report bugs to %s" msgstr "Faire part des bugs à %s" -#: src/BtSetup.cc:111 +#: src/BtSetup.cc:109 msgid "Errors occurred while binding port.\n" msgstr "La jonction du port a engendré des erreurs.\n" + +#~ msgid "" +#~ "\n" +#~ "The download was complete. <%s>\n" +#~ msgstr "" +#~ "\n" +#~ "Le téléchargement est complet. <%s>\n" + +#~ msgid "" +#~ "\n" +#~ "Some downloads were not complete because of errors. Check the log.\n" +#~ "aria2 will resume download if the transfer is restarted." +#~ msgstr "" +#~ "\n" +#~ "Certains téléchargements ne sont pas complets à " +#~ "cause d'érreurs. Vérifiez le log.\n" +#~ "aria2 reprendra le transfert si le transfert est relancé." diff --git a/po/ja.gmo b/po/ja.gmo index aae21b31..d1639260 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index 61ba8ef4..a1af08a9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aria2c 0.2.1\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2007-11-17 23:02+0900\n" +"POT-Creation-Date: 2007-11-18 20:58+0900\n" "PO-Revision-Date: 2007-10-28 18:52+0900\n" "Last-Translator: Tatsuhiro Tsujikawa \n" "Language-Team: Japanese \n" @@ -62,26 +62,6 @@ msgstr "" msgid "unrecognized proxy format" msgstr "" -#: src/RequestInfo.h:54 -#, c-format -msgid "" -"\n" -"The download was complete. <%s>\n" -msgstr "" -"\n" -"<%s> のダウンロードが完了しました.\n" - -#: src/RequestInfo.h:62 -#, c-format -msgid "" -"\n" -"Some downloads were not complete because of errors. Check the log.\n" -"aria2 will resume download if the transfer is restarted." -msgstr "" -"\n" -"ダウンロードはエラーのため完了していません. ログを確認してください.\n" -"次回のダウンロードはエラーの時点から再開できます." - #: src/message.h:40 #, c-format msgid "CUID#%d - The download for one segment completed successfully." @@ -914,7 +894,7 @@ msgstr "" msgid "Download Results:" msgstr " torrent をダウンロード:" -#: src/Util.cc:644 +#: src/Util.cc:628 msgid "Files:" msgstr "" @@ -922,7 +902,7 @@ msgstr "" msgid " version " msgstr " バージョン " -#: src/version_usage.cc:52 +#: src/version_usage.cc:46 msgid "" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -954,41 +934,41 @@ msgstr "" "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 " "USA\n" -#: src/version_usage.cc:66 +#: src/version_usage.cc:81 msgid "Contact Info:" msgstr "連絡先:" -#: src/version_usage.cc:73 +#: src/version_usage.cc:87 #, c-format msgid "Usage: %s [options] URL ...\n" msgstr "使い方: %s [オプション] URL ...\n" -#: src/version_usage.cc:75 +#: src/version_usage.cc:89 #, c-format msgid " %s [options] -T TORRENT_FILE URL ...\n" msgstr " %s [オプション] -T TORRENT_FILE URL ...\n" -#: src/version_usage.cc:78 +#: src/version_usage.cc:92 #, c-format msgid " %s [options] -M METALINK_FILE\n" msgstr " %s [オプション] -M METALINK_FILE\n" -#: src/version_usage.cc:81 +#: src/version_usage.cc:95 msgid "Options:" msgstr "オプション:" -#: src/version_usage.cc:82 +#: src/version_usage.cc:96 msgid "" " -d, --dir=DIR The directory to store the downloaded file." msgstr "" " -d, --dir=DIR ダウンロードしたファイルを保存するディレクトリ." -#: src/version_usage.cc:83 +#: src/version_usage.cc:97 msgid " -o, --out=FILE The file name of the downloaded file." msgstr "" " -o, --out=FILE ダウンロードしたファイルの保存先ファイル名." -#: src/version_usage.cc:84 +#: src/version_usage.cc:98 msgid "" " -l, --log=LOG The file name of the log file. If '-' is\n" " specified, log is written to stdout." @@ -997,11 +977,11 @@ msgstr "" "力\n" " に出力します." -#: src/version_usage.cc:87 +#: src/version_usage.cc:101 msgid " -D, --daemon Run as daemon." msgstr " -D, --daemon デーモンとして起動します." -#: src/version_usage.cc:89 +#: src/version_usage.cc:103 msgid "" " -s, --split=N Download a file using N connections. N must " "be\n" @@ -1022,7 +1002,7 @@ msgstr "" " ンを確立します.\n" " デフォルト値: 1" -#: src/version_usage.cc:94 +#: src/version_usage.cc:108 msgid "" " --retry-wait=SEC Set the seconds to wait to retry after an " "error\n" @@ -1035,13 +1015,13 @@ msgstr "" " す. 0 - 60 の値を指定してください.\n" " デフォルト値: 5" -#: src/version_usage.cc:97 +#: src/version_usage.cc:111 msgid " -t, --timeout=SEC Set timeout in seconds. Default: 60" msgstr "" " -t, --timeout=SEC タイムアウトとなる時間を秒で指定します.\n" " デフォルト値: 60" -#: src/version_usage.cc:98 +#: src/version_usage.cc:112 msgid "" " -m, --max-tries=N Set number of tries. 0 means unlimited.\n" " Default: 5" @@ -1050,28 +1030,28 @@ msgstr "" "行\n" " します. デフォルト値: 5" -#: src/version_usage.cc:106 +#: src/version_usage.cc:120 msgid "" " --http-proxy=HOST:PORT Use HTTP proxy server. This affects all URLs." msgstr "" " --http-proxy=HOST:PORT HTTP プロキシ・サーバーを使用します.\n" " このオプションはすべての URL に影響します." -#: src/version_usage.cc:107 +#: src/version_usage.cc:121 msgid " --http-user=USER Set HTTP user. This affects all URLs." msgstr "" " --http-user=USER HTTP での認証ユーザーを指定します. このオプショ" "ン\n" " はすべての URL に影響します." -#: src/version_usage.cc:108 +#: src/version_usage.cc:122 msgid " --http-passwd=PASSWD Set HTTP password. This affects all URLs." msgstr "" " --http-passwd=PASSWD HTTP での認証パスワードを指定します. このオプ" "ショ\n" " ンはすべての URL に影響します." -#: src/version_usage.cc:109 +#: src/version_usage.cc:123 msgid "" " --http-proxy-user=USER Set HTTP proxy user. This affects all URLs." msgstr "" @@ -1081,7 +1061,7 @@ msgstr "" "ま\n" " す." -#: src/version_usage.cc:110 +#: src/version_usage.cc:124 msgid "" " --http-proxy-passwd=PASSWD Set HTTP proxy password. This affects all URLs." msgstr "" @@ -1091,7 +1071,7 @@ msgstr "" "し\n" " ます." -#: src/version_usage.cc:111 +#: src/version_usage.cc:125 msgid "" " --http-proxy-method=METHOD Set the method to use in proxy request.\n" " METHOD is either 'get' or 'tunnel'.\n" @@ -1102,7 +1082,7 @@ msgstr "" " す. 'get' または 'tunnel' を指定してください.\n" " デフォルト値: tunnel" -#: src/version_usage.cc:114 +#: src/version_usage.cc:128 msgid "" " --http-auth-scheme=SCHEME Set HTTP authentication scheme. Currently, " "basic\n" @@ -1114,14 +1094,14 @@ msgstr "" " いるのは basic です. \n" " デフォルト値: basic" -#: src/version_usage.cc:117 +#: src/version_usage.cc:131 msgid " --referer=REFERER Set Referer. This affects all URLs." msgstr "" " --referer=REFERER リファラーを指定します. このオプションはすべて" "の\n" " URL に影響します." -#: src/version_usage.cc:118 +#: src/version_usage.cc:132 msgid "" " --ftp-user=USER Set FTP user. This affects all URLs.\n" " Default: anonymous" @@ -1131,7 +1111,7 @@ msgstr "" " はすべての URL に影響します.\n" " デフォルト値: anonymous" -#: src/version_usage.cc:120 +#: src/version_usage.cc:134 msgid "" " --ftp-passwd=PASSWD Set FTP password. This affects all URLs.\n" " Default: ARIA2USER@" @@ -1141,7 +1121,7 @@ msgstr "" " ンはすべての URL に影響します.\n" " デフォルト値: ARIA2USER@" -#: src/version_usage.cc:122 +#: src/version_usage.cc:136 msgid "" " --ftp-type=TYPE Set FTP transfer type. TYPE is either " "'binary'\n" @@ -1152,11 +1132,11 @@ msgstr "" " 'ascii' を指定してください. デフォルト値: " "binary" -#: src/version_usage.cc:125 +#: src/version_usage.cc:139 msgid " -p, --ftp-pasv Use passive mode in FTP." msgstr " -p, --ftp-pasv FTP で passive モードを使用します." -#: src/version_usage.cc:126 +#: src/version_usage.cc:140 msgid "" " --ftp-via-http-proxy=METHOD Use HTTP proxy in FTP. METHOD is either 'get' " "or\n" @@ -1169,7 +1149,7 @@ msgstr "" "く\n" " ださい. デフォルト値: tunnel" -#: src/version_usage.cc:129 +#: src/version_usage.cc:143 msgid "" " --lowest-speed-limit=SPEED Close connection if download speed is lower " "than\n" @@ -1192,7 +1172,7 @@ msgstr "" " ードには影響しません.\n" " デフォルト値: 0" -#: src/version_usage.cc:136 +#: src/version_usage.cc:150 msgid "" " --max-download-limit=SPEED Set max download speed in bytes per sec.\n" " 0 means unrestricted.\n" @@ -1207,7 +1187,7 @@ msgstr "" "1024K).\n" " デフォルト値: 0" -#: src/version_usage.cc:140 +#: src/version_usage.cc:154 msgid "" " --file-allocation=METHOD Specify file allocation method. METHOD is " "either\n" @@ -1232,7 +1212,7 @@ msgstr "" " る場合があります.\n" " デフォルト値: prealloc" -#: src/version_usage.cc:146 +#: src/version_usage.cc:160 msgid "" " --no-file-allocation-limit=SIZE No file allocation is made for files whose\n" " size is smaller than SIZE.\n" @@ -1250,7 +1230,7 @@ msgstr "" " ードには影響しません.\n" " デフォルト値: 5M" -#: src/version_usage.cc:151 +#: src/version_usage.cc:165 msgid "" " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n" " already exists but the corresponding .aria2 " @@ -1267,7 +1247,7 @@ msgstr "" " 中止します.\n" " デフォルト値: false" -#: src/version_usage.cc:155 +#: src/version_usage.cc:169 msgid "" " -Z, --force-sequential[=true|false] Fetch URIs in the command-line " "sequentially\n" @@ -1291,7 +1271,7 @@ msgstr "" " うはずである.\n" " デフォルト値: false" -#: src/version_usage.cc:159 +#: src/version_usage.cc:173 msgid "" " --auto-file-renaming[=true|false] Rename file name if the same file " "already\n" @@ -1312,7 +1292,7 @@ msgstr "" " (1..9999) を付加する.\n" " デフォルト値: true" -#: src/version_usage.cc:165 +#: src/version_usage.cc:179 msgid "" " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n" " You can specify set of parts:\n" @@ -1345,20 +1325,21 @@ msgstr "" " ない場合は, -Z オプションが必要である.\n" " デフォルト値: false" -#: src/version_usage.cc:176 +#: src/version_usage.cc:190 msgid "" " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent " "connection.\n" " Default: false" msgstr "" -#: src/version_usage.cc:178 +#: src/version_usage.cc:192 msgid "" " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n" " Default: false" msgstr "" -#: src/version_usage.cc:181 +#: src/version_usage.cc:195 +#, fuzzy msgid "" " --check-integrity=true|false Check file integrity by validating piece " "hash.\n" @@ -1368,9 +1349,6 @@ msgid "" " Use this option to re-download a damaged " "portion\n" " of a file.\n" -" You may need to specify --allow-" -"overwrite=true\n" -" if the .aria2 file doesn't exist.\n" " Default: false" msgstr "" " --check-integrity=true|false ファイルを部分チェックサムにより, 正常にダウン" @@ -1385,7 +1363,7 @@ msgstr "" " かもしれません.\n" " デフォルト値: false" -#: src/version_usage.cc:189 +#: src/version_usage.cc:201 msgid "" " --realtime-chunk-checksum=true|false Validate chunk checksum while\n" " downloading a file in Metalink mode. This " @@ -1401,7 +1379,7 @@ msgstr "" " Metalink でのみ使用できます.\n" " デフォルト値: true" -#: src/version_usage.cc:194 +#: src/version_usage.cc:206 msgid "" " -c, --continue Continue downloading a partially downloaded\n" " file. Use this option to resume a download\n" @@ -1420,15 +1398,15 @@ msgstr "" "用\n" " できます." -#: src/version_usage.cc:200 +#: src/version_usage.cc:212 msgid " -U, --user-agent=USER_AGENT Set user agent for http(s) downloads." msgstr " -U, --user-agent=USER_AGENT ユーザーエージェントを設定します." -#: src/version_usage.cc:201 +#: src/version_usage.cc:213 msgid " -n, --no-netrc Disables netrc support." msgstr " -n, --no-netrc netrc サポートを止めます." -#: src/version_usage.cc:202 +#: src/version_usage.cc:214 msgid "" " -i, --input-file=FILE Downloads URIs found in FILE. You can specify\n" " multiple URIs for a single entity: separate\n" @@ -1448,7 +1426,7 @@ msgstr "" "ま\n" " す." -#: src/version_usage.cc:206 +#: src/version_usage.cc:218 msgid "" " -j, --max-concurrent-downloads=N Set maximum number of concurrent " "downloads.\n" @@ -1460,7 +1438,7 @@ msgstr "" " と共に使ってください.\n" " デフォルト値: 5" -#: src/version_usage.cc:209 +#: src/version_usage.cc:221 msgid "" " --load-cookies=FILE Load cookies from FILE. The format of FILE is\n" " the same used by Netscape and Mozilla." @@ -1470,16 +1448,19 @@ msgstr "" " トは, Netscape や Mozilla で使われているもので" "す." -#: src/version_usage.cc:212 +#: src/version_usage.cc:224 +#, fuzzy msgid "" " -S, --show-files Print file listing of .torrent or .metalink " "file\n" -" and exit." +" and exit. More detailed information will be " +"listed\n" +" in case of torrent file." msgstr "" " -S, --show-files .torrent/.metalink ファイルに含まれるファイル\n" " リストを出力し終了します." -#: src/version_usage.cc:214 +#: src/version_usage.cc:227 msgid "" " --select-file=INDEX... Set file to download by specifing its index.\n" " You can find the file index using the\n" @@ -1507,11 +1488,11 @@ msgstr "" "よっ\n" " てインデックスは変化する場合があります." -#: src/version_usage.cc:224 +#: src/version_usage.cc:237 msgid " -T, --torrent-file=TORRENT_FILE The path to the .torrent file." msgstr " -T, --torrent-file=TORRENT_FILE .torrent ファイルのパスを指定." -#: src/version_usage.cc:225 +#: src/version_usage.cc:238 msgid "" " --follow-torrent=true|false Set to false to prevent aria2 from\n" " entering BitTorrent mode even if the filename " @@ -1526,7 +1507,7 @@ msgstr "" " は, BitTorrent モードに入りません.\n" " デフォルト値: true" -#: src/version_usage.cc:229 +#: src/version_usage.cc:242 msgid "" " --direct-file-mapping=true|false Directly read from and write to each file\n" " mentioned in .torrent file.\n" @@ -1537,7 +1518,7 @@ msgstr "" " します.\n" " デフォルト値: true" -#: src/version_usage.cc:232 +#: src/version_usage.cc:245 msgid "" " --listen-port=PORT Set TCP port number for BitTorrent downloads.\n" " Default: 6881-6999" @@ -1545,7 +1526,7 @@ msgstr "" " --listen-port=PORT ピアからの接続を受け付けるポート番号を指定.\n" " デフォルト値: 6881-6999" -#: src/version_usage.cc:234 +#: src/version_usage.cc:247 msgid "" " --max-upload-limit=SPEED Set max upload speed in bytes per sec.\n" " 0 means unrestricted.\n" @@ -1560,7 +1541,7 @@ msgstr "" "1024K).\n" " デフォルト値: 0" -#: src/version_usage.cc:238 +#: src/version_usage.cc:251 msgid "" " --seed-time=MINUTES Specify seeding time in minutes. Also see the\n" " --seed-ratio option." @@ -1568,7 +1549,7 @@ msgstr "" " --seed-time=MINUTES シードを行う時間を分単位で指定します. \n" " --seed-ratio オプションも参照してください." -#: src/version_usage.cc:240 +#: src/version_usage.cc:253 msgid "" " --seed-ratio=RATIO Specify share ratio. Seed completed torrents\n" " until share ratio reaches RATIO. 1.0 is\n" @@ -1586,7 +1567,7 @@ msgstr "" "く\n" " とも一方の条件が成立するとシードを終了します." -#: src/version_usage.cc:245 +#: src/version_usage.cc:258 msgid "" " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID " "in\n" @@ -1610,11 +1591,11 @@ msgstr "" "す.\n" " デフォルト値: -aria2-" -#: src/version_usage.cc:254 +#: src/version_usage.cc:267 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file." msgstr " -M, --metalink-file=METALINK_FILE .metalink ファイルのパスを指定." -#: src/version_usage.cc:255 +#: src/version_usage.cc:268 msgid "" " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" " simultaneously.\n" @@ -1623,15 +1604,15 @@ msgstr "" " -C, --metalink-servers=NUM_SERVERS 同時に接続するサーバの数を指定します.\n" " デフォルト値: 5" -#: src/version_usage.cc:258 +#: src/version_usage.cc:271 msgid " --metalink-version=VERSION The version of the file to download." msgstr " --metalink-version=VERSION ダウンロードするファイルのバージョン." -#: src/version_usage.cc:259 +#: src/version_usage.cc:272 msgid " --metalink-language=LANGUAGE The language of the file to download." msgstr " --metalink-language=LANGUAGE ダウンロードするファイルの言語." -#: src/version_usage.cc:260 +#: src/version_usage.cc:273 msgid "" " --metalink-os=OS The operating system of the file to download." msgstr "" @@ -1639,14 +1620,14 @@ msgstr "" "レー\n" " ティング・システム." -#: src/version_usage.cc:261 +#: src/version_usage.cc:274 msgid "" " --metalink-location=LOCATION[,...] The location of the preferred server.\n" " A comma-deliminated list of locations is\n" " acceptable." msgstr "" -#: src/version_usage.cc:264 +#: src/version_usage.cc:277 msgid "" " --follow-metalink=true|false Set to false to prevent aria2 from\n" " entering Metalink mode even if the filename " @@ -1661,94 +1642,132 @@ msgstr "" " は, Metalink モードに入りません.\n" " デフォルト値: true" -#: src/version_usage.cc:269 +#: src/version_usage.cc:282 msgid " -v, --version Print the version number and exit." msgstr " -v, --version バージョン番号を表示し, 終了します." -#: src/version_usage.cc:270 +#: src/version_usage.cc:283 msgid " -h, --help Print this message and exit." msgstr "" " -h, --help このヘルプメッセージを表示し, 終了します." -#: src/version_usage.cc:273 +#: src/version_usage.cc:286 +#, fuzzy msgid "" -" You can specify multiple URLs. All URLs must point to the same file\n" -" or downloading will fail." +" You can specify multiple URLs. Unless you specify -Z option, all URLs must\n" +" point to the same file or downloading will fail." msgstr "" " 複数の URL を指定できます. ただし, すべての URL が同じファイルを指していなけ" "れ\n" " ばなりません. さもなくばダウンロードは失敗します." -#: src/version_usage.cc:276 +#: src/version_usage.cc:288 +msgid "" +" You can specify both torrent file with -T option and URLs. By doing this,\n" +" download a file from both torrent swarm and http/ftp server at the same " +"time,\n" +" while the data from http/ftp are uploaded to the torrent swarm. Note that\n" +" only single file torrent can be integrated with http/ftp." +msgstr "" + +#: src/version_usage.cc:293 msgid "Examples:" msgstr "例:" -#: src/version_usage.cc:277 +#: src/version_usage.cc:294 msgid " Download a file using 1 connection:" msgstr " 1 コネクションでのダウンロード:" -#: src/version_usage.cc:279 +#: src/version_usage.cc:296 msgid " Download a file using 2 connections:" msgstr " 2 コネクションでのダウンロード:" -#: src/version_usage.cc:281 +#: src/version_usage.cc:298 msgid "" " Download a file using 2 connections, each connects to a different server:" msgstr " 二つの異なるサーバーに接続してダウンロード:" -#: src/version_usage.cc:283 +#: src/version_usage.cc:300 msgid " You can mix up different protocols:" msgstr " 異なるプロトコルを混合させてダウンロード:" -#: src/version_usage.cc:285 +#: src/version_usage.cc:302 msgid " Parameterized URI:" msgstr " パラメータ化された URI:" -#: src/version_usage.cc:287 +#: src/version_usage.cc:304 msgid " Parameterized URI. -Z option is required in this case:" msgstr " パラメータ化された URI. この場合, -Z オプションが必要:" -#: src/version_usage.cc:291 +#: src/version_usage.cc:308 msgid " Download a torrent:" msgstr " torrent をダウンロード:" -#: src/version_usage.cc:293 +#: src/version_usage.cc:310 msgid " Download a torrent using a local .torrent file:" msgstr " ローカル .torrent ファイルを使ってダウンロード:" -#: src/version_usage.cc:295 src/version_usage.cc:308 +#: src/version_usage.cc:312 src/version_usage.cc:330 msgid " Download only selected files:" msgstr " ファイルを指定してダウンロード:" -#: src/version_usage.cc:297 +#: src/version_usage.cc:314 msgid " Print file listing of .torrent file:" msgstr " この .torrent ファイルに含まれるファイルリストを表示:" -#: src/version_usage.cc:302 +#: src/version_usage.cc:316 +#, fuzzy +msgid " Download a file using torrent and http/ftp server" +msgstr " ローカル .metalink ファイルを使ってダウンロード:" + +#: src/version_usage.cc:321 msgid " Metalink downloading:" msgstr " Metalink でダウンロード:" -#: src/version_usage.cc:304 +#: src/version_usage.cc:323 msgid " Download a file using local .metalink file:" msgstr " ローカル .metalink ファイルを使ってダウンロード:" -#: src/version_usage.cc:306 +#: src/version_usage.cc:326 +#, fuzzy +msgid "" +" Download a file using a local .metalink file with preferred server " +"locations:" +msgstr " ローカル .metalink ファイルを使ってダウンロード:" + +#: src/version_usage.cc:328 msgid " Metalink downloading with preferences:" msgstr " ユーザ設定による Metalink ダウンロード:" -#: src/version_usage.cc:310 +#: src/version_usage.cc:332 msgid " Download only selected files using index:" msgstr " ファイルのインデックスを指定してダウンロード:" -#: src/version_usage.cc:312 +#: src/version_usage.cc:334 msgid " Print file listing of .metalink file:" msgstr " この .metalink ファイルに含まれるファイルリストを表示:" -#: src/version_usage.cc:316 +#: src/version_usage.cc:338 #, c-format msgid "Report bugs to %s" msgstr "バグレポートはこちらへ: %s" -#: src/BtSetup.cc:111 +#: src/BtSetup.cc:109 msgid "Errors occurred while binding port.\n" msgstr "ポートをバインド中にエラーが発生しました.\n" + +#~ msgid "" +#~ "\n" +#~ "The download was complete. <%s>\n" +#~ msgstr "" +#~ "\n" +#~ "<%s> のダウンロードが完了しました.\n" + +#~ msgid "" +#~ "\n" +#~ "Some downloads were not complete because of errors. Check the log.\n" +#~ "aria2 will resume download if the transfer is restarted." +#~ msgstr "" +#~ "\n" +#~ "ダウンロードはエラーのため完了していません. ログを確認してください.\n" +#~ "次回のダウンロードはエラーの時点から再開できます." diff --git a/po/nl.gmo b/po/nl.gmo index 1f539229..a84b9cf3 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 7c864e28..23dfc752 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aria2\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2007-11-17 23:02+0900\n" +"POT-Creation-Date: 2007-11-18 20:58+0900\n" "PO-Revision-Date: 2007-09-23 15:15+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Dutch \n" @@ -63,26 +63,6 @@ msgstr "" msgid "unrecognized proxy format" msgstr "" -#: src/RequestInfo.h:54 -#, c-format -msgid "" -"\n" -"The download was complete. <%s>\n" -msgstr "" -"\n" -"De download is compleet. <%s>\n" - -#: src/RequestInfo.h:62 -#, c-format -msgid "" -"\n" -"Some downloads were not complete because of errors. Check the log.\n" -"aria2 will resume download if the transfer is restarted." -msgstr "" -"\n" -"Sommige downloads zijn mislukt door fouten. Controleer de log.\n" -"aria2 zal het downloaden hervatten wanneer deze opnieuw wordt gestart." - #: src/message.h:40 #, c-format msgid "CUID#%d - The download for one segment completed successfully." @@ -892,7 +872,7 @@ msgstr "" msgid "Download Results:" msgstr " Download een torrent:" -#: src/Util.cc:644 +#: src/Util.cc:628 msgid "Files:" msgstr "" @@ -900,7 +880,7 @@ msgstr "" msgid " version " msgstr "" -#: src/version_usage.cc:52 +#: src/version_usage.cc:46 msgid "" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -932,49 +912,49 @@ msgstr "" "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 " "USA\n" -#: src/version_usage.cc:66 +#: src/version_usage.cc:81 msgid "Contact Info:" msgstr "Contact informatie:" -#: src/version_usage.cc:73 +#: src/version_usage.cc:87 #, c-format msgid "Usage: %s [options] URL ...\n" msgstr "Gebruik: %s [opties] URL ...\n" -#: src/version_usage.cc:75 +#: src/version_usage.cc:89 #, fuzzy, c-format msgid " %s [options] -T TORRENT_FILE URL ...\n" msgstr " %s [opties] -T TORRENT_BESTAND BESTAND ...\n" -#: src/version_usage.cc:78 +#: src/version_usage.cc:92 #, c-format msgid " %s [options] -M METALINK_FILE\n" msgstr " %s [opties] -M METALINK_BESTAND\n" -#: src/version_usage.cc:81 +#: src/version_usage.cc:95 msgid "Options:" msgstr "Opties:" -#: src/version_usage.cc:82 +#: src/version_usage.cc:96 msgid "" " -d, --dir=DIR The directory to store the downloaded file." msgstr " -d, --dir=MAP De map om de gedownloade bestanden in op te slaan." -#: src/version_usage.cc:83 +#: src/version_usage.cc:97 msgid " -o, --out=FILE The file name of the downloaded file." msgstr " -o, --out=FILE De bestandsnaam van het gedownloade bestand." -#: src/version_usage.cc:84 +#: src/version_usage.cc:98 msgid "" " -l, --log=LOG The file name of the log file. If '-' is\n" " specified, log is written to stdout." msgstr "" -#: src/version_usage.cc:87 +#: src/version_usage.cc:101 msgid " -D, --daemon Run as daemon." msgstr "" -#: src/version_usage.cc:89 +#: src/version_usage.cc:103 msgid "" " -s, --split=N Download a file using N connections. N must " "be\n" @@ -985,7 +965,7 @@ msgid "" " Default: 1" msgstr "" -#: src/version_usage.cc:94 +#: src/version_usage.cc:108 msgid "" " --retry-wait=SEC Set the seconds to wait to retry after an " "error\n" @@ -994,47 +974,47 @@ msgid "" " Default: 5" msgstr "" -#: src/version_usage.cc:97 +#: src/version_usage.cc:111 msgid " -t, --timeout=SEC Set timeout in seconds. Default: 60" msgstr "" -#: src/version_usage.cc:98 +#: src/version_usage.cc:112 msgid "" " -m, --max-tries=N Set number of tries. 0 means unlimited.\n" " Default: 5" msgstr "" -#: src/version_usage.cc:106 +#: src/version_usage.cc:120 msgid "" " --http-proxy=HOST:PORT Use HTTP proxy server. This affects all URLs." msgstr "" -#: src/version_usage.cc:107 +#: src/version_usage.cc:121 msgid " --http-user=USER Set HTTP user. This affects all URLs." msgstr "" -#: src/version_usage.cc:108 +#: src/version_usage.cc:122 msgid " --http-passwd=PASSWD Set HTTP password. This affects all URLs." msgstr "" -#: src/version_usage.cc:109 +#: src/version_usage.cc:123 msgid "" " --http-proxy-user=USER Set HTTP proxy user. This affects all URLs." msgstr "" -#: src/version_usage.cc:110 +#: src/version_usage.cc:124 msgid "" " --http-proxy-passwd=PASSWD Set HTTP proxy password. This affects all URLs." msgstr "" -#: src/version_usage.cc:111 +#: src/version_usage.cc:125 msgid "" " --http-proxy-method=METHOD Set the method to use in proxy request.\n" " METHOD is either 'get' or 'tunnel'.\n" " Default: tunnel" msgstr "" -#: src/version_usage.cc:114 +#: src/version_usage.cc:128 msgid "" " --http-auth-scheme=SCHEME Set HTTP authentication scheme. Currently, " "basic\n" @@ -1042,23 +1022,23 @@ msgid "" " Default: basic" msgstr "" -#: src/version_usage.cc:117 +#: src/version_usage.cc:131 msgid " --referer=REFERER Set Referer. This affects all URLs." msgstr "" -#: src/version_usage.cc:118 +#: src/version_usage.cc:132 msgid "" " --ftp-user=USER Set FTP user. This affects all URLs.\n" " Default: anonymous" msgstr "" -#: src/version_usage.cc:120 +#: src/version_usage.cc:134 msgid "" " --ftp-passwd=PASSWD Set FTP password. This affects all URLs.\n" " Default: ARIA2USER@" msgstr "" -#: src/version_usage.cc:122 +#: src/version_usage.cc:136 msgid "" " --ftp-type=TYPE Set FTP transfer type. TYPE is either " "'binary'\n" @@ -1066,11 +1046,11 @@ msgid "" " Default: binary" msgstr "" -#: src/version_usage.cc:125 +#: src/version_usage.cc:139 msgid " -p, --ftp-pasv Use passive mode in FTP." msgstr " -p, --ftp-pasv Gebruik passive mode bij FTP." -#: src/version_usage.cc:126 +#: src/version_usage.cc:140 msgid "" " --ftp-via-http-proxy=METHOD Use HTTP proxy in FTP. METHOD is either 'get' " "or\n" @@ -1078,7 +1058,7 @@ msgid "" " Default: tunnel" msgstr "" -#: src/version_usage.cc:129 +#: src/version_usage.cc:143 msgid "" " --lowest-speed-limit=SPEED Close connection if download speed is lower " "than\n" @@ -1091,7 +1071,7 @@ msgid "" " Default: 0" msgstr "" -#: src/version_usage.cc:136 +#: src/version_usage.cc:150 msgid "" " --max-download-limit=SPEED Set max download speed in bytes per sec.\n" " 0 means unrestricted.\n" @@ -1099,7 +1079,7 @@ msgid "" " Default: 0" msgstr "" -#: src/version_usage.cc:140 +#: src/version_usage.cc:154 msgid "" " --file-allocation=METHOD Specify file allocation method. METHOD is " "either\n" @@ -1113,7 +1093,7 @@ msgid "" " Default: prealloc" msgstr "" -#: src/version_usage.cc:146 +#: src/version_usage.cc:160 msgid "" " --no-file-allocation-limit=SIZE No file allocation is made for files whose\n" " size is smaller than SIZE.\n" @@ -1122,7 +1102,7 @@ msgid "" " Default: 5M" msgstr "" -#: src/version_usage.cc:151 +#: src/version_usage.cc:165 msgid "" " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n" " already exists but the corresponding .aria2 " @@ -1131,7 +1111,7 @@ msgid "" " Default: false" msgstr "" -#: src/version_usage.cc:155 +#: src/version_usage.cc:169 msgid "" " -Z, --force-sequential[=true|false] Fetch URIs in the command-line " "sequentially\n" @@ -1141,7 +1121,7 @@ msgid "" " Default: false" msgstr "" -#: src/version_usage.cc:159 +#: src/version_usage.cc:173 msgid "" " --auto-file-renaming[=true|false] Rename file name if the same file " "already\n" @@ -1153,7 +1133,7 @@ msgid "" " Default: true" msgstr "" -#: src/version_usage.cc:165 +#: src/version_usage.cc:179 msgid "" " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n" " You can specify set of parts:\n" @@ -1170,20 +1150,20 @@ msgid "" " Default: false" msgstr "" -#: src/version_usage.cc:176 +#: src/version_usage.cc:190 msgid "" " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent " "connection.\n" " Default: false" msgstr "" -#: src/version_usage.cc:178 +#: src/version_usage.cc:192 msgid "" " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n" " Default: false" msgstr "" -#: src/version_usage.cc:181 +#: src/version_usage.cc:195 msgid "" " --check-integrity=true|false Check file integrity by validating piece " "hash.\n" @@ -1193,13 +1173,10 @@ msgid "" " Use this option to re-download a damaged " "portion\n" " of a file.\n" -" You may need to specify --allow-" -"overwrite=true\n" -" if the .aria2 file doesn't exist.\n" " Default: false" msgstr "" -#: src/version_usage.cc:189 +#: src/version_usage.cc:201 msgid "" " --realtime-chunk-checksum=true|false Validate chunk checksum while\n" " downloading a file in Metalink mode. This " @@ -1209,7 +1186,7 @@ msgid "" " Default: true" msgstr "" -#: src/version_usage.cc:194 +#: src/version_usage.cc:206 msgid "" " -c, --continue Continue downloading a partially downloaded\n" " file. Use this option to resume a download\n" @@ -1219,15 +1196,15 @@ msgid "" " applicable to http(s)/ftp downloads." msgstr "" -#: src/version_usage.cc:200 +#: src/version_usage.cc:212 msgid " -U, --user-agent=USER_AGENT Set user agent for http(s) downloads." msgstr "" -#: src/version_usage.cc:201 +#: src/version_usage.cc:213 msgid " -n, --no-netrc Disables netrc support." msgstr " -n, --no-netrc Schakel netrc ondersteuning uit." -#: src/version_usage.cc:202 +#: src/version_usage.cc:214 msgid "" " -i, --input-file=FILE Downloads URIs found in FILE. You can specify\n" " multiple URIs for a single entity: separate\n" @@ -1236,7 +1213,7 @@ msgid "" " Reads input from stdin when '-' is specified." msgstr "" -#: src/version_usage.cc:206 +#: src/version_usage.cc:218 msgid "" " -j, --max-concurrent-downloads=N Set maximum number of concurrent " "downloads.\n" @@ -1244,20 +1221,22 @@ msgid "" " Default: 5" msgstr "" -#: src/version_usage.cc:209 +#: src/version_usage.cc:221 msgid "" " --load-cookies=FILE Load cookies from FILE. The format of FILE is\n" " the same used by Netscape and Mozilla." msgstr "" -#: src/version_usage.cc:212 +#: src/version_usage.cc:224 msgid "" " -S, --show-files Print file listing of .torrent or .metalink " "file\n" -" and exit." +" and exit. More detailed information will be " +"listed\n" +" in case of torrent file." msgstr "" -#: src/version_usage.cc:214 +#: src/version_usage.cc:227 msgid "" " --select-file=INDEX... Set file to download by specifing its index.\n" " You can find the file index using the\n" @@ -1271,11 +1250,11 @@ msgid "" "options)." msgstr "" -#: src/version_usage.cc:224 +#: src/version_usage.cc:237 msgid " -T, --torrent-file=TORRENT_FILE The path to the .torrent file." msgstr "" -#: src/version_usage.cc:225 +#: src/version_usage.cc:238 msgid "" " --follow-torrent=true|false Set to false to prevent aria2 from\n" " entering BitTorrent mode even if the filename " @@ -1284,20 +1263,20 @@ msgid "" " Default: true" msgstr "" -#: src/version_usage.cc:229 +#: src/version_usage.cc:242 msgid "" " --direct-file-mapping=true|false Directly read from and write to each file\n" " mentioned in .torrent file.\n" " Default: true" msgstr "" -#: src/version_usage.cc:232 +#: src/version_usage.cc:245 msgid "" " --listen-port=PORT Set TCP port number for BitTorrent downloads.\n" " Default: 6881-6999" msgstr "" -#: src/version_usage.cc:234 +#: src/version_usage.cc:247 msgid "" " --max-upload-limit=SPEED Set max upload speed in bytes per sec.\n" " 0 means unrestricted.\n" @@ -1305,13 +1284,13 @@ msgid "" " Default: 0" msgstr "" -#: src/version_usage.cc:238 +#: src/version_usage.cc:251 msgid "" " --seed-time=MINUTES Specify seeding time in minutes. Also see the\n" " --seed-ratio option." msgstr "" -#: src/version_usage.cc:240 +#: src/version_usage.cc:253 msgid "" " --seed-ratio=RATIO Specify share ratio. Seed completed torrents\n" " until share ratio reaches RATIO. 1.0 is\n" @@ -1321,7 +1300,7 @@ msgid "" " least one of the conditions is satisfied." msgstr "" -#: src/version_usage.cc:245 +#: src/version_usage.cc:258 msgid "" " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID " "in\n" @@ -1334,12 +1313,12 @@ msgid "" " Default: -aria2-" msgstr "" -#: src/version_usage.cc:254 +#: src/version_usage.cc:267 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file." msgstr "" " -M, --metalink-file=METALINK_BESTAND Het pad naar het .metalink bestand." -#: src/version_usage.cc:255 +#: src/version_usage.cc:268 msgid "" " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" " simultaneously.\n" @@ -1349,27 +1328,27 @@ msgstr "" " connectie mee te maken.\n" " Standaard: 5" -#: src/version_usage.cc:258 +#: src/version_usage.cc:271 msgid " --metalink-version=VERSION The version of the file to download." msgstr " --metalink-version=VERSIE De versie van het te downloaden betand." -#: src/version_usage.cc:259 +#: src/version_usage.cc:272 msgid " --metalink-language=LANGUAGE The language of the file to download." msgstr " --metalink-language=TAAL De taal van het te downloaden bestand." -#: src/version_usage.cc:260 +#: src/version_usage.cc:273 msgid "" " --metalink-os=OS The operating system of the file to download." msgstr " --metalink-os=OS Het besturingssysteem van het te downloaden bestand." -#: src/version_usage.cc:261 +#: src/version_usage.cc:274 msgid "" " --metalink-location=LOCATION[,...] The location of the preferred server.\n" " A comma-deliminated list of locations is\n" " acceptable." msgstr "" -#: src/version_usage.cc:264 +#: src/version_usage.cc:277 msgid "" " --follow-metalink=true|false Set to false to prevent aria2 from\n" " entering Metalink mode even if the filename " @@ -1383,98 +1362,136 @@ msgstr "" "eindigt.\n" " Standaard: true" -#: src/version_usage.cc:269 +#: src/version_usage.cc:282 msgid " -v, --version Print the version number and exit." msgstr " -v, --version Toon het versie nummer en sluit." -#: src/version_usage.cc:270 +#: src/version_usage.cc:283 msgid " -h, --help Print this message and exit." msgstr " -h, --help Toon deze text en sluit." -#: src/version_usage.cc:273 +#: src/version_usage.cc:286 +#, fuzzy msgid "" -" You can specify multiple URLs. All URLs must point to the same file\n" -" or downloading will fail." +" You can specify multiple URLs. Unless you specify -Z option, all URLs must\n" +" point to the same file or downloading will fail." msgstr "" " U kunt meerdere URLs specificeren. Alle URLS moeten naar hetzelfde bestand " "verwijzen\n" " anders zal het downloaden mislukken." -#: src/version_usage.cc:276 +#: src/version_usage.cc:288 +msgid "" +" You can specify both torrent file with -T option and URLs. By doing this,\n" +" download a file from both torrent swarm and http/ftp server at the same " +"time,\n" +" while the data from http/ftp are uploaded to the torrent swarm. Note that\n" +" only single file torrent can be integrated with http/ftp." +msgstr "" + +#: src/version_usage.cc:293 msgid "Examples:" msgstr "Voorbeelden:" -#: src/version_usage.cc:277 +#: src/version_usage.cc:294 msgid " Download a file using 1 connection:" msgstr " Download een bestand m.b.v. 1 connectie:" -#: src/version_usage.cc:279 +#: src/version_usage.cc:296 msgid " Download a file using 2 connections:" msgstr " Download een bestand m.b.v. 2 connecties:" -#: src/version_usage.cc:281 +#: src/version_usage.cc:298 msgid "" " Download a file using 2 connections, each connects to a different server:" msgstr "" " Download een bestand m.b.v. 2 connecties, elk met een verschillende server:" -#: src/version_usage.cc:283 +#: src/version_usage.cc:300 msgid " You can mix up different protocols:" msgstr " U kunt verschillende protocollen door elkaar gebruiken:" -#: src/version_usage.cc:285 +#: src/version_usage.cc:302 msgid " Parameterized URI:" msgstr " Geparametriseerde URI:" -#: src/version_usage.cc:287 +#: src/version_usage.cc:304 msgid " Parameterized URI. -Z option is required in this case:" msgstr " Geparametriseerde URI. -Z is verplicht in dit geval:" -#: src/version_usage.cc:291 +#: src/version_usage.cc:308 msgid " Download a torrent:" msgstr " Download een torrent:" -#: src/version_usage.cc:293 +#: src/version_usage.cc:310 msgid " Download a torrent using a local .torrent file:" msgstr " Download een torrent m.b.v. een lokaal .torrent bestand:" -#: src/version_usage.cc:295 src/version_usage.cc:308 +#: src/version_usage.cc:312 src/version_usage.cc:330 msgid " Download only selected files:" msgstr " Download allen geselecteerde bestanden:" -#: src/version_usage.cc:297 +#: src/version_usage.cc:314 msgid " Print file listing of .torrent file:" msgstr " Toon bestandslijst van .torrent bestand:" -#: src/version_usage.cc:302 +#: src/version_usage.cc:316 +#, fuzzy +msgid " Download a file using torrent and http/ftp server" +msgstr " Download een file met een lokaal .metalink bestand:" + +#: src/version_usage.cc:321 msgid " Metalink downloading:" msgstr " Metalink downloaden:" -#: src/version_usage.cc:304 +#: src/version_usage.cc:323 msgid " Download a file using local .metalink file:" msgstr " Download een file met een lokaal .metalink bestand:" -#: src/version_usage.cc:306 +#: src/version_usage.cc:326 +#, fuzzy +msgid "" +" Download a file using a local .metalink file with preferred server " +"locations:" +msgstr " Download een file met een lokaal .metalink bestand:" + +#: src/version_usage.cc:328 msgid " Metalink downloading with preferences:" msgstr " Metalink downloaden met voorkeuren:" -#: src/version_usage.cc:310 +#: src/version_usage.cc:332 msgid " Download only selected files using index:" msgstr " Download alleen geselecteerde bestanden m.b.v. index:" -#: src/version_usage.cc:312 +#: src/version_usage.cc:334 msgid " Print file listing of .metalink file:" msgstr " Toon bestandslijst van .metalink bestand:" -#: src/version_usage.cc:316 +#: src/version_usage.cc:338 #, c-format msgid "Report bugs to %s" msgstr "Rapporteer bugs aan %s" -#: src/BtSetup.cc:111 +#: src/BtSetup.cc:109 msgid "Errors occurred while binding port.\n" msgstr "" +#~ msgid "" +#~ "\n" +#~ "The download was complete. <%s>\n" +#~ msgstr "" +#~ "\n" +#~ "De download is compleet. <%s>\n" + +#~ msgid "" +#~ "\n" +#~ "Some downloads were not complete because of errors. Check the log.\n" +#~ "aria2 will resume download if the transfer is restarted." +#~ msgstr "" +#~ "\n" +#~ "Sommige downloads zijn mislukt door fouten. Controleer de log.\n" +#~ "aria2 zal het downloaden hervatten wanneer deze opnieuw wordt gestart." + #, fuzzy #~ msgid " --metalink-location=LOCATION The location of the prefered server." #~ msgstr " --metalink-location=LOCATIE De locatie van de server met voorkeur." diff --git a/po/ru.gmo b/po/ru.gmo index 267595cb..c8794d36 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 9d001bb3..45b3ab81 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2007-11-17 23:02+0900\n" +"POT-Creation-Date: 2007-11-18 20:58+0900\n" "PO-Revision-Date: 2006-07-28 18:04+0600\n" "Last-Translator: Azamat H. Hackimov \n" "Language-Team: \n" @@ -67,23 +67,6 @@ msgstr "" msgid "unrecognized proxy format" msgstr "неизвестный формат прокси" -#: src/RequestInfo.h:54 -#, c-format -msgid "" -"\n" -"The download was complete. <%s>\n" -msgstr "" -"\n" -"Скачивание завершено. <%s>\n" - -#: src/RequestInfo.h:62 -#, c-format -msgid "" -"\n" -"Some downloads were not complete because of errors. Check the log.\n" -"aria2 will resume download if the transfer is restarted." -msgstr "" - #: src/message.h:40 #, c-format msgid "CUID#%d - The download for one segment completed successfully." @@ -887,7 +870,7 @@ msgstr "" msgid "Download Results:" msgstr " Скачать torrent:" -#: src/Util.cc:644 +#: src/Util.cc:628 msgid "Files:" msgstr "Файлы:" @@ -895,7 +878,7 @@ msgstr "Файлы:" msgid " version " msgstr " версия " -#: src/version_usage.cc:52 +#: src/version_usage.cc:46 msgid "" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -913,39 +896,39 @@ msgid "" "USA\n" msgstr "" -#: src/version_usage.cc:66 +#: src/version_usage.cc:81 msgid "Contact Info:" msgstr "" -#: src/version_usage.cc:73 +#: src/version_usage.cc:87 #, c-format msgid "Usage: %s [options] URL ...\n" msgstr "Использование: %s [параметры] URL ...\n" -#: src/version_usage.cc:75 +#: src/version_usage.cc:89 #, c-format msgid " %s [options] -T TORRENT_FILE URL ...\n" msgstr " %s [параметры] -T TORRENT_FILE URL ...\n" -#: src/version_usage.cc:78 +#: src/version_usage.cc:92 #, c-format msgid " %s [options] -M METALINK_FILE\n" msgstr " %s [параметры] -M METALINK_FILE\n" -#: src/version_usage.cc:81 +#: src/version_usage.cc:95 msgid "Options:" msgstr "Параметры:" -#: src/version_usage.cc:82 +#: src/version_usage.cc:96 msgid "" " -d, --dir=DIR The directory to store the downloaded file." msgstr " -d, --dir=DIR Каталог для сохранения скачанных файлов." -#: src/version_usage.cc:83 +#: src/version_usage.cc:97 msgid " -o, --out=FILE The file name of the downloaded file." msgstr " -o, --out=FILE Имя файла для скачанного файла." -#: src/version_usage.cc:84 +#: src/version_usage.cc:98 msgid "" " -l, --log=LOG The file name of the log file. If '-' is\n" " specified, log is written to stdout." @@ -953,11 +936,11 @@ msgstr "" " -l, --log=LOG Имя файла для логов. Если указано \"-\",\n" " логи будут выведены в stdout." -#: src/version_usage.cc:87 +#: src/version_usage.cc:101 msgid " -D, --daemon Run as daemon." msgstr " -D, --daemon Запустить в качестве демона." -#: src/version_usage.cc:89 +#: src/version_usage.cc:103 msgid "" " -s, --split=N Download a file using N connections. N must " "be\n" @@ -968,7 +951,7 @@ msgid "" " Default: 1" msgstr "" -#: src/version_usage.cc:94 +#: src/version_usage.cc:108 msgid "" " --retry-wait=SEC Set the seconds to wait to retry after an " "error\n" @@ -981,12 +964,12 @@ msgstr "" "60.\n" " По умолчанию: 5" -#: src/version_usage.cc:97 +#: src/version_usage.cc:111 msgid " -t, --timeout=SEC Set timeout in seconds. Default: 60" msgstr "" " -t, --timeout=SEC Установить таймаут в секундах. По умолчанию: 60" -#: src/version_usage.cc:98 +#: src/version_usage.cc:112 msgid "" " -m, --max-tries=N Set number of tries. 0 means unlimited.\n" " Default: 5" @@ -994,7 +977,7 @@ msgstr "" " -m, --max-tries=N Установить число попыток. 0 означает\n" " неограниченное число. По умолчанию: 5" -#: src/version_usage.cc:106 +#: src/version_usage.cc:120 #, fuzzy msgid "" " --http-proxy=HOST:PORT Use HTTP proxy server. This affects all URLs." @@ -1002,33 +985,33 @@ msgstr "" " --http-proxy-user=USER Установить пользователя для прокси HTTP. Это " "влияет на все URL." -#: src/version_usage.cc:107 +#: src/version_usage.cc:121 msgid " --http-user=USER Set HTTP user. This affects all URLs." msgstr "" " --http-user=USER Установить пользователя для HTTP. Это влияет " "на все URL." -#: src/version_usage.cc:108 +#: src/version_usage.cc:122 msgid " --http-passwd=PASSWD Set HTTP password. This affects all URLs." msgstr "" " --http-passwd=PASSWD Установить пароль для HTTP. Это влияет на все " "URL." -#: src/version_usage.cc:109 +#: src/version_usage.cc:123 msgid "" " --http-proxy-user=USER Set HTTP proxy user. This affects all URLs." msgstr "" " --http-proxy-user=USER Установить пользователя для прокси HTTP. Это " "влияет на все URL." -#: src/version_usage.cc:110 +#: src/version_usage.cc:124 msgid "" " --http-proxy-passwd=PASSWD Set HTTP proxy password. This affects all URLs." msgstr "" " --http-proxy-passwd=PASSWD Установить пароль для прокси HTTP. Это влияет " "на все URL." -#: src/version_usage.cc:111 +#: src/version_usage.cc:125 msgid "" " --http-proxy-method=METHOD Set the method to use in proxy request.\n" " METHOD is either 'get' or 'tunnel'.\n" @@ -1040,7 +1023,7 @@ msgstr "" " или \"tunnel\".\n" " По умолчанию: tunnel" -#: src/version_usage.cc:114 +#: src/version_usage.cc:128 msgid "" " --http-auth-scheme=SCHEME Set HTTP authentication scheme. Currently, " "basic\n" @@ -1051,12 +1034,12 @@ msgstr "" " момент доступна только схема \"basic\"\n" " По умолчанию: basic" -#: src/version_usage.cc:117 +#: src/version_usage.cc:131 msgid " --referer=REFERER Set Referer. This affects all URLs." msgstr "" " --referer=REFERER Установить реферер. Это влияет на все URL." -#: src/version_usage.cc:118 +#: src/version_usage.cc:132 msgid "" " --ftp-user=USER Set FTP user. This affects all URLs.\n" " Default: anonymous" @@ -1065,7 +1048,7 @@ msgstr "" "URL.\n" " По умолчанию: anonymous" -#: src/version_usage.cc:120 +#: src/version_usage.cc:134 msgid "" " --ftp-passwd=PASSWD Set FTP password. This affects all URLs.\n" " Default: ARIA2USER@" @@ -1073,7 +1056,7 @@ msgstr "" " --ftp-passwd=PASSWD Установить пароль FTP. Это влияет на все URL.\n" " По умолчанию: ARIA2USER@" -#: src/version_usage.cc:122 +#: src/version_usage.cc:136 msgid "" " --ftp-type=TYPE Set FTP transfer type. TYPE is either " "'binary'\n" @@ -1084,11 +1067,11 @@ msgstr "" " или \"binary\", или \"ascii\".\n" " По умолчанию: binary" -#: src/version_usage.cc:125 +#: src/version_usage.cc:139 msgid " -p, --ftp-pasv Use passive mode in FTP." msgstr " -p, --ftp-pasv Использовать пассивный режим для FTP." -#: src/version_usage.cc:126 +#: src/version_usage.cc:140 msgid "" " --ftp-via-http-proxy=METHOD Use HTTP proxy in FTP. METHOD is either 'get' " "or\n" @@ -1100,7 +1083,7 @@ msgstr "" " быть \"get\" или \"tunnel\".\n" " По умолчанию: tunnel" -#: src/version_usage.cc:129 +#: src/version_usage.cc:143 msgid "" " --lowest-speed-limit=SPEED Close connection if download speed is lower " "than\n" @@ -1113,7 +1096,7 @@ msgid "" " Default: 0" msgstr "" -#: src/version_usage.cc:136 +#: src/version_usage.cc:150 #, fuzzy msgid "" " --max-download-limit=SPEED Set max download speed in bytes per sec.\n" @@ -1127,7 +1110,7 @@ msgstr "" " файлы.\n" " По умолчанию: true" -#: src/version_usage.cc:140 +#: src/version_usage.cc:154 msgid "" " --file-allocation=METHOD Specify file allocation method. METHOD is " "either\n" @@ -1141,7 +1124,7 @@ msgid "" " Default: prealloc" msgstr "" -#: src/version_usage.cc:146 +#: src/version_usage.cc:160 msgid "" " --no-file-allocation-limit=SIZE No file allocation is made for files whose\n" " size is smaller than SIZE.\n" @@ -1150,7 +1133,7 @@ msgid "" " Default: 5M" msgstr "" -#: src/version_usage.cc:151 +#: src/version_usage.cc:165 #, fuzzy msgid "" " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n" @@ -1165,7 +1148,7 @@ msgstr "" " файлы.\n" " По умолчанию: true" -#: src/version_usage.cc:155 +#: src/version_usage.cc:169 #, fuzzy msgid "" " -Z, --force-sequential[=true|false] Fetch URIs in the command-line " @@ -1181,7 +1164,7 @@ msgstr "" " файлы.\n" " По умолчанию: true" -#: src/version_usage.cc:159 +#: src/version_usage.cc:173 msgid "" " --auto-file-renaming[=true|false] Rename file name if the same file " "already\n" @@ -1193,7 +1176,7 @@ msgid "" " Default: true" msgstr "" -#: src/version_usage.cc:165 +#: src/version_usage.cc:179 msgid "" " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n" " You can specify set of parts:\n" @@ -1210,20 +1193,20 @@ msgid "" " Default: false" msgstr "" -#: src/version_usage.cc:176 +#: src/version_usage.cc:190 msgid "" " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent " "connection.\n" " Default: false" msgstr "" -#: src/version_usage.cc:178 +#: src/version_usage.cc:192 msgid "" " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n" " Default: false" msgstr "" -#: src/version_usage.cc:181 +#: src/version_usage.cc:195 msgid "" " --check-integrity=true|false Check file integrity by validating piece " "hash.\n" @@ -1233,13 +1216,10 @@ msgid "" " Use this option to re-download a damaged " "portion\n" " of a file.\n" -" You may need to specify --allow-" -"overwrite=true\n" -" if the .aria2 file doesn't exist.\n" " Default: false" msgstr "" -#: src/version_usage.cc:189 +#: src/version_usage.cc:201 #, fuzzy msgid "" " --realtime-chunk-checksum=true|false Validate chunk checksum while\n" @@ -1255,7 +1235,7 @@ msgstr "" " файлы.\n" " По умолчанию: true" -#: src/version_usage.cc:194 +#: src/version_usage.cc:206 msgid "" " -c, --continue Continue downloading a partially downloaded\n" " file. Use this option to resume a download\n" @@ -1265,15 +1245,15 @@ msgid "" " applicable to http(s)/ftp downloads." msgstr "" -#: src/version_usage.cc:200 +#: src/version_usage.cc:212 msgid " -U, --user-agent=USER_AGENT Set user agent for http(s) downloads." msgstr "" -#: src/version_usage.cc:201 +#: src/version_usage.cc:213 msgid " -n, --no-netrc Disables netrc support." msgstr "" -#: src/version_usage.cc:202 +#: src/version_usage.cc:214 msgid "" " -i, --input-file=FILE Downloads URIs found in FILE. You can specify\n" " multiple URIs for a single entity: separate\n" @@ -1282,7 +1262,7 @@ msgid "" " Reads input from stdin when '-' is specified." msgstr "" -#: src/version_usage.cc:206 +#: src/version_usage.cc:218 #, fuzzy msgid "" " -j, --max-concurrent-downloads=N Set maximum number of concurrent " @@ -1296,23 +1276,25 @@ msgstr "" " или \"tunnel\".\n" " По умолчанию: tunnel" -#: src/version_usage.cc:209 +#: src/version_usage.cc:221 msgid "" " --load-cookies=FILE Load cookies from FILE. The format of FILE is\n" " the same used by Netscape and Mozilla." msgstr "" -#: src/version_usage.cc:212 +#: src/version_usage.cc:224 #, fuzzy msgid "" " -S, --show-files Print file listing of .torrent or .metalink " "file\n" -" and exit." +" and exit. More detailed information will be " +"listed\n" +" in case of torrent file." msgstr "" " -m, --max-tries=N Установить число попыток. 0 означает\n" " неограниченное число. По умолчанию: 5" -#: src/version_usage.cc:214 +#: src/version_usage.cc:227 msgid "" " --select-file=INDEX... Set file to download by specifing its index.\n" " You can find the file index using the\n" @@ -1326,11 +1308,11 @@ msgid "" "options)." msgstr "" -#: src/version_usage.cc:224 +#: src/version_usage.cc:237 msgid " -T, --torrent-file=TORRENT_FILE The path to the .torrent file." msgstr " -T, --torrent-file=TORRENT_FILE Путь до .torrent-файла." -#: src/version_usage.cc:225 +#: src/version_usage.cc:238 msgid "" " --follow-torrent=true|false Set to false to prevent aria2 from\n" " entering BitTorrent mode even if the filename " @@ -1344,7 +1326,7 @@ msgstr "" " файлы.\n" " По умолчанию: true" -#: src/version_usage.cc:229 +#: src/version_usage.cc:242 msgid "" " --direct-file-mapping=true|false Directly read from and write to each file\n" " mentioned in .torrent file.\n" @@ -1354,7 +1336,7 @@ msgstr "" " описанный в .torrent-файл.\n" " По умолчанию: true" -#: src/version_usage.cc:232 +#: src/version_usage.cc:245 #, fuzzy msgid "" " --listen-port=PORT Set TCP port number for BitTorrent downloads.\n" @@ -1363,7 +1345,7 @@ msgstr "" " -m, --max-tries=N Установить число попыток. 0 означает\n" " неограниченное число. По умолчанию: 5" -#: src/version_usage.cc:234 +#: src/version_usage.cc:247 msgid "" " --max-upload-limit=SPEED Set max upload speed in bytes per sec.\n" " 0 means unrestricted.\n" @@ -1371,7 +1353,7 @@ msgid "" " Default: 0" msgstr "" -#: src/version_usage.cc:238 +#: src/version_usage.cc:251 #, fuzzy msgid "" " --seed-time=MINUTES Specify seeding time in minutes. Also see the\n" @@ -1380,7 +1362,7 @@ msgstr "" " -m, --max-tries=N Установить число попыток. 0 означает\n" " неограниченное число. По умолчанию: 5" -#: src/version_usage.cc:240 +#: src/version_usage.cc:253 msgid "" " --seed-ratio=RATIO Specify share ratio. Seed completed torrents\n" " until share ratio reaches RATIO. 1.0 is\n" @@ -1390,7 +1372,7 @@ msgid "" " least one of the conditions is satisfied." msgstr "" -#: src/version_usage.cc:245 +#: src/version_usage.cc:258 msgid "" " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID " "in\n" @@ -1403,11 +1385,11 @@ msgid "" " Default: -aria2-" msgstr "" -#: src/version_usage.cc:254 +#: src/version_usage.cc:267 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file." msgstr " -M, --metalink-file=METALINK_FILE Путь к .metalink-файлу." -#: src/version_usage.cc:255 +#: src/version_usage.cc:268 #, fuzzy msgid "" " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" @@ -1419,27 +1401,27 @@ msgstr "" " быть \"get\" или \"tunnel\".\n" " По умолчанию: tunnel" -#: src/version_usage.cc:258 +#: src/version_usage.cc:271 msgid " --metalink-version=VERSION The version of the file to download." msgstr " --metalink-version=VERSION Версия файла для скачивания." -#: src/version_usage.cc:259 +#: src/version_usage.cc:272 msgid " --metalink-language=LANGUAGE The language of the file to download." msgstr " --metalink-language=LANGUAGE Язык файла для скачивания." -#: src/version_usage.cc:260 +#: src/version_usage.cc:273 msgid "" " --metalink-os=OS The operating system of the file to download." msgstr " --metalink-os=OS Целевая операционная система файла." -#: src/version_usage.cc:261 +#: src/version_usage.cc:274 msgid "" " --metalink-location=LOCATION[,...] The location of the preferred server.\n" " A comma-deliminated list of locations is\n" " acceptable." msgstr "" -#: src/version_usage.cc:264 +#: src/version_usage.cc:277 msgid "" " --follow-metalink=true|false Set to false to prevent aria2 from\n" " entering Metalink mode even if the filename " @@ -1453,95 +1435,123 @@ msgstr "" " файлы.\n" " По умолчанию: true" -#: src/version_usage.cc:269 +#: src/version_usage.cc:282 msgid " -v, --version Print the version number and exit." msgstr " -v, --version Вывести номер версии и выйти." -#: src/version_usage.cc:270 +#: src/version_usage.cc:283 msgid " -h, --help Print this message and exit." msgstr " -h, --help Вывести это сообщение и выйти." -#: src/version_usage.cc:273 +#: src/version_usage.cc:286 msgid "" -" You can specify multiple URLs. All URLs must point to the same file\n" -" or downloading will fail." +" You can specify multiple URLs. Unless you specify -Z option, all URLs must\n" +" point to the same file or downloading will fail." msgstr "" -#: src/version_usage.cc:276 +#: src/version_usage.cc:288 +msgid "" +" You can specify both torrent file with -T option and URLs. By doing this,\n" +" download a file from both torrent swarm and http/ftp server at the same " +"time,\n" +" while the data from http/ftp are uploaded to the torrent swarm. Note that\n" +" only single file torrent can be integrated with http/ftp." +msgstr "" + +#: src/version_usage.cc:293 msgid "Examples:" msgstr "Примеры:" -#: src/version_usage.cc:277 +#: src/version_usage.cc:294 #, fuzzy msgid " Download a file using 1 connection:" msgstr " Скачать файл с помощью локального .metalink-файла:" -#: src/version_usage.cc:279 +#: src/version_usage.cc:296 #, fuzzy msgid " Download a file using 2 connections:" msgstr " Скачать файл с помощью локального .metalink-файла:" -#: src/version_usage.cc:281 +#: src/version_usage.cc:298 msgid "" " Download a file using 2 connections, each connects to a different server:" msgstr "" -#: src/version_usage.cc:283 +#: src/version_usage.cc:300 msgid " You can mix up different protocols:" msgstr " Вы можете смешивать различные протоколы:" -#: src/version_usage.cc:285 +#: src/version_usage.cc:302 msgid " Parameterized URI:" msgstr "" -#: src/version_usage.cc:287 +#: src/version_usage.cc:304 msgid " Parameterized URI. -Z option is required in this case:" msgstr "" -#: src/version_usage.cc:291 +#: src/version_usage.cc:308 msgid " Download a torrent:" msgstr " Скачать torrent:" -#: src/version_usage.cc:293 +#: src/version_usage.cc:310 #, fuzzy msgid " Download a torrent using a local .torrent file:" msgstr " Скачать файл с помощью локального .metalink-файла:" -#: src/version_usage.cc:295 src/version_usage.cc:308 +#: src/version_usage.cc:312 src/version_usage.cc:330 msgid " Download only selected files:" msgstr " Скачать только выбранные файлы:" -#: src/version_usage.cc:297 +#: src/version_usage.cc:314 msgid " Print file listing of .torrent file:" msgstr " Вывести список фалов из .torrent" -#: src/version_usage.cc:302 +#: src/version_usage.cc:316 +#, fuzzy +msgid " Download a file using torrent and http/ftp server" +msgstr " Скачать файл с помощью локального .metalink-файла:" + +#: src/version_usage.cc:321 msgid " Metalink downloading:" msgstr " Скачать metalink:" -#: src/version_usage.cc:304 +#: src/version_usage.cc:323 msgid " Download a file using local .metalink file:" msgstr " Скачать файл с помощью локального .metalink-файла:" -#: src/version_usage.cc:306 +#: src/version_usage.cc:326 +#, fuzzy +msgid "" +" Download a file using a local .metalink file with preferred server " +"locations:" +msgstr " Скачать файл с помощью локального .metalink-файла:" + +#: src/version_usage.cc:328 msgid " Metalink downloading with preferences:" msgstr " Скачивание metalink с настройками:" -#: src/version_usage.cc:310 +#: src/version_usage.cc:332 #, fuzzy msgid " Download only selected files using index:" msgstr " Скачать только выбранные файлы:" -#: src/version_usage.cc:312 +#: src/version_usage.cc:334 #, fuzzy msgid " Print file listing of .metalink file:" msgstr " Вывести список фалов из .torrent" -#: src/version_usage.cc:316 +#: src/version_usage.cc:338 #, c-format msgid "Report bugs to %s" msgstr "Сообщения об ошибках направляйте на адрес %s" -#: src/BtSetup.cc:111 +#: src/BtSetup.cc:109 msgid "Errors occurred while binding port.\n" msgstr "Ошибка при открытии порта.\n" + +#~ msgid "" +#~ "\n" +#~ "The download was complete. <%s>\n" +#~ msgstr "" +#~ "\n" +#~ "Скачивание завершено. <%s>\n" diff --git a/src/FtpNegotiationCommand.cc b/src/FtpNegotiationCommand.cc index 6372be9a..c15c6bc3 100644 --- a/src/FtpNegotiationCommand.cc +++ b/src/FtpNegotiationCommand.cc @@ -208,8 +208,6 @@ bool FtpNegotiationCommand::recvSize() { _requestGroup->initPieceStorage(); - // validate totalsize against hintTotalSize if it is provided. - _requestGroup->validateTotalLengthByHint(size); // TODO Is this really necessary? if(req->getMethod() == Request::METHOD_HEAD) { sequence = SEQ_HEAD_OK; diff --git a/src/HttpResponseCommand.cc b/src/HttpResponseCommand.cc index a7d62346..f4f7fa42 100644 --- a/src/HttpResponseCommand.cc +++ b/src/HttpResponseCommand.cc @@ -87,9 +87,7 @@ bool HttpResponseCommand::executeInternal() return prepareForRetry(0); } if(_requestGroup->getPieceStorage().isNull()) { - // validate totalsize against hintTotalSize if it is provided. int64_t totalLength = httpResponse->getEntityLength(); - _requestGroup->validateTotalLengthByHint(totalLength); SingleFileDownloadContextHandle dctx = _requestGroup->getDownloadContext(); dctx->setTotalLength(totalLength); dctx->setFilename(httpResponse->determinFilename()); diff --git a/src/Metalink2RequestGroup.cc b/src/Metalink2RequestGroup.cc index 262611ed..cf9d1c35 100644 --- a/src/Metalink2RequestGroup.cc +++ b/src/Metalink2RequestGroup.cc @@ -184,7 +184,6 @@ RequestGroups Metalink2RequestGroup::generate(const string& metalinkFile) } #endif // ENABLE_MESSAGE_DIGEST rg->setDownloadContext(dctx); - rg->setHintTotalLength(entry->getLength()); rg->setNumConcurrentCommand(entry->maxConnections < 0 ? _option->getAsInt(PREF_METALINK_SERVERS) : min(_option->getAsInt(PREF_METALINK_SERVERS), entry->maxConnections)); diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc index aa015d9f..4e72ce58 100644 --- a/src/RequestGroup.cc +++ b/src/RequestGroup.cc @@ -80,7 +80,6 @@ int32_t RequestGroup::_gidCounter = 0; RequestGroup::RequestGroup(const Option* option, const Strings& uris): _gid(++_gidCounter), - _hintTotalLength(0), _uris(uris), _numConcurrentCommand(0), _numStreamConnection(0), @@ -462,16 +461,6 @@ void RequestGroup::validateTotalLength(int64_t actualTotalLength) const validateTotalLength(getTotalLength(), actualTotalLength); } -void RequestGroup::validateFilenameByHint(const string& actualFilename) const -{ - validateFilename(_hintFilename, actualFilename); -} - -void RequestGroup::validateTotalLengthByHint(int64_t actualTotalLength) const -{ - validateTotalLength(_hintTotalLength, actualTotalLength); -} - void RequestGroup::increaseStreamConnection() { ++_numStreamConnection; @@ -586,10 +575,14 @@ RequestGroups RequestGroup::postDownloadProcessing() void RequestGroup::initializePostDownloadHandler() { #ifdef ENABLE_BITTORRENT - _postDownloadHandlers.push_back(new BtPostDownloadHandler(_option)); + if(_option->get(PREF_FOLLOW_TORRENT) == V_TRUE) { + _postDownloadHandlers.push_back(new BtPostDownloadHandler(_option)); + } #endif // ENABLE_BITTORRENT #ifdef ENABLE_METALINK - _postDownloadHandlers.push_back(new MetalinkPostDownloadHandler(_option)); + if(_option->get(PREF_FOLLOW_METALINK) == V_TRUE) { + _postDownloadHandlers.push_back(new MetalinkPostDownloadHandler(_option)); + } #endif // ENABLE_METALINK } diff --git a/src/RequestGroup.h b/src/RequestGroup.h index aea5b68a..fc2f5a2e 100644 --- a/src/RequestGroup.h +++ b/src/RequestGroup.h @@ -74,14 +74,6 @@ private: int32_t _gid; - /** - * Hint for total length and filename. - * These values are used to verify whether the file http/ftp server sends back - * is correct one. - */ - int64_t _hintTotalLength; - string _hintFilename; - Strings _uris; Strings _spentUris; @@ -166,26 +158,6 @@ public: int64_t getCompletedLength() const; - const string& getHintFilename() const - { - return _hintFilename; - } - - void setHintFilename(const string& filename) - { - _hintFilename = filename; - } - - int64_t getHintTotalLength() const - { - return _hintTotalLength; - } - - void setHintTotalLength(int64_t totalLength) - { - _hintTotalLength = totalLength; - } - const Strings& getRemainingUris() const { return _uris; @@ -200,20 +172,13 @@ public: /** * Compares expected filename with specified actualFilename. - * The expected filename refers to SegmentMan::filename. + * The expected filename refers to FileEntry::getBasename() of the first + * element of DownloadContext::getFileEntries() */ void validateFilename(const string& actualFilename) const; void validateTotalLength(int64_t actualTotalLength) const; - /** - * Compares expected filename with specified actualFilename. - * The expected filename refers to RequestGroup::hintFilename. - */ - void validateFilenameByHint(const string& actualFilename) const; - - void validateTotalLengthByHint(int64_t actualTotalLength) const; - void setSegmentManFactory(const SegmentManFactoryHandle& segmentManFactory); void setNumConcurrentCommand(int32_t num) diff --git a/src/RequestInfo.h b/src/RequestInfo.h deleted file mode 100644 index 99f35633..00000000 --- a/src/RequestInfo.h +++ /dev/null @@ -1,81 +0,0 @@ -/* */ -#ifndef _D_REQUEST_INFO_H_ -#define _D_REQUEST_INFO_H_ - -#include "common.h" -#include "LogFactory.h" -#include "Option.h" - -class RequestInfo; - -typedef SharedHandle RequestInfoHandle; -typedef deque RequestInfos; - -class RequestInfo { -protected: - Option* op; - const Logger* logger; - bool fail; - - void printDownloadCompeleteMessage(const string& filename) { - printf(_("\nThe download was complete. <%s>\n"), filename.c_str()); - } - - void printDownloadCompeleteMessage() { - printf("\nThe download was complete.\n"); - } - - void printDownloadAbortMessage() { - printf(_("\nSome downloads were not complete because of errors." - " Check the log.\n" - "aria2 will resume download if the transfer is restarted.")); - printf("\n"); - } -public: - RequestInfo(Option* op): - op(op), - logger(LogFactory::getInstance()), - fail(false) - {} - - virtual ~RequestInfo() {} - - virtual RequestInfos execute() = 0; - - bool isFail() const { return fail; } -}; - -#endif // _D_REQUEST_INFO_H_ diff --git a/src/version_usage.cc b/src/version_usage.cc index 5f5a34c6..6adab969 100644 --- a/src/version_usage.cc +++ b/src/version_usage.cc @@ -39,16 +39,10 @@ #endif // ENABLE_MESSAGE_DIGEST void showVersion() { - cout << PACKAGE << _(" version ") << PACKAGE_VERSION << endl; - cout << "**Configuration**" << endl; - cout << FeatureConfig::getInstance()->getConfigurationSummary(); -#ifdef ENABLE_MESSAGE_DIGEST - cout << "message digest algorithms: " << MessageDigestContext::getSupportedAlgoString() << endl; -#endif // ENABLE_MESSAGE_DIGEST - cout << endl; - cout << "Copyright (C) 2006, 2007 Tatsuhiro Tsujikawa" << endl; - cout << endl; - cout << + cout << PACKAGE << _(" version ") << PACKAGE_VERSION << "\n" + << "Copyright (C) 2006, 2007 Tatsuhiro Tsujikawa" << "\n" + << "\n" + << _("This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" "the Free Software Foundation; either version 2 of the License, or\n" @@ -61,12 +55,32 @@ void showVersion() { "\n" "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" - "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"); - cout << endl; - cout << _("Contact Info:") << endl; - cout << "Tatsuhiro Tsujikawa " << endl; - cout << endl; + "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n") + << "\n" + << + "In addition, as a special exception, the copyright holders give\n" + "permission to link the code of portions of this program with the\n" + "OpenSSL library under certain conditions as described in each\n" + "individual source file, and distribute linked combinations\n" + "including the two.\n" + "You must obey the GNU General Public License in all respects\n" + "for all of the code used other than OpenSSL. If you modify\n" + "file(s) with this exception, you may extend this exception to your\n" + "version of the file(s), but you are not obligated to do so. If you\n" + "do not wish to do so, delete this exception statement from your\n" + "version. If you delete this exception statement from all source\n" + "files in the program, then also delete it here.\n" + << "\n" + << "** Configuration **" << "\n" + << FeatureConfig::getInstance()->getConfigurationSummary() +#ifdef ENABLE_MESSAGE_DIGEST + << "message digest algorithms: " << MessageDigestContext::getSupportedAlgoString() << "\n" +#endif // ENABLE_MESSAGE_DIGEST + << "\n" + << _("Contact Info:") << "\n" + << "Tatsuhiro Tsujikawa " + << endl; } void showUsage() { @@ -183,8 +197,6 @@ void showUsage() { " and Metalink downloads with chunk checksums.\n" " Use this option to re-download a damaged portion\n" " of a file.\n" - " You may need to specify --allow-overwrite=true\n" - " if the .aria2 file doesn't exist.\n" " Default: false") << endl; cout << _(" --realtime-chunk-checksum=true|false Validate chunk checksum while\n" " downloading a file in Metalink mode. This option\n" @@ -310,6 +322,9 @@ void showUsage() { cout << " aria2c http://AAA.BBB.CCC/file.metalink" << endl; cout << _(" Download a file using local .metalink file:") << endl; cout << " aria2c -M test.metalink" << endl; + + cout << _(" Download a file using a local .metalink file with preferred server locations:") << endl; + cout << " aria2c -M test.metalink --metalink-location=JP,US" << endl; cout << _(" Metalink downloading with preferences:") << endl; cout << " aria2c -M test.metalink --metalink-version=1.1.1 --metalink-language=en-US" << endl; cout << _(" Download only selected files:") << endl;