2007-10-29 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Use File::renameTo()
	* src/DefaultBtProgressInfoFile.cc

	Added --no-file-allocation-limit command-line option.
        * src/version_usage.cc
	* src/option_processing.cc
        * src/OptionHandlerFactory.cc
        * src/RequestGroup.{h, cc}
	* src/BtCheckIntegrityEntry.cc
	* src/StreamCheckIntegrityEntry.cc
        * src/prefs.h
        * doc/aria2c.1.txt
        * doc/aria2c.1

	Now prealloc is the default value for --file-allocation option.
        * src/version_usage.cc
	* src/option_processing.cc
        * doc/aria2c.1.txt
        * doc/aria2c.1

	Don't URL-encode user-agent.
	* src/HttpRequest.cc

	Updated translations
        * po/LINGUAS: Added nl for Dutch translation.
        * po/nl.po: Added Dutch translation, thanks to A. Bram Neijt.
        * po/de.po: Updated German translation, thanks to Patrick 
Ruckstuhl.
	* po/POTFILES.in: Updated.

ChangeLog

@@ -1,3 +1,34 @@
+2007-10-29  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Use File::renameTo()
+	* src/DefaultBtProgressInfoFile.cc
+
+	Added --no-file-allocation-limit command-line option.
+        * src/version_usage.cc
+	* src/option_processing.cc
+        * src/OptionHandlerFactory.cc
+        * src/RequestGroup.{h, cc}
+	* src/BtCheckIntegrityEntry.cc
+	* src/StreamCheckIntegrityEntry.cc
+        * src/prefs.h
+        * doc/aria2c.1.txt
+        * doc/aria2c.1
+
+	Now prealloc is the default value for --file-allocation option.
+        * src/version_usage.cc
+	* src/option_processing.cc
+        * doc/aria2c.1.txt
+        * doc/aria2c.1
+
+	Don't URL-encode user-agent.
+	* src/HttpRequest.cc
+
+	Updated translations
+        * po/LINGUAS: Added nl for Dutch translation.
+        * po/nl.po: Added Dutch translation, thanks to A. Bram Neijt.
+        * po/de.po: Updated German translation, thanks to Patrick Ruckstuhl.
+	* po/POTFILES.in: Updated.
+	
 2007-10-27  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Added the ability to recognize url-list in a torrent file.

TODO

@@ -3,7 +3,6 @@
 * Add SSL server cert verification
 * Add SSL client cert support
 * Better HTTP status handling
-* Download files listed in a specifed file.
 * Add the feature which adds or removes URLs on-the-fly.
 * Add port range command-line option
 * Add max peers command-line option
@@ -14,14 +13,11 @@
 * Add silent mode.
 * Save URLs and command-line arguments to .aria2 file.
 * Add a control port for GUI frontend
-* Add a version header to .aria2 file to check the compatibiliy.
 * Use SharedHandle where it is useful.
 * Rewrite Util::countBit
 * Add --bt-timeout command line option.
-* Fix DefaultBtProgressInfoFile.cc: save(), load()
 * remove blockIndex
 * Add seed mode.
-* Make trakcerwatchercommand and trackerUploadCommand posses requestGroup 
 * consider life cycle of requestGroup and segmentMan
 * exit status: all downloads have been successful-> EXIT_SUCCESS,
 		some of downloads have been failed -> EXIT_FAILURE
@@ -50,6 +46,7 @@
 * Reconsider the use of RecoverableException and FatalException
 * Limit the number of opening file to,say,100 in MultiDiskAdaptor.
 * Implement the feature to treat http/ftp as auxuality download method for BitTorrent
+* http-seeding(single and multi-file torrent)
 
 -- remaining features to be implemented for 0.12.0 release
 * Reimplement ChecksumCommand(validation using 1 checksum for 1 file)
@@ -59,3 +56,7 @@
 * improve --metalink-location field
 * Use content-type for PostDownloadHandler
 * Torrent information
+* Fix SleepCommand to catch halt signal
+* set prealloc default for --file-allocaiton option.
+* Add allDownloadFinished to RequestGroup to erase .aria2 file after download finished. RequestGroup::downloadFinished() can not be used here because it doesn't work properly when selective download
+* Call Segment::updateSubPiece to reflect partial download information to subpiece.

doc/aria2c.1

@@ -1,11 +1,11 @@
 .\"     Title: aria2c
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 09/10/2007
+.\"      Date: 10/29/2007
 .\"    Manual: 
 .\"    Source: 
 .\"
-.TH "ARIA2C" "1" "09/10/2007" "" ""
+.TH "ARIA2C" "1" "10/29/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -193,7 +193,12 @@ or
 \fInone\fR
 doesn\'t pre\-allocate file space\.
 \fIprealloc\fR
-pre\-allocates file space before download begins\. This may take some time depending on the size of the file\. Default: none
+pre\-allocates file space before download begins\. This may take some time depending on the size of the file\. Default: prealloc
+.RE
+.PP
+\-\-no\-file\-allocation\-limit=SIZE
+.RS 4
+No file allocation is made for files whose size is smaller than SIZE\. You can append K or M(1K = 1024, 1M = 1024K)\. Default: 5M
 .RE
 .PP
 \-\-allow\-overwrite=true|false

doc/aria2c.1.txt

@@ -128,8 +128,14 @@ OPTIONS
                               file space. 'prealloc' pre-allocates file space
                               before download begins. This may take some time
                               depending on the size of the file.
-                              Default: none
-
+                              Default: prealloc
+
+ --no-file-allocation-limit=SIZE::
+  No file allocation is made for files whose
+  size is smaller than SIZE.
+  You can append K or M(1K = 1024, 1M = 1024K).
+  Default: 5M
+ 	  	
  --allow-overwrite=true|false::
   If false, aria2 doesn't download a file which
                               already exists but the corresponding .aria2 file

po/LINGUAS

@@ -1 +1 @@
-ja de ru fr
+ja de ru fr nl

po/POTFILES

@@ -1,11 +1,8 @@
+     ../src/OptionHandlerImpl.h \
      ../src/RequestInfo.h \
      ../src/message.h \
      ../src/DownloadEngineFactory.cc \
-     ../src/TorrentRequestInfo.cc \
-     ../src/UrlRequestInfo.cc \
-     ../src/main.cc \
-     ../src/version_usage.cc \
-     ../src/DefaultPieceStorage.cc \
-     ../src/DefaultBtAnnounce.cc \
-     ../src/DefaultBtProgressInfoFile.cc \
-     ../src/ConsoleDownloadEngine.cc
+     ../src/MultiUrlRequestInfo.cc \
+     ../src/RequestGroupMan.cc \
+     ../src/Util.cc \
+     ../src/version_usage.cc

po/POTFILES.in

@@ -1,11 +1,8 @@
+src/OptionHandlerImpl.h
 src/RequestInfo.h
 src/message.h
 src/DownloadEngineFactory.cc
-src/TorrentRequestInfo.cc
-src/UrlRequestInfo.cc
-src/main.cc
+src/MultiUrlRequestInfo.cc
+src/RequestGroupMan.cc
+src/Util.cc
 src/version_usage.cc
-src/DefaultPieceStorage.cc
-src/DefaultBtAnnounce.cc
-src/DefaultBtProgressInfoFile.cc
-src/ConsoleDownloadEngine.cc

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-09-03 20:34+0900\n"
+"POT-Creation-Date: 2007-10-29 21:34+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,52 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/OptionHandlerImpl.h:65
+msgid "must be either 'true' or 'false'."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:93
+#, c-format
+msgid "must be smaller than or equal to %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:96
+#, c-format
+msgid "must be between %s and %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:99
+#, c-format
+msgid "must be greater than or equal to %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:102 src/OptionHandlerImpl.h:148
+msgid "must be a number."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:139
+#, c-format
+msgid "must be smaller than or equal to %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:142
+#, c-format
+msgid "must be between %.1f and %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:145
+#, c-format
+msgid "must be greater than or equal to %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:195
+msgid "must be one of the following:"
+msgstr ""
+
+#: src/OptionHandlerImpl.h:223
+msgid "unrecognized proxy format"
+msgstr ""
+
 #: src/RequestInfo.h:54
 #, c-format
 msgid ""
@@ -789,16 +835,33 @@ msgstr ""
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/DownloadEngineFactory.cc:197
-#, c-format
+#: src/DownloadEngineFactory.cc:97
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
-#: src/main.cc:91
+#: src/MultiUrlRequestInfo.cc:70
+msgid "aria2 will resume download if the transfer is restarted."
+msgstr ""
+
+#: src/MultiUrlRequestInfo.cc:72
+msgid ""
+"If there are any errors, then see the log file. See '-l' option in help/man "
+"page for details."
+msgstr ""
+
+#: src/RequestGroupMan.cc:213
+msgid "Download Results:"
+msgstr ""
+
+#: src/Util.cc:649
+msgid "Files:"
+msgstr ""
+
+#: src/version_usage.cc:40
 msgid " version "
 msgstr ""
 
-#: src/main.cc:101
+#: src/version_usage.cc:50
 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"
@@ -816,49 +879,49 @@ msgid ""
 "USA\n"
 msgstr ""
 
-#: src/main.cc:115
+#: src/version_usage.cc:64
 msgid "Contact Info:"
 msgstr ""
 
-#: src/main.cc:122
+#: src/version_usage.cc:71
 #, c-format
 msgid "Usage: %s [options] URL ...\n"
 msgstr ""
 
-#: src/main.cc:124
+#: src/version_usage.cc:73
 #, c-format
-msgid "       %s [options] -T TORRENT_FILE FILE ...\n"
+msgid "       %s [options] -T TORRENT_FILE URL ...\n"
 msgstr ""
 
-#: src/main.cc:127
+#: src/version_usage.cc:76
 #, c-format
 msgid "       %s [options] -M METALINK_FILE\n"
 msgstr ""
 
-#: src/main.cc:130
+#: src/version_usage.cc:79
 msgid "Options:"
 msgstr ""
 
-#: src/main.cc:131
+#: src/version_usage.cc:80
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
 msgstr ""
 
-#: src/main.cc:132
+#: src/version_usage.cc:81
 msgid " -o, --out=FILE               The file name of the downloaded file."
 msgstr ""
 
-#: src/main.cc:133
+#: src/version_usage.cc:82
 msgid ""
 " -l, --log=LOG                The file name of the log file. If '-' is\n"
 "                              specified, log is written to stdout."
 msgstr ""
 
-#: src/main.cc:136
+#: src/version_usage.cc:85
 msgid " -D, --daemon                 Run as daemon."
 msgstr ""
 
-#: src/main.cc:138
+#: src/version_usage.cc:87
 msgid ""
 " -s, --split=N                Download a file using N connections. N must "
 "be\n"
@@ -869,7 +932,7 @@ msgid ""
 "                              Default: 1"
 msgstr ""
 
-#: src/main.cc:143
+#: src/version_usage.cc:92
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
@@ -878,47 +941,47 @@ msgid ""
 "                              Default: 5"
 msgstr ""
 
-#: src/main.cc:146
+#: src/version_usage.cc:95
 msgid " -t, --timeout=SEC            Set timeout in seconds. Default: 60"
 msgstr ""
 
-#: src/main.cc:147
+#: src/version_usage.cc:96
 msgid ""
 " -m, --max-tries=N            Set number of tries. 0 means unlimited.\n"
 "                              Default: 5"
 msgstr ""
 
-#: src/main.cc:155
+#: src/version_usage.cc:104
 msgid ""
 " --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
 msgstr ""
 
-#: src/main.cc:156
+#: src/version_usage.cc:105
 msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 
-#: src/main.cc:157
+#: src/version_usage.cc:106
 msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 
-#: src/main.cc:158
+#: src/version_usage.cc:107
 msgid ""
 " --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
 msgstr ""
 
-#: src/main.cc:159
+#: src/version_usage.cc:108
 msgid ""
 " --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
 msgstr ""
 
-#: src/main.cc:160
+#: src/version_usage.cc:109
 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/main.cc:163
+#: src/version_usage.cc:112
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
@@ -926,23 +989,23 @@ msgid ""
 "                              Default: basic"
 msgstr ""
 
-#: src/main.cc:166
+#: src/version_usage.cc:115
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 
-#: src/main.cc:167
+#: src/version_usage.cc:116
 msgid ""
 " --ftp-user=USER              Set FTP user. This affects all URLs.\n"
 "                              Default: anonymous"
 msgstr ""
 
-#: src/main.cc:169
+#: src/version_usage.cc:118
 msgid ""
 " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs.\n"
 "                              Default: ARIA2USER@"
 msgstr ""
 
-#: src/main.cc:171
+#: src/version_usage.cc:120
 msgid ""
 " --ftp-type=TYPE              Set FTP transfer type. TYPE is either "
 "'binary'\n"
@@ -950,11 +1013,11 @@ msgid ""
 "                              Default: binary"
 msgstr ""
 
-#: src/main.cc:174
+#: src/version_usage.cc:123
 msgid " -p, --ftp-pasv               Use passive mode in FTP."
 msgstr ""
 
-#: src/main.cc:175
+#: src/version_usage.cc:124
 msgid ""
 " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP. METHOD is either 'get' "
 "or\n"
@@ -962,7 +1025,7 @@ msgid ""
 "                              Default: tunnel"
 msgstr ""
 
-#: src/main.cc:178
+#: src/version_usage.cc:127
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -975,7 +1038,7 @@ msgid ""
 "                              Default: 0"
 msgstr ""
 
-#: src/main.cc:185
+#: src/version_usage.cc:134
 msgid ""
 " --max-download-limit=SPEED   Set max download speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -983,7 +1046,7 @@ msgid ""
 "                              Default: 0"
 msgstr ""
 
-#: src/main.cc:189
+#: src/version_usage.cc:138
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method. METHOD is "
 "either\n"
@@ -994,10 +1057,19 @@ msgid ""
 "                              before download begins. This may take some "
 "time\n"
 "                              depending on the size of the file.\n"
-"                              Default: none"
+"                              Default: prealloc"
 msgstr ""
 
-#: src/main.cc:195
+#: src/version_usage.cc:144
+msgid ""
+" --no-file-allocation-limit=SIZE No file allocation is made for files whose\n"
+"                              size is smaller than SIZE.\n"
+"                              You can append K or M(1K = 1024, 1M = 1024K).\n"
+"                              BitTorrent downloads ignore this option.\n"
+"                              Default: 5M"
+msgstr ""
+
+#: src/version_usage.cc:149
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -1006,7 +1078,7 @@ msgid ""
 "                              Default: false"
 msgstr ""
 
-#: src/main.cc:199
+#: src/version_usage.cc:153
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -1016,7 +1088,7 @@ msgid ""
 "                              Default: false"
 msgstr ""
 
-#: src/main.cc:203
+#: src/version_usage.cc:157
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -1028,7 +1100,7 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:209
+#: src/version_usage.cc:163
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -1045,7 +1117,20 @@ msgid ""
 "                              Default: false"
 msgstr ""
 
-#: src/main.cc:221
+#: src/version_usage.cc:174
+msgid ""
+" --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistant "
+"connection.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:176
+msgid ""
+" --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:179
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
 "hash.\n"
@@ -1061,7 +1146,7 @@ msgid ""
 "                              Default: false"
 msgstr ""
 
-#: src/main.cc:229
+#: src/version_usage.cc:187
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -1071,7 +1156,7 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:234
+#: src/version_usage.cc:192
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1081,15 +1166,15 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/main.cc:240
+#: src/version_usage.cc:198
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/main.cc:241
+#: src/version_usage.cc:199
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/main.cc:242
+#: src/version_usage.cc:200
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1098,7 +1183,7 @@ msgid ""
 "                              Reads input from stdin when '-' is specified."
 msgstr ""
 
-#: src/main.cc:246
+#: src/version_usage.cc:204
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
 "downloads.\n"
@@ -1106,20 +1191,20 @@ msgid ""
 "                              Default: 5"
 msgstr ""
 
-#: src/main.cc:249
+#: src/version_usage.cc:207
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
 msgstr ""
 
-#: src/main.cc:252
+#: src/version_usage.cc:210
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
 "                              and exit."
 msgstr ""
 
-#: src/main.cc:254
+#: src/version_usage.cc:212
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -1133,11 +1218,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/main.cc:264
+#: src/version_usage.cc:222
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/main.cc:265
+#: src/version_usage.cc:223
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
 "                              entering BitTorrent mode even if the filename "
@@ -1146,20 +1231,20 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:269
+#: src/version_usage.cc:227
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:272
+#: src/version_usage.cc:230
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
 "                              Default: 6881-6999"
 msgstr ""
 
-#: src/main.cc:274
+#: src/version_usage.cc:232
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1167,13 +1252,13 @@ msgid ""
 "                              Default: 0"
 msgstr ""
 
-#: src/main.cc:278
+#: src/version_usage.cc:236
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/main.cc:280
+#: src/version_usage.cc:238
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -1183,7 +1268,7 @@ msgid ""
 "                              least one of the conditions is satisfied."
 msgstr ""
 
-#: src/main.cc:285
+#: src/version_usage.cc:243
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1196,35 +1281,35 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:294
+#: src/version_usage.cc:252
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/main.cc:295
+#: src/version_usage.cc:253
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously.\n"
 "                              Default: 5"
 msgstr ""
 
-#: src/main.cc:298
+#: src/version_usage.cc:256
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/main.cc:299
+#: src/version_usage.cc:257
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/main.cc:300
+#: src/version_usage.cc:258
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/main.cc:301
+#: src/version_usage.cc:259
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr ""
 
-#: src/main.cc:302
+#: src/version_usage.cc:260
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
 "                              entering Metalink mode even if the filename "
@@ -1233,105 +1318,86 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:307
+#: src/version_usage.cc:265
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/main.cc:308
+#: src/version_usage.cc:266
 msgid " -h, --help                   Print this message and exit."
 msgstr ""
 
-#: src/main.cc:311
+#: src/version_usage.cc:269
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
 " or downloading will fail."
 msgstr ""
 
-#: src/main.cc:316
-msgid ""
-" Specify files in multi-file torrent to download. Use in conjunction with "
-"the\n"
-" -T option. This argument is ignored if you specify the --select-file option."
-msgstr ""
-
-#: src/main.cc:320
+#: src/version_usage.cc:272
 msgid "Examples:"
 msgstr ""
 
-#: src/main.cc:321
+#: src/version_usage.cc:273
 msgid " Download a file using 1 connection:"
 msgstr ""
 
-#: src/main.cc:323
+#: src/version_usage.cc:275
 msgid " Download a file using 2 connections:"
 msgstr ""
 
-#: src/main.cc:325
+#: src/version_usage.cc:277
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
 msgstr ""
 
-#: src/main.cc:327
+#: src/version_usage.cc:279
 msgid " You can mix up different protocols:"
 msgstr ""
 
-#: src/main.cc:329
+#: src/version_usage.cc:281
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:331
+#: src/version_usage.cc:283
 msgid " Parameterized URI. -Z option is required in this case:"
 msgstr ""
 
-#: src/main.cc:335
+#: src/version_usage.cc:287
 msgid " Download a torrent:"
 msgstr ""
 
-#: src/main.cc:337
+#: src/version_usage.cc:289
 msgid " Download a torrent using a local .torrent file:"
 msgstr ""
 
-#: src/main.cc:339 src/main.cc:352
+#: src/version_usage.cc:291 src/version_usage.cc:304
 msgid " Download only selected files:"
 msgstr ""
 
-#: src/main.cc:341
+#: src/version_usage.cc:293
 msgid " Print file listing of .torrent file:"
 msgstr ""
 
-#: src/main.cc:346
+#: src/version_usage.cc:298
 msgid " Metalink downloading:"
 msgstr ""
 
-#: src/main.cc:348
+#: src/version_usage.cc:300
 msgid " Download a file using local .metalink file:"
 msgstr ""
 
-#: src/main.cc:350
+#: src/version_usage.cc:302
 msgid " Metalink downloading with preferences:"
 msgstr ""
 
-#: src/main.cc:354
+#: src/version_usage.cc:306
 msgid " Download only selected files using index:"
 msgstr ""
 
-#: src/main.cc:356
+#: src/version_usage.cc:308
 msgid " Print file listing of .metalink file:"
 msgstr ""
 
-#: src/main.cc:360
+#: src/version_usage.cc:312
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
-
-#: src/ConsoleDownloadEngine.cc:198
-#, c-format
-msgid ""
-"\n"
-"stopping application...\n"
-msgstr ""
-
-#: src/ConsoleDownloadEngine.cc:202
-#, c-format
-msgid "done\n"
-msgstr ""

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-09-03 20:34+0900\n"
+"POT-Creation-Date: 2007-10-29 21:34+0900\n"
 "PO-Revision-Date: 2007-09-06 21:47+0100\n"
 "Last-Translator: Sebastien WILLEMIJNS <seb@willemijns.com>\n"
 "Language-Team: Fran&ccedil;ais\n"
@@ -15,6 +15,52 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/OptionHandlerImpl.h:65
+msgid "must be either 'true' or 'false'."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:93
+#, c-format
+msgid "must be smaller than or equal to %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:96
+#, c-format
+msgid "must be between %s and %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:99
+#, c-format
+msgid "must be greater than or equal to %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:102 src/OptionHandlerImpl.h:148
+msgid "must be a number."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:139
+#, c-format
+msgid "must be smaller than or equal to %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:142
+#, c-format
+msgid "must be between %.1f and %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:145
+#, c-format
+msgid "must be greater than or equal to %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:195
+msgid "must be one of the following:"
+msgstr ""
+
+#: src/OptionHandlerImpl.h:223
+msgid "unrecognized proxy format"
+msgstr ""
+
 #: src/RequestInfo.h:54
 #, c-format
 msgid ""
@@ -829,16 +875,39 @@ msgstr ""
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/DownloadEngineFactory.cc:197
-#, c-format
+#: src/DownloadEngineFactory.cc:97
 msgid "Errors occurred while binding port.\n"
 msgstr "La jonction du port a engendré des erreurs.\n"
 
-#: src/main.cc:91
+#: src/MultiUrlRequestInfo.cc:70
+#, fuzzy
+msgid "aria2 will resume download if the transfer is restarted."
+msgstr ""
+"\n"
+"Certains t&eacute;l&eacute;chargements ne sont pas complets &agrave; cause "
+"d'&eacute;rreurs. V&eacute;rifiez le log.\n"
+"aria2 reprendra le transfert si le transfert est relanc&eacute;."
+
+#: src/MultiUrlRequestInfo.cc:72
+msgid ""
+"If there are any errors, then see the log file. See '-l' option in help/man "
+"page for details."
+msgstr ""
+
+#: src/RequestGroupMan.cc:213
+#, fuzzy
+msgid "Download Results:"
+msgstr "Téléchargez un torrent:"
+
+#: src/Util.cc:649
+msgid "Files:"
+msgstr ""
+
+#: src/version_usage.cc:40
 msgid " version "
 msgstr " version "
 
-#: src/main.cc:101
+#: src/version_usage.cc:50
 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"
@@ -872,40 +941,40 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  "
 "USA\n"
 
-#: src/main.cc:115
+#: src/version_usage.cc:64
 msgid "Contact Info:"
 msgstr "Informations de Contact:"
 
-#: src/main.cc:122
+#: src/version_usage.cc:71
 #, c-format
 msgid "Usage: %s [options] URL ...\n"
 msgstr "Utilisation: %s [options] URL ...\n"
 
-#: src/main.cc:124
-#, c-format
-msgid "       %s [options] -T TORRENT_FILE FILE ...\n"
+#: src/version_usage.cc:73
+#, fuzzy, c-format
+msgid "       %s [options] -T TORRENT_FILE URL ...\n"
 msgstr "       %s [options] -T FICHIER FICHIER_TORRENT...\n"
 
-#: src/main.cc:127
+#: src/version_usage.cc:76
 #, c-format
 msgid "       %s [options] -M METALINK_FILE\n"
 msgstr "       %s [options] -M FICHIER_METALINK\n"
 
-#: src/main.cc:130
+#: src/version_usage.cc:79
 msgid "Options:"
 msgstr "Options:"
 
-#: src/main.cc:131
+#: src/version_usage.cc:80
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
 msgstr " -d, --dir=DIR                Le dossier pour enregistrer le fichier."
 
-#: src/main.cc:132
+#: src/version_usage.cc:81
 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/main.cc:133
+#: src/version_usage.cc:82
 msgid ""
 " -l, --log=LOG                The file name of the log file. If '-' is\n"
 "                              specified, log is written to stdout."
@@ -914,11 +983,11 @@ msgstr ""
 "Si '-' est spécifié,\n"
 "                              le log est redirigé vers stdout."
 
-#: src/main.cc:136
+#: src/version_usage.cc:85
 msgid " -D, --daemon                 Run as daemon."
 msgstr " -D, --daemon                 Exécuter en tant que service."
 
-#: src/main.cc:138
+#: src/version_usage.cc:87
 msgid ""
 " -s, --split=N                Download a file using N connections. N must "
 "be\n"
@@ -937,7 +1006,7 @@ msgstr ""
 "                              N connexions.\n"
 "                              Défaut: 1"
 
-#: src/main.cc:143
+#: src/version_usage.cc:92
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
@@ -950,13 +1019,13 @@ msgstr ""
 "et 60.\n"
 "                              Défaut: 5"
 
-#: src/main.cc:146
+#: src/version_usage.cc:95
 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/main.cc:147
+#: src/version_usage.cc:96
 msgid ""
 " -m, --max-tries=N            Set number of tries. 0 means unlimited.\n"
 "                              Default: 5"
@@ -965,7 +1034,7 @@ msgstr ""
 "illimité.\n"
 "                              Défaut: 5"
 
-#: src/main.cc:155
+#: src/version_usage.cc:104
 msgid ""
 " --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
 msgstr ""
@@ -973,33 +1042,33 @@ msgstr ""
 "tous\n"
 "                              les URLs."
 
-#: src/main.cc:156
+#: src/version_usage.cc:105
 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/main.cc:157
+#: src/version_usage.cc:106
 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/main.cc:158
+#: src/version_usage.cc:107
 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/main.cc:159
+#: src/version_usage.cc:108
 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/main.cc:160
+#: src/version_usage.cc:109
 msgid ""
 " --http-proxy-method=METHOD   Set the method to use in proxy request.\n"
 "                              METHOD is either 'get' or 'tunnel'.\n"
@@ -1010,7 +1079,7 @@ msgstr ""
 "                              METHOD est soit 'get' ou 'tunnel'.\n"
 "                              Défaut: tunnel"
 
-#: src/main.cc:163
+#: src/version_usage.cc:112
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
@@ -1022,13 +1091,13 @@ msgstr ""
 "                              est le seul type d'identification supporté.\n"
 "                              Défaut: basic"
 
-#: src/main.cc:166
+#: src/version_usage.cc:115
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 " --referer=REFERER            Définir le Référant. Ceci affecte tous les "
 "URLs."
 
-#: src/main.cc:167
+#: src/version_usage.cc:116
 msgid ""
 " --ftp-user=USER              Set FTP user. This affects all URLs.\n"
 "                              Default: anonymous"
@@ -1037,7 +1106,7 @@ msgstr ""
 "les URLs.\n"
 "                              Défaut: anonymous"
 
-#: src/main.cc:169
+#: src/version_usage.cc:118
 msgid ""
 " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs.\n"
 "                              Default: ARIA2USER@"
@@ -1046,7 +1115,7 @@ msgstr ""
 "les URLs.\n"
 "                              Default: ARIA2USER@"
 
-#: src/main.cc:171
+#: src/version_usage.cc:120
 msgid ""
 " --ftp-type=TYPE              Set FTP transfer type. TYPE is either "
 "'binary'\n"
@@ -1058,11 +1127,11 @@ msgstr ""
 "                              ou 'ascii'.\n"
 "                              Défaut: binary"
 
-#: src/main.cc:174
+#: src/version_usage.cc:123
 msgid " -p, --ftp-pasv               Use passive mode in FTP."
 msgstr " -p, --ftp-pasv               Utiliser le mode passif de FTP."
 
-#: src/main.cc:175
+#: src/version_usage.cc:124
 msgid ""
 " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP. METHOD is either 'get' "
 "or\n"
@@ -1074,7 +1143,7 @@ msgstr ""
 "                              'tunnel'.\n"
 "                              Défaut: tunnel"
 
-#: src/main.cc:178
+#: src/version_usage.cc:127
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -1097,7 +1166,7 @@ msgstr ""
 "BitTorrent .\n"
 "                              Default: 0"
 
-#: src/main.cc:185
+#: src/version_usage.cc:134
 msgid ""
 " --max-download-limit=SPEED   Set max download speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1111,7 +1180,8 @@ msgstr ""
 "1024K).\n"
 "                              Défaut: 0"
 
-#: src/main.cc:189
+#: src/version_usage.cc:138
+#, fuzzy
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method. METHOD is "
 "either\n"
@@ -1122,7 +1192,7 @@ msgid ""
 "                              before download begins. This may take some "
 "time\n"
 "                              depending on the size of the file.\n"
-"                              Default: none"
+"                              Default: prealloc"
 msgstr ""
 " --file-allocation=METHOD     Spécifier la méthode d'allocation de fichier. "
 "METHOD est soit\n"
@@ -1135,7 +1205,27 @@ msgstr ""
 "fichier\n"
 "                              Défaut: none"
 
-#: src/main.cc:195
+#: src/version_usage.cc:144
+#, fuzzy
+msgid ""
+" --no-file-allocation-limit=SIZE No file allocation is made for files whose\n"
+"                              size is smaller than SIZE.\n"
+"                              You can append K or M(1K = 1024, 1M = 1024K).\n"
+"                              BitTorrent downloads ignore this option.\n"
+"                              Default: 5M"
+msgstr ""
+" --lowest-speed-limit=SPEED   Fermer la connexiion si la vitesse de "
+"téléchargement est inférieure à \n"
+"                              ou égal à cette valeur(octets par sec).\n"
+"                              0 veut dire que aria2 n'a pas de vitesse "
+"minimale.\n"
+"                              Vous pouvez ajouter K ou M(1K = 1024, 1M = "
+"1024K).\n"
+"                              Cette option n'affecte pas le téléchargement "
+"BitTorrent .\n"
+"                              Default: 0"
+
+#: src/version_usage.cc:149
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -1149,7 +1239,7 @@ msgstr ""
 "                              l'ordinateur\n"
 "                              Défaut: false"
 
-#: src/main.cc:199
+#: src/version_usage.cc:153
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -1159,7 +1249,7 @@ msgid ""
 "                              Default: false"
 msgstr ""
 
-#: src/main.cc:203
+#: src/version_usage.cc:157
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -1171,7 +1261,7 @@ msgid ""
 "                              Default: true"
 msgstr ""
 
-#: src/main.cc:209
+#: src/version_usage.cc:163
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -1188,7 +1278,20 @@ msgid ""
 "                              Default: false"
 msgstr ""
 
-#: src/main.cc:221
+#: src/version_usage.cc:174
+msgid ""
+" --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistant "
+"connection.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:176
+msgid ""
+" --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:179
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
 "hash.\n"
@@ -1215,7 +1318,7 @@ msgstr ""
 "                              si le fichier .aria2 n'existe pas.\n"
 "                              Défaut: false"
 
-#: src/main.cc:229
+#: src/version_usage.cc:187
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -1231,7 +1334,7 @@ msgstr ""
 "                              Metalink avec vérification d'intégrité.\n"
 "                              Défaut: true"
 
-#: src/main.cc:234
+#: src/version_usage.cc:192
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1251,17 +1354,17 @@ msgstr ""
 "                              En ce moment cette option s'applique aux\n"
 "                              téléchargements http(s)/ftp."
 
-#: src/main.cc:240
+#: src/version_usage.cc:198
 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/main.cc:241
+#: src/version_usage.cc:199
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr " -n, --no-netrc               Désactiver le support netrc."
 
-#: src/main.cc:242
+#: src/version_usage.cc:200
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1276,7 +1379,7 @@ msgstr ""
 "                              URIs par des tabulations sur une seule ligne.\n"
 "                              Lit la sortie de stdin quand '-' est spécifié."
 
-#: src/main.cc:246
+#: src/version_usage.cc:204
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
 "downloads.\n"
@@ -1288,7 +1391,7 @@ msgstr ""
 "                              Doit être utilisé avec l'option -i.\n"
 "                              Défaut: 5"
 
-#: src/main.cc:249
+#: src/version_usage.cc:207
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
@@ -1297,7 +1400,7 @@ msgstr ""
 "est\n"
 "                              celui utilisé par Netscape et Mozilla."
 
-#: src/main.cc:252
+#: src/version_usage.cc:210
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -1307,7 +1410,7 @@ msgstr ""
 "metalink\n"
 "                              et quitte."
 
-#: src/main.cc:254
+#: src/version_usage.cc:212
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -1334,12 +1437,12 @@ msgstr ""
 "varier selon\n"
 "                              la requête (consultez l'option --metalink-*)."
 
-#: src/main.cc:264
+#: src/version_usage.cc:222
 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/main.cc:265
+#: src/version_usage.cc:223
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
 "                              entering BitTorrent mode even if the filename "
@@ -1354,7 +1457,7 @@ msgstr ""
 "                              téléchargé termine pas l'extension .torrent.\n"
 "                              Défaut: true"
 
-#: src/main.cc:269
+#: src/version_usage.cc:227
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1365,7 +1468,7 @@ msgstr ""
 "                              mentioné dans le fichier .torrent.\n"
 "                              Défaut: true"
 
-#: src/main.cc:272
+#: src/version_usage.cc:230
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
 "                              Default: 6881-6999"
@@ -1374,7 +1477,7 @@ msgstr ""
 "cas d'une connexion P2P.\n"
 "                              Default: 6881-6999"
 
-#: src/main.cc:274
+#: src/version_usage.cc:232
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1388,7 +1491,7 @@ msgstr ""
 "1024K).\n"
 "                              Défaut: 0"
 
-#: src/main.cc:278
+#: src/version_usage.cc:236
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -1397,7 +1500,7 @@ msgstr ""
 "Consultez aussi\n"
 "                              l'option --seed-ratio."
 
-#: src/main.cc:280
+#: src/version_usage.cc:238
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -1416,7 +1519,7 @@ msgstr ""
 "conditions\n"
 "                              est satisfaite."
 
-#: src/main.cc:285
+#: src/version_usage.cc:243
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1429,12 +1532,12 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:294
+#: src/version_usage.cc:252
 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/main.cc:295
+#: src/version_usage.cc:253
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously.\n"
@@ -1445,26 +1548,26 @@ msgstr ""
 "                              simultanément.\n"
 "                              Défaut: 5"
 
-#: src/main.cc:298
+#: src/version_usage.cc:256
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   La version du fichier à télécharger."
 
-#: src/main.cc:299
+#: src/version_usage.cc:257
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE La langua du fichier à télécharger."
 
-#: src/main.cc:300
+#: src/version_usage.cc:258
 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/main.cc:301
+#: src/version_usage.cc:259
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr " --metalink-location=LOCATION La localisation du serveur préféré."
 
-#: src/main.cc:302
+#: src/version_usage.cc:260
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
 "                              entering Metalink mode even if the filename "
@@ -1480,15 +1583,15 @@ msgstr ""
 "metalink.\n"
 "                              Défaut: true"
 
-#: src/main.cc:307
+#: src/version_usage.cc:265
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Imprime le numéro de version et quitte."
 
-#: src/main.cc:308
+#: src/version_usage.cc:266
 msgid " -h, --help                   Print this message and exit."
 msgstr " -h, --help                   Imprime ce message et quitte."
 
-#: src/main.cc:311
+#: src/version_usage.cc:269
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
 " or downloading will fail."
@@ -1497,101 +1600,97 @@ msgstr ""
 "même fichier\n"
 " sinon le téléchargement échoue."
 
-#: src/main.cc:316
-msgid ""
-" Specify files in multi-file torrent to download. Use in conjunction with "
-"the\n"
-" -T option. This argument is ignored if you specify the --select-file option."
-msgstr ""
-" Spécifiez les fichiers du torrent multi-fichiers à télécharger. Utilisez "
-"avec l'option\n"
-" -T. Ces arguments sont ignorés si vous spécifiez l'option --select-file."
-
-#: src/main.cc:320
+#: src/version_usage.cc:272
 msgid "Examples:"
 msgstr " Exemples:"
 
-#: src/main.cc:321
+#: src/version_usage.cc:273
 msgid " Download a file using 1 connection:"
 msgstr "Téléchargez un fichier avec 1 connexion:"
 
-#: src/main.cc:323
+#: src/version_usage.cc:275
 msgid " Download a file using 2 connections:"
 msgstr "Téléchargez un fichier avec 2 connexions:"
 
-#: src/main.cc:325
+#: src/version_usage.cc:277
 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/main.cc:327
+#: src/version_usage.cc:279
 msgid " You can mix up different protocols:"
 msgstr "Vous pouvez mélanger différents protocoles:"
 
-#: src/main.cc:329
+#: src/version_usage.cc:281
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:331
+#: src/version_usage.cc:283
 msgid " Parameterized URI. -Z option is required in this case:"
 msgstr ""
 
-#: src/main.cc:335
+#: src/version_usage.cc:287
 msgid " Download a torrent:"
 msgstr "Téléchargez un torrent:"
 
-#: src/main.cc:337
+#: src/version_usage.cc:289
 msgid " Download a torrent using a local .torrent file:"
 msgstr "Téléchargez un torrent en utilisant un fichier local .torrent:"
 
-#: src/main.cc:339 src/main.cc:352
+#: src/version_usage.cc:291 src/version_usage.cc:304
 msgid " Download only selected files:"
 msgstr "Télécharger seulement les fichiers séléctionnés:"
 
-#: src/main.cc:341
+#: src/version_usage.cc:293
 msgid " Print file listing of .torrent file:"
 msgstr "Imprimer la liste des fichiers .torrent:"
 
-#: src/main.cc:346
+#: src/version_usage.cc:298
 msgid " Metalink downloading:"
 msgstr "Téléchargement Metalink:"
 
-#: src/main.cc:348
+#: src/version_usage.cc:300
 msgid " Download a file using local .metalink file:"
 msgstr "Télécharger un fichier en utilisant un fichier local .metalink:"
 
-#: src/main.cc:350
+#: src/version_usage.cc:302
 msgid " Metalink downloading with preferences:"
 msgstr "Téléchargement Metalink avec comme préférences:"
 
-#: src/main.cc:354
+#: src/version_usage.cc:306
 msgid " Download only selected files using index:"
 msgstr "Télécharger seulement les fichiers sélectionnés en utilisant l'index:"
 
-#: src/main.cc:356
+#: src/version_usage.cc:308
 msgid " Print file listing of .metalink file:"
 msgstr "Imprimer la liste de fichiers du fichier .metalink:"
 
-#: src/main.cc:360
+#: src/version_usage.cc:312
 #, c-format
 msgid "Report bugs to %s"
 msgstr "Faire part des bugs à %s"
 
-#: src/ConsoleDownloadEngine.cc:198
-#, c-format
-msgid ""
-"\n"
-"stopping application...\n"
-msgstr ""
-"\n"
-"arrêt de l'application en cours...\n"
+#~ msgid ""
+#~ " Specify files in multi-file torrent to download. Use in conjunction with "
+#~ "the\n"
+#~ " -T option. This argument is ignored if you specify the --select-file "
+#~ "option."
+#~ msgstr ""
+#~ " Spécifiez les fichiers du torrent multi-fichiers à télécharger. Utilisez "
+#~ "avec l'option\n"
+#~ " -T. Ces arguments sont ignorés si vous spécifiez l'option --select-file."
 
-#: src/ConsoleDownloadEngine.cc:202
-#, c-format
-msgid "done\n"
-msgstr "Terminé\n"
+#~ msgid ""
+#~ "\n"
+#~ "stopping application...\n"
+#~ msgstr ""
+#~ "\n"
+#~ "arrêt de l'application en cours...\n"
+
+#~ msgid "done\n"
+#~ msgstr "Terminé\n"
 
 #~ msgid ""
 #~ " --http-proxy=HOST:PORT       Use HTTP proxy server. This affects to all\n"

po/ja.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2c 0.2.1\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2007-09-03 20:34+0900\n"
-"PO-Revision-Date: 2007-09-03 20:36+0900\n"
+"POT-Creation-Date: 2007-10-29 21:34+0900\n"
+"PO-Revision-Date: 2007-10-28 18:52+0900\n"
 "Last-Translator: Tatsuhiro Tsujikawa <tujikawa@rednoah.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/OptionHandlerImpl.h:65
+msgid "must be either 'true' or 'false'."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:93
+#, c-format
+msgid "must be smaller than or equal to %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:96
+#, c-format
+msgid "must be between %s and %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:99
+#, c-format
+msgid "must be greater than or equal to %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:102 src/OptionHandlerImpl.h:148
+msgid "must be a number."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:139
+#, c-format
+msgid "must be smaller than or equal to %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:142
+#, c-format
+msgid "must be between %.1f and %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:145
+#, c-format
+msgid "must be greater than or equal to %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:195
+msgid "must be one of the following:"
+msgstr ""
+
+#: src/OptionHandlerImpl.h:223
+msgid "unrecognized proxy format"
+msgstr ""
+
 #: src/RequestInfo.h:54
 #, c-format
 msgid ""
@@ -839,16 +885,38 @@ msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 "ファイル長が不正です. %s のダウンロードを継続できません: local %s, remote %s"
 
-#: src/DownloadEngineFactory.cc:197
-#, c-format
+#: src/DownloadEngineFactory.cc:97
 msgid "Errors occurred while binding port.\n"
 msgstr "ポートをバインド中にエラーが発生しました.\n"
 
-#: src/main.cc:91
+#: src/MultiUrlRequestInfo.cc:70
+#, fuzzy
+msgid "aria2 will resume download if the transfer is restarted."
+msgstr ""
+"\n"
+"ダウンロードはエラーのため完了していません. ログを確認してください.\n"
+"次回のダウンロードはエラーの時点から再開できます."
+
+#: src/MultiUrlRequestInfo.cc:72
+msgid ""
+"If there are any errors, then see the log file. See '-l' option in help/man "
+"page for details."
+msgstr ""
+
+#: src/RequestGroupMan.cc:213
+#, fuzzy
+msgid "Download Results:"
+msgstr " torrent をダウンロード:"
+
+#: src/Util.cc:649
+msgid "Files:"
+msgstr ""
+
+#: src/version_usage.cc:40
 msgid " version "
 msgstr " バージョン "
 
-#: src/main.cc:101
+#: src/version_usage.cc:50
 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"
@@ -880,41 +948,41 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  "
 "USA\n"
 
-#: src/main.cc:115
+#: src/version_usage.cc:64
 msgid "Contact Info:"
 msgstr "連絡先:"
 
-#: src/main.cc:122
+#: src/version_usage.cc:71
 #, c-format
 msgid "Usage: %s [options] URL ...\n"
 msgstr "使い方: %s [オプション] URL ...\n"
 
-#: src/main.cc:124
-#, c-format
-msgid "       %s [options] -T TORRENT_FILE FILE ...\n"
+#: src/version_usage.cc:73
+#, fuzzy, c-format
+msgid "       %s [options] -T TORRENT_FILE URL ...\n"
 msgstr "        %s [オプション] -T TORRENT_FILE FILE ...\n"
 
-#: src/main.cc:127
+#: src/version_usage.cc:76
 #, c-format
 msgid "       %s [options] -M METALINK_FILE\n"
 msgstr "        %s [オプション] -M METALINK_FILE\n"
 
-#: src/main.cc:130
+#: src/version_usage.cc:79
 msgid "Options:"
 msgstr "オプション:"
 
-#: src/main.cc:131
+#: src/version_usage.cc:80
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
 msgstr ""
 " -d, --dir=DIR                ダウンロードしたファイルを保存するディレクトリ."
 
-#: src/main.cc:132
+#: src/version_usage.cc:81
 msgid " -o, --out=FILE               The file name of the downloaded file."
 msgstr ""
 " -o, --out=FILE               ダウンロードしたファイルの保存先ファイル名."
 
-#: src/main.cc:133
+#: src/version_usage.cc:82
 msgid ""
 " -l, --log=LOG                The file name of the log file. If '-' is\n"
 "                              specified, log is written to stdout."
@@ -923,11 +991,11 @@ msgstr ""
 "力\n"
 "                              に出力します."
 
-#: src/main.cc:136
+#: src/version_usage.cc:85
 msgid " -D, --daemon                 Run as daemon."
 msgstr " -D, --daemon                 デーモンとして起動します."
 
-#: src/main.cc:138
+#: src/version_usage.cc:87
 msgid ""
 " -s, --split=N                Download a file using N connections. N must "
 "be\n"
@@ -948,7 +1016,7 @@ msgstr ""
 "                              ンを確立します.\n"
 "                              デフォルト値: 1"
 
-#: src/main.cc:143
+#: src/version_usage.cc:92
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
@@ -961,13 +1029,13 @@ msgstr ""
 "                              す. 0 - 60 の値を指定してください.\n"
 "                              デフォルト値: 5"
 
-#: src/main.cc:146
+#: src/version_usage.cc:95
 msgid " -t, --timeout=SEC            Set timeout in seconds. Default: 60"
 msgstr ""
 " -t, --timeout=SEC            タイムアウトとなる時間を秒で指定します.\n"
 "                              デフォルト値: 60"
 
-#: src/main.cc:147
+#: src/version_usage.cc:96
 msgid ""
 " -m, --max-tries=N            Set number of tries. 0 means unlimited.\n"
 "                              Default: 5"
@@ -976,28 +1044,28 @@ msgstr ""
 "行\n"
 "                              します. デフォルト値: 5"
 
-#: src/main.cc:155
+#: src/version_usage.cc:104
 msgid ""
 " --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
 msgstr ""
 " --http-proxy=HOST:PORT       HTTP プロキシ・サーバーを使用します.\n"
 "                              このオプションはすべての URL に影響します."
 
-#: src/main.cc:156
+#: src/version_usage.cc:105
 msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 " --http-user=USER             HTTP での認証ユーザーを指定します. このオプショ"
 "ン\n"
 "                              はすべての URL に影響します."
 
-#: src/main.cc:157
+#: src/version_usage.cc:106
 msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 " --http-passwd=PASSWD         HTTP での認証パスワードを指定します. このオプ"
 "ショ\n"
 "                              ンはすべての URL に影響します."
 
-#: src/main.cc:158
+#: src/version_usage.cc:107
 msgid ""
 " --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
 msgstr ""
@@ -1007,7 +1075,7 @@ msgstr ""
 "ま\n"
 "                              す."
 
-#: src/main.cc:159
+#: src/version_usage.cc:108
 msgid ""
 " --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
 msgstr ""
@@ -1017,7 +1085,7 @@ msgstr ""
 "し\n"
 "                              ます."
 
-#: src/main.cc:160
+#: src/version_usage.cc:109
 msgid ""
 " --http-proxy-method=METHOD   Set the method to use in proxy request.\n"
 "                              METHOD is either 'get' or 'tunnel'.\n"
@@ -1028,7 +1096,7 @@ msgstr ""
 "                              す. 'get' または 'tunnel' を指定してください.\n"
 "                              デフォルト値: tunnel"
 
-#: src/main.cc:163
+#: src/version_usage.cc:112
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
@@ -1040,14 +1108,14 @@ msgstr ""
 "                              いるのは basic です. \n"
 "                              デフォルト値: basic"
 
-#: src/main.cc:166
+#: src/version_usage.cc:115
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 " --referer=REFERER            リファラーを指定します. このオプションはすべて"
 "の\n"
 "                               URL に影響します."
 
-#: src/main.cc:167
+#: src/version_usage.cc:116
 msgid ""
 " --ftp-user=USER              Set FTP user. This affects all URLs.\n"
 "                              Default: anonymous"
@@ -1057,7 +1125,7 @@ msgstr ""
 "                              はすべての URL に影響します.\n"
 "                              デフォルト値: anonymous"
 
-#: src/main.cc:169
+#: src/version_usage.cc:118
 msgid ""
 " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs.\n"
 "                              Default: ARIA2USER@"
@@ -1067,7 +1135,7 @@ msgstr ""
 "                              ンはすべての URL に影響します.\n"
 "                              デフォルト値: ARIA2USER@"
 
-#: src/main.cc:171
+#: src/version_usage.cc:120
 msgid ""
 " --ftp-type=TYPE              Set FTP transfer type. TYPE is either "
 "'binary'\n"
@@ -1078,11 +1146,11 @@ msgstr ""
 "                              'ascii' を指定してください. デフォルト値: "
 "binary"
 
-#: src/main.cc:174
+#: src/version_usage.cc:123
 msgid " -p, --ftp-pasv               Use passive mode in FTP."
 msgstr " -p, --ftp-pasv               FTP で passive モードを使用します."
 
-#: src/main.cc:175
+#: src/version_usage.cc:124
 msgid ""
 " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP. METHOD is either 'get' "
 "or\n"
@@ -1095,7 +1163,7 @@ msgstr ""
 "く\n"
 "                              ださい. デフォルト値: tunnel"
 
-#: src/main.cc:178
+#: src/version_usage.cc:127
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -1118,7 +1186,7 @@ msgstr ""
 "                              ードには影響しません.\n"
 "                              デフォルト値: 0"
 
-#: src/main.cc:185
+#: src/version_usage.cc:134
 msgid ""
 " --max-download-limit=SPEED   Set max download speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1133,7 +1201,7 @@ msgstr ""
 "1024K).\n"
 "                              デフォルト値: 0"
 
-#: src/main.cc:189
+#: src/version_usage.cc:138
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method. METHOD is "
 "either\n"
@@ -1144,7 +1212,7 @@ msgid ""
 "                              before download begins. This may take some "
 "time\n"
 "                              depending on the size of the file.\n"
-"                              Default: none"
+"                              Default: prealloc"
 msgstr ""
 " --file-allocation=METHOD     ファイル領域を確保する方法を指定します. 'none' "
 "又\n"
@@ -1156,9 +1224,27 @@ msgstr ""
 "                              す. この処理は, ファイルサイズによって時間がか"
 "か\n"
 "                              る場合があります.\n"
-"                              デフォルト値: none"
+"                              デフォルト値: prealloc"
 
-#: src/main.cc:195
+#: src/version_usage.cc:144
+msgid ""
+" --no-file-allocation-limit=SIZE No file allocation is made for files whose\n"
+"                              size is smaller than SIZE.\n"
+"                              You can append K or M(1K = 1024, 1M = 1024K).\n"
+"                              BitTorrent downloads ignore this option.\n"
+"                              Default: 5M"
+msgstr ""
+" --no-file-allocation-limit=SIZE 指定した SIZE 以下のファイルに対して, ファイ"
+"ル\n"
+"                              領域確保を行いません.\n"
+"                              K または M を付加することができます (1K = "
+"1024,\n"
+"                              1M = 1024K). このオプションは, BitTorrent ダウ"
+"ンロ\n"
+"                              ードには影響しません.\n"
+"                              デフォルト値: 5M"
+
+#: src/version_usage.cc:149
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -1175,7 +1261,7 @@ msgstr ""
 "                              中止します.\n"
 "                              デフォルト値: false"
 
-#: src/main.cc:199
+#: src/version_usage.cc:153
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -1199,7 +1285,7 @@ msgstr ""
 "                              うはずである.\n"
 "                              デフォルト値: false"
 
-#: src/main.cc:203
+#: src/version_usage.cc:157
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -1220,7 +1306,7 @@ msgstr ""
 "                             (1..9999) を付加する.\n"
 "                             デフォルト値: true"
 
-#: src/main.cc:209
+#: src/version_usage.cc:163
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -1253,7 +1339,20 @@ msgstr ""
 "                              ない場合は, -Z オプションが必要である.\n"
 "                              デフォルト値: false"
 
-#: src/main.cc:221
+#: src/version_usage.cc:174
+msgid ""
+" --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistant "
+"connection.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:176
+msgid ""
+" --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:179
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
 "hash.\n"
@@ -1280,7 +1379,7 @@ msgstr ""
 "                              かもしれません.\n"
 "                              デフォルト値: false"
 
-#: src/main.cc:229
+#: src/version_usage.cc:187
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -1296,7 +1395,7 @@ msgstr ""
 "                              Metalink でのみ使用できます.\n"
 "                              デフォルト値: true"
 
-#: src/main.cc:234
+#: src/version_usage.cc:192
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1315,15 +1414,15 @@ msgstr ""
 "用\n"
 "                              できます."
 
-#: src/main.cc:240
+#: src/version_usage.cc:198
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr " -U, --user-agent=USER_AGENT  ユーザーエージェントを設定します."
 
-#: src/main.cc:241
+#: src/version_usage.cc:199
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr " -n, --no-netrc               netrc サポートを止めます."
 
-#: src/main.cc:242
+#: src/version_usage.cc:200
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1343,7 +1442,7 @@ msgstr ""
 "ま\n"
 "                              す."
 
-#: src/main.cc:246
+#: src/version_usage.cc:204
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
 "downloads.\n"
@@ -1355,7 +1454,7 @@ msgstr ""
 "                              と共に使ってください.\n"
 "                              デフォルト値: 5"
 
-#: src/main.cc:249
+#: src/version_usage.cc:207
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
@@ -1365,7 +1464,7 @@ msgstr ""
 "                              トは, Netscape や Mozilla で使われているもので"
 "す."
 
-#: src/main.cc:252
+#: src/version_usage.cc:210
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -1374,7 +1473,7 @@ msgstr ""
 " -S, --show-files             .torrent/.metalink ファイルに含まれるファイル\n"
 "                              リストを出力し終了します."
 
-#: src/main.cc:254
+#: src/version_usage.cc:212
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -1402,11 +1501,11 @@ msgstr ""
 "よっ\n"
 "                              てインデックスは変化する場合があります."
 
-#: src/main.cc:264
+#: src/version_usage.cc:222
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr " -T, --torrent-file=TORRENT_FILE  .torrent ファイルのパスを指定."
 
-#: src/main.cc:265
+#: src/version_usage.cc:223
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
 "                              entering BitTorrent mode even if the filename "
@@ -1421,7 +1520,7 @@ msgstr ""
 "                              は, BitTorrent モードに入りません.\n"
 "                              デフォルト値: true"
 
-#: src/main.cc:269
+#: src/version_usage.cc:227
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1432,7 +1531,7 @@ msgstr ""
 "                              します.\n"
 "                              デフォルト値: true"
 
-#: src/main.cc:272
+#: src/version_usage.cc:230
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
 "                              Default: 6881-6999"
@@ -1440,7 +1539,7 @@ msgstr ""
 " --listen-port=PORT           ピアからの接続を受け付けるポート番号を指定.\n"
 "                              デフォルト値: 6881-6999"
 
-#: src/main.cc:274
+#: src/version_usage.cc:232
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
@@ -1455,7 +1554,7 @@ msgstr ""
 "1024K).\n"
 "                              デフォルト値: 0"
 
-#: src/main.cc:278
+#: src/version_usage.cc:236
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
@@ -1463,7 +1562,7 @@ msgstr ""
 " --seed-time=MINUTES          シードを行う時間を分単位で指定します. \n"
 "                              --seed-ratio オプションも参照してください."
 
-#: src/main.cc:280
+#: src/version_usage.cc:238
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -1481,7 +1580,7 @@ msgstr ""
 "く\n"
 "                              とも一方の条件が成立するとシードを終了します."
 
-#: src/main.cc:285
+#: src/version_usage.cc:243
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1505,11 +1604,11 @@ msgstr ""
 "す.\n"
 "                               デフォルト値: -aria2-"
 
-#: src/main.cc:294
+#: src/version_usage.cc:252
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr " -M, --metalink-file=METALINK_FILE .metalink ファイルのパスを指定."
 
-#: src/main.cc:295
+#: src/version_usage.cc:253
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
 "                              simultaneously.\n"
@@ -1518,15 +1617,15 @@ msgstr ""
 " -C, --metalink-servers=NUM_SERVERS 同時に接続するサーバの数を指定します.\n"
 "                              デフォルト値: 5"
 
-#: src/main.cc:298
+#: src/version_usage.cc:256
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   ダウンロードするファイルのバージョン."
 
-#: src/main.cc:299
+#: src/version_usage.cc:257
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE ダウンロードするファイルの言語."
 
-#: src/main.cc:300
+#: src/version_usage.cc:258
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
@@ -1534,11 +1633,11 @@ msgstr ""
 "レー\n"
 "                              ティング・システム."
 
-#: src/main.cc:301
+#: src/version_usage.cc:259
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr " --metalink-location=LOCATION 優先的にダウンロードするサーバーの場所."
 
-#: src/main.cc:302
+#: src/version_usage.cc:260
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
 "                              entering Metalink mode even if the filename "
@@ -1553,16 +1652,16 @@ msgstr ""
 "                              は, Metalink モードに入りません.\n"
 "                              デフォルト値: true"
 
-#: src/main.cc:307
+#: src/version_usage.cc:265
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                バージョン番号を表示し, 終了します."
 
-#: src/main.cc:308
+#: src/version_usage.cc:266
 msgid " -h, --help                   Print this message and exit."
 msgstr ""
 " -h, --help                   このヘルプメッセージを表示し, 終了します."
 
-#: src/main.cc:311
+#: src/version_usage.cc:269
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
 " or downloading will fail."
@@ -1571,96 +1670,92 @@ msgstr ""
 "れ\n"
 " ばなりません. さもなくばダウンロードは失敗します."
 
-#: src/main.cc:316
-msgid ""
-" Specify files in multi-file torrent to download. Use in conjunction with "
-"the\n"
-" -T option. This argument is ignored if you specify the --select-file option."
-msgstr ""
-" multi-file torrent のとき, ダウンロードするファイルを指定します. -T オプショ"
-"ン\n"
-" と共に使用します. --select-file オプションと併用はできません."
-
-#: src/main.cc:320
+#: src/version_usage.cc:272
 msgid "Examples:"
 msgstr "例:"
 
-#: src/main.cc:321
+#: src/version_usage.cc:273
 msgid " Download a file using 1 connection:"
 msgstr " 1 コネクションでのダウンロード:"
 
-#: src/main.cc:323
+#: src/version_usage.cc:275
 msgid " Download a file using 2 connections:"
 msgstr " 2 コネクションでのダウンロード:"
 
-#: src/main.cc:325
+#: src/version_usage.cc:277
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
 msgstr " 二つの異なるサーバーに接続してダウンロード:"
 
-#: src/main.cc:327
+#: src/version_usage.cc:279
 msgid " You can mix up different protocols:"
 msgstr " 異なるプロトコルを混合させてダウンロード:"
 
-#: src/main.cc:329
+#: src/version_usage.cc:281
 msgid " Parameterized URI:"
 msgstr " パラメータ化された URI:"
 
-#: src/main.cc:331
+#: src/version_usage.cc:283
 msgid " Parameterized URI. -Z option is required in this case:"
 msgstr " パラメータ化された URI. この場合, -Z オプションが必要:"
 
-#: src/main.cc:335
+#: src/version_usage.cc:287
 msgid " Download a torrent:"
 msgstr " torrent をダウンロード:"
 
-#: src/main.cc:337
+#: src/version_usage.cc:289
 msgid " Download a torrent using a local .torrent file:"
 msgstr " ローカル .torrent ファイルを使ってダウンロード:"
 
-#: src/main.cc:339 src/main.cc:352
+#: src/version_usage.cc:291 src/version_usage.cc:304
 msgid " Download only selected files:"
 msgstr " ファイルを指定してダウンロード:"
 
-#: src/main.cc:341
+#: src/version_usage.cc:293
 msgid " Print file listing of .torrent file:"
 msgstr " この .torrent ファイルに含まれるファイルリストを表示:"
 
-#: src/main.cc:346
+#: src/version_usage.cc:298
 msgid " Metalink downloading:"
 msgstr " Metalink でダウンロード:"
 
-#: src/main.cc:348
+#: src/version_usage.cc:300
 msgid " Download a file using local .metalink file:"
 msgstr " ローカル .metalink ファイルを使ってダウンロード:"
 
-#: src/main.cc:350
+#: src/version_usage.cc:302
 msgid " Metalink downloading with preferences:"
 msgstr " ユーザ設定による Metalink ダウンロード:"
 
-#: src/main.cc:354
+#: src/version_usage.cc:306
 msgid " Download only selected files using index:"
 msgstr " ファイルのインデックスを指定してダウンロード:"
 
-#: src/main.cc:356
+#: src/version_usage.cc:308
 msgid " Print file listing of .metalink file:"
 msgstr " この .metalink ファイルに含まれるファイルリストを表示:"
 
-#: src/main.cc:360
+#: src/version_usage.cc:312
 #, c-format
 msgid "Report bugs to %s"
 msgstr "バグレポートはこちらへ: %s"
 
-#: src/ConsoleDownloadEngine.cc:198
-#, c-format
-msgid ""
-"\n"
-"stopping application...\n"
-msgstr ""
-"\n"
-"アプリケーションを終了しています...\n"
-
-#: src/ConsoleDownloadEngine.cc:202
-#, c-format
-msgid "done\n"
-msgstr "完了\n"
+#~ msgid ""
+#~ " Specify files in multi-file torrent to download. Use in conjunction with "
+#~ "the\n"
+#~ " -T option. This argument is ignored if you specify the --select-file "
+#~ "option."
+#~ msgstr ""
+#~ " multi-file torrent のとき, ダウンロードするファイルを指定します. -T オプ"
+#~ "ション\n"
+#~ " と共に使用します. --select-file オプションと併用はできません."
+
+#~ msgid ""
+#~ "\n"
+#~ "stopping application...\n"
+#~ msgstr ""
+#~ "\n"
+#~ "アプリケーションを終了しています...\n"
+
+#~ msgid "done\n"
+#~ msgstr "完了\n"

po/nl.po

@@ -0,0 +1,1474 @@
+# Dutch translation for aria2
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the aria2 package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: aria2\n"
+"Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
+"POT-Creation-Date: 2007-10-29 21:34+0900\n"
+"PO-Revision-Date: 2007-09-23 15:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2007-10-20 15:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/OptionHandlerImpl.h:65
+msgid "must be either 'true' or 'false'."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:93
+#, c-format
+msgid "must be smaller than or equal to %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:96
+#, c-format
+msgid "must be between %s and %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:99
+#, c-format
+msgid "must be greater than or equal to %s."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:102 src/OptionHandlerImpl.h:148
+msgid "must be a number."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:139
+#, c-format
+msgid "must be smaller than or equal to %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:142
+#, c-format
+msgid "must be between %.1f and %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:145
+#, c-format
+msgid "must be greater than or equal to %.1f."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:195
+msgid "must be one of the following:"
+msgstr ""
+
+#: src/OptionHandlerImpl.h:223
+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."
+msgstr "CUID#%d - Het downloaden van een segment is voltooid."
+
+#: src/message.h:41
+#, c-format
+msgid "CUID#%d - No segment available."
+msgstr "CUID#%d - Geen segment beschikbaar."
+
+#: src/message.h:42
+#, c-format
+msgid "CUID#%d - Connecting to %s:%d"
+msgstr "CUID#%d - Verbinden met %s:%d"
+
+#: src/message.h:43
+#, c-format
+msgid ""
+"CUID#%d - The segment changed. We send the request again with new Range "
+"header."
+msgstr ""
+"CUID#%d - Het segment is verandert. We vragen het opnieuw met een nieuwe "
+"Range header."
+
+#: src/message.h:44
+#, c-format
+msgid "CUID#%d - Redirecting to %s"
+msgstr "CUID#%d - Doorverwijzing naar %s"
+
+#: src/message.h:45
+#, c-format
+msgid ""
+"CUID#%d - Requesting:\n"
+"%s"
+msgstr ""
+"CUID#%d - Verzoekt:\n"
+"%s"
+
+#: src/message.h:46
+#, c-format
+msgid ""
+"CUID#%d - Response received:\n"
+"%s"
+msgstr ""
+"CUID#%d - Antwoord ontvangen:\n"
+"%s"
+
+#: src/message.h:47
+#, c-format
+msgid "CUID#%d - Download aborted. URI=%s"
+msgstr "CUID#%d - Download afgelast. URI=%s"
+
+#: src/message.h:48
+#, c-format
+msgid "CUID#%d - Restarting the download. URI=%s"
+msgstr "CUID#%d - Herstart de download. URI=%s"
+
+#: src/message.h:49
+#, c-format
+msgid "CUID#%d - Download aborted."
+msgstr "CUID#%d - Download afgelast."
+
+#: src/message.h:50
+#, c-format
+msgid "CUID#%d - %d times attempted, but no success. Download aborted."
+msgstr "CUID#%d - %d maal geprobeerd, zonder success. Download afgelast."
+
+#: src/message.h:51
+#, c-format
+msgid "CUID#%d - Unregistering cuid from segmentManager."
+msgstr "CUID#%d - cuid uit registratie van segmentManager gehaald."
+
+#: src/message.h:57
+#, c-format
+msgid "CUID#%d - we got new piece. index=%d"
+msgstr "CUID#%d - nieuw stuk ontvangen. index=%d"
+
+#: src/message.h:58
+#, c-format
+msgid "CUID#%d - we got wrong piece. index=%d"
+msgstr "CUID#%d - verkeerde stuk ontvangen. index=%d"
+
+#: src/message.h:59
+#, c-format
+msgid "CUID#%d - Download not complete: %s"
+msgstr "CUID#%d - Download afgerond: %s"
+
+#: src/message.h:60
+#, c-format
+msgid "CUID#%d - Download has already completed: %s"
+msgstr "CUID#%d - Download is al afgerond: %s"
+
+#: src/message.h:61
+#, c-format
+msgid "CUID#%d - Good checksum: %s"
+msgstr "CUID#%d - Correcte checksum: %s"
+
+#: src/message.h:62
+#, c-format
+msgid "CUID#%d - Bad checksum: %s"
+msgstr "CUID#%d - Foutieve checksum: %s"
+
+#: src/message.h:63
+#, c-format
+msgid "CUID#%d - Resolving hostname %s"
+msgstr "CUID#%d - Opzoeken van hostname %s"
+
+#: src/message.h:64
+#, c-format
+msgid "CUID#%d - Name resolution complete: %s -> %s"
+msgstr "CUID#%d - Name resolution compleet: %s -> %s"
+
+#: src/message.h:65
+#, c-format
+msgid "CUID#%d - Name resolution for %s failed:%s"
+msgstr "CUID#%d - Name resolution for %s mislukt:%s"
+
+#: src/message.h:66
+#, c-format
+msgid "CUID#%d - DNS cache hit: %s -> %s"
+msgstr "CUID#%d - DNS cache gevonden: %s -> %s"
+
+#: src/message.h:67
+#, c-format
+msgid "CUID#%d - Abort requested."
+msgstr "CUID#%d - Aflasting gevraagd."
+
+#: src/message.h:68
+#, c-format
+msgid "CUID#%d - Connecting to the peer %s"
+msgstr "CUID#%d - Maak een connectie met peer %s"
+
+#: src/message.h:69
+#, c-format
+msgid ""
+"CUID#%d - Piece received. index=%d, begin=%d, length=%d, offset=%llu, "
+"blockIndex=%d"
+msgstr ""
+"CUID#%d - Stuk ontvangen. index=%d, begin=%d, length=%d, offset=%llu, "
+"blockIndex=%d"
+
+#: src/message.h:70
+#, c-format
+msgid "CUID#%d - Piece bitfield %s"
+msgstr "CUID#%d - Bitfield van stuk %s"
+
+#: src/message.h:71
+#, c-format
+msgid ""
+"CUID#%d - Reject piece message in queue because the peer has been choked. "
+"index=%d, begin=%d, length=%d"
+msgstr ""
+
+#: src/message.h:72
+#, c-format
+msgid ""
+"CUID#%d - Reject piece message in queue because cancel message received. "
+"index=%d, begin=%d, length=%d"
+msgstr ""
+
+#: src/message.h:73
+#, c-format
+msgid "CUID#%d - Exception caught while validating file integrity."
+msgstr ""
+"CUID#%d - Uitzondering opgetreden tijdens het controleren van de bestands "
+"integriteit."
+
+#: src/message.h:74
+#, c-format
+msgid "CUID#%d - Interested in the peer"
+msgstr "CUID#%d - Geïntereseerd in de peer"
+
+#: src/message.h:75
+#, c-format
+msgid "CUID#%d - Not interested in the peer"
+msgstr "CUID#%d - Niet geïntereseerd in de peer"
+
+#: src/message.h:76
+#, c-format
+msgid "CUID#%d - Deleting request slot index=%d, blockIndex=%d"
+msgstr ""
+
+#: src/message.h:77
+#, c-format
+msgid ""
+"CUID#%d - Deleting request slot index=%d, blockIndex=%d because localhost "
+"got choked."
+msgstr ""
+
+#: src/message.h:78
+#, c-format
+msgid "CUID#%d - Deleting request slot blockIndex=%d because of time out"
+msgstr ""
+
+#: src/message.h:79
+#, c-format
+msgid ""
+"CUID#%d - Deleting request slot blockIndex=%d because the block has been "
+"acquired."
+msgstr ""
+
+#: src/message.h:80
+#, fuzzy, c-format
+msgid "CUID#%d - Fast extension enabled."
+msgstr "CUID#%d - Fast extension ingeschakeld."
+
+#: src/message.h:81
+#, c-format
+msgid "CUID#%d - Exception caught while allocating file space."
+msgstr ""
+"CUID#%d - Uitzondering ontvangen tijdens het alloceren van bestands ruimte."
+
+#: src/message.h:82
+#, c-format
+msgid "CUID#%d - Content-Disposition detected. Use %s as filename"
+msgstr ""
+
+#: src/message.h:83
+#, c-format
+msgid "CUID#%d - Peer %s:%d banned."
+msgstr "CUID#%d - Peer %s:%d verbannen."
+
+#: src/message.h:84
+#, c-format
+msgid "CUID#%d - Using port %d for accepting new connections"
+msgstr ""
+
+#: src/message.h:85
+#, c-format
+msgid "CUID#%d - An error occurred while binding port=%d"
+msgstr ""
+
+#: src/message.h:86
+#, c-format
+msgid "CUID#%d - Incoming connection, adding new command CUID#%d"
+msgstr ""
+
+#: src/message.h:87
+#, c-format
+msgid "CUID#%d - Error in accepting connection"
+msgstr "CUID#%d - Fout in het accepteren van de connectie"
+
+#: src/message.h:88
+#, c-format
+msgid "CUID#%d - Error occurred while processing tracker response."
+msgstr ""
+"CUID#%d - Er is een fout opgetreden bij het afhandelen van het antwoord van "
+"de tracker."
+
+#: src/message.h:89
+#, c-format
+msgid "CUID#%d - Cannot create tracker request."
+msgstr "CUID#%d - Kan tracker request niet maken."
+
+#: src/message.h:90
+#, c-format
+msgid "CUID#%d - Creating new tracker request command #%d"
+msgstr "CUID#%d - Nieuw tracker request gemaakt met opdracht #%d"
+
+#: src/message.h:92
+#, c-format
+msgid "Unrecognized URI or unsupported protocol: %s"
+msgstr "Onherkende URI of niet ondersteund protocol: %s"
+
+#: src/message.h:93
+#, c-format
+msgid "Tracker returned warning message: %s"
+msgstr "Tracker retourneerde waarschuwings bericht: %s"
+
+#: src/message.h:94
+#, c-format
+msgid "The segment file %s exists."
+msgstr "Het segmentsbestand %s bestaat."
+
+#: src/message.h:95
+#, c-format
+msgid "The segment file %s does not exist."
+msgstr "Het segmentsbestand %s bestaat niet."
+
+#: src/message.h:96
+#, c-format
+msgid "Saving the segment file %s"
+msgstr "Bezig met het opslaan van egmentsbestand %s"
+
+#: src/message.h:97
+msgid "The segment file was saved successfully."
+msgstr "Het segmentsbestand is succesvol opgeslagen"
+
+#: src/message.h:98
+#, c-format
+msgid "Loading the segment file %s."
+msgstr "Bezig met het laden van segmentsbestand %s"
+
+#: src/message.h:99
+msgid "The segment file was loaded successfully."
+msgstr "Segmentsbestand was succesvol geladen"
+
+#: src/message.h:100
+msgid "No URI to download. Download aborted."
+msgstr "Geen URI om te downloaden. Download afgelast."
+
+#: src/message.h:101
+#, c-format
+msgid ""
+"File %s exists, but %s does not exist. The download was canceled in order to "
+"prevent your file from being truncated to 0. If you are sure to download "
+"file all over again, then delete it or add --allow-overwrite=true option and "
+"restart aria2."
+msgstr ""
+"Bestand %s bestaat, maar %s bestaat niet. De download is afgelast om te "
+"voorkomen dat het bestand word afgekapt tot 0. Als u zeker weet dat u het "
+"bestand helemaal overnieuw wilt downloaden, gooi het bestand dan weg of voeg "
+"--allow-overwrite=true toe aan de opties en herstart aria2."
+
+#: src/message.h:102
+#, c-format
+msgid "Allocating file %s, %s bytes"
+msgstr "Alloceer file %s, %s bytes"
+
+#: src/message.h:103
+msgid "File not found"
+msgstr "Bestand niet gevonden"
+
+#: src/message.h:104
+msgid "Not a directory"
+msgstr "Niet een map"
+
+#: src/message.h:105
+#, c-format
+msgid "Insufficient checksums. checksumLength=%d, numChecksum=%d"
+msgstr "Onvoldoende checksums. checksumLength=%d, numChecksum=%d"
+
+#: src/message.h:106
+#, c-format
+msgid "Writing file %s"
+msgstr "Bezig met het schrijven naar bestand %s"
+
+#: src/message.h:107
+msgid "No peer list received."
+msgstr "Geen peer lijst ontvangen."
+
+#: src/message.h:108
+#, c-format
+msgid "Adding peer %s:%d"
+msgstr "Toevoegen van peer %s:%d"
+
+#: src/message.h:109
+#, c-format
+msgid "Deleting used piece index=%d, fillRate(%%)=%d<=%d"
+msgstr "Verwijderen gebruikt stuk index=%d, fillRate(%%)=%d<=%d"
+
+#: src/message.h:110
+msgid "Download of selected files was complete."
+msgstr "Het downloaden van de geselecteerde bestanden is voltooid."
+
+#: src/message.h:111
+msgid "The download was complete."
+msgstr "De download was compleet."
+
+#: src/message.h:112
+#, c-format
+msgid "Removed %d have entries."
+msgstr "Verwijderde %d have entries."
+
+#: src/message.h:113
+#, c-format
+msgid "Validating file %s"
+msgstr "Valideren van bestand %s"
+
+#: src/message.h:114
+#, c-format
+msgid "%d seconds to allocate %s byte(s)"
+msgstr "%d seconden om %s byte(s) te alloceren"
+
+#: src/message.h:115
+#, c-format
+msgid "Dispatching FileAllocationCommand for CUID#%d."
+msgstr ""
+
+#: src/message.h:116
+#, c-format
+msgid "Metalink: Queueing %s for download."
+msgstr "Metalink: Plaats %s voor downloaden in de wachtrij."
+
+#: src/message.h:117
+#, c-format
+msgid "Download complete: %s"
+msgstr "Download afgerond: %s"
+
+#: src/message.h:118
+msgid "Seeding is over."
+msgstr ""
+
+#: src/message.h:119
+#, c-format
+msgid "CUID#%d cancels segment index=%d. CUID#%d handles it instead."
+msgstr ""
+
+#: src/message.h:120
+msgid "No chunk to verify."
+msgstr "Geen stuk om te verifieren"
+
+#: src/message.h:121
+#, c-format
+msgid "Good chunk checksum. hash=%s"
+msgstr "Correcte stuk checksum. hash=%s"
+
+#: src/message.h:122
+#, c-format
+msgid "Failed to load cookies from %s"
+msgstr "Kon geen cookies laden van %s"
+
+#: src/message.h:123
+#, c-format
+msgid ""
+".netrc file %s does not have correct permissions. It should be 600. netrc "
+"support disabled."
+msgstr ""
+".netrc bestand %s heeft niet de correcte permissies. Het zou 600 moeten "
+"zijn. netrc ondersteuning uigeschakeld."
+
+#: src/message.h:124
+#, fuzzy
+msgid "Logging started."
+msgstr "Logging gestart."
+
+#: src/message.h:125
+msgid "Specify at least one URL."
+msgstr "Specificeer minimaal één URL."
+
+#: src/message.h:126
+msgid "daemon failed."
+msgstr ""
+
+#: src/message.h:128
+msgid "Timeout."
+msgstr "Time-out."
+
+#: src/message.h:129
+msgid "Invalid chunk size."
+msgstr "Ongeldige chunk grootte."
+
+#: src/message.h:130
+#, c-format
+msgid "Too large chunk. size=%d"
+msgstr "Te groot stuk. grootte=%d"
+
+#: src/message.h:131
+msgid "Invalid header."
+msgstr "Ongeldige header."
+
+#: src/message.h:132
+msgid "Invalid response."
+msgstr "Ongeldige respons."
+
+#: src/message.h:133
+msgid "No header found."
+msgstr "Geen header gevonden"
+
+#: src/message.h:134
+msgid "No status header."
+msgstr "Geen status header"
+
+#: src/message.h:135
+msgid "Proxy connection failed."
+msgstr "Proxy connectie mislukt."
+
+#: src/message.h:136
+msgid "Connection failed."
+msgstr "Verbinding mislukt"
+
+#: src/message.h:137
+#, c-format
+msgid ""
+"The requested filename and the previously registered one are not same. "
+"Expected:%s Actual:%s"
+msgstr ""
+
+#: src/message.h:138
+#, c-format
+msgid "The response status is not successful. status=%d"
+msgstr ""
+
+#: src/message.h:139
+#, c-format
+msgid "Too large file size. size=%s"
+msgstr "Te groot bestand. grootte=%s"
+
+#: src/message.h:140
+#, c-format
+msgid "Transfer encoding %s is not supported."
+msgstr ""
+
+#: src/message.h:141
+#, c-format
+msgid "SSL initialization failed: %s"
+msgstr "SSL initialisatie mislukt: %s"
+
+#: src/message.h:142
+msgid "SSL I/O error"
+msgstr "SSL I/O fout"
+
+#: src/message.h:143
+msgid "SSL protocol error"
+msgstr "SSL protocol fout"
+
+#: src/message.h:144
+#, c-format
+msgid "SSL unknown error %d"
+msgstr "Onbekende SSL fout %d"
+
+#: src/message.h:145
+#, c-format
+msgid "SSL initialization failed: OpenSSL connect error %d"
+msgstr ""
+
+#: src/message.h:146
+#, c-format
+msgid "Size mismatch Expected:%s Actual:%s"
+msgstr ""
+
+#: src/message.h:147
+msgid "Authorization failed."
+msgstr "Autorisatie mislukt."
+
+#: src/message.h:148
+msgid "Got EOF from the server."
+msgstr "Ontving EOF van de server."
+
+#: src/message.h:149
+msgid "Got EOF from peer."
+msgstr ""
+
+#: src/message.h:150
+msgid "Malformed meta info."
+msgstr "Verkeerd geformuleerde meta informatie."
+
+#: src/message.h:152
+#, c-format
+msgid "Failed to open the file %s, cause: %s"
+msgstr "Kon bestand %s niet openen, oorzaak: %s"
+
+#: src/message.h:153
+#, c-format
+msgid "Failed to write into the file %s, cause: %s"
+msgstr "Kon in bestand %s niet schrijven, oorzaak: %s"
+
+#: src/message.h:154
+#, c-format
+msgid "Failed to read from the file %s, cause: %s"
+msgstr "Kon niet lezen uit bestand %s, reden: %s"
+
+#: src/message.h:155
+msgid "Failed to read data from disk."
+msgstr "Kon geen data van de hardeschijf lezen."
+
+#: src/message.h:156
+#, c-format
+msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
+msgstr ""
+"Kon geen SHA1 checksum berekenen van het bestand %s of een deel hiervan, "
+"reden: %s"
+
+#: src/message.h:157
+#, c-format
+msgid "Failed to seek the file %s, cause: %s"
+msgstr ""
+
+#: src/message.h:158
+#, c-format
+msgid "The offset is out of range, offset=%s"
+msgstr ""
+
+#: src/message.h:159
+#, c-format
+msgid "%s is not a directory."
+msgstr "%s is geen map."
+
+#: src/message.h:160
+#, c-format
+msgid "Failed to make the directory %s, cause: %s"
+msgstr ""
+
+#: src/message.h:161
+#, c-format
+msgid "Failed to open the segment file %s, cause: %s"
+msgstr ""
+
+#: src/message.h:162
+#, c-format
+msgid "Failed to write into the segment file %s, cause: %s"
+msgstr ""
+
+#: src/message.h:163
+#, c-format
+msgid "Failed to read from the segment file %s, cause: %s"
+msgstr ""
+
+#: src/message.h:165
+#, c-format
+msgid "Failed to open a socket, cause: %s"
+msgstr "Kon socket niet openen, oorzaak: %s"
+
+#: src/message.h:166
+#, c-format
+msgid "Failed to set a socket option, cause: %s"
+msgstr ""
+
+#: src/message.h:167
+#, c-format
+msgid "Failed to set a socket as blocking, cause: %s"
+msgstr ""
+
+#: src/message.h:168
+#, c-format
+msgid "Failed to set a socket as non-blocking, cause: %s"
+msgstr ""
+
+#: src/message.h:169
+#, c-format
+msgid "Failed to bind a socket, cause: %s"
+msgstr ""
+
+#: src/message.h:170
+#, c-format
+msgid "Failed to listen to a socket, cause: %s"
+msgstr "Kon niet luisteren op socket, oorzaak: %s"
+
+#: src/message.h:171
+#, c-format
+msgid "Failed to accept a peer connection, cause: %s"
+msgstr ""
+
+#: src/message.h:172
+#, c-format
+msgid "Failed to get the name of socket, cause: %s"
+msgstr ""
+
+#: src/message.h:173
+#, c-format
+msgid "Failed to get the name of connected peer, cause: %s"
+msgstr ""
+
+#: src/message.h:174
+#, c-format
+msgid "Failed to resolve the hostname %s, cause: %s"
+msgstr ""
+
+#: src/message.h:175
+#, c-format
+msgid "Failed to connect to the host %s, cause: %s"
+msgstr ""
+
+#: src/message.h:176
+#, c-format
+msgid "Failed to check whether the socket is writable, cause: %s"
+msgstr ""
+
+#: src/message.h:177
+#, c-format
+msgid "Failed to check whether the socket is readable, cause: %s"
+msgstr ""
+
+#: src/message.h:178
+#, c-format
+msgid "Failed to send data, cause: %s"
+msgstr ""
+
+#: src/message.h:179
+#, c-format
+msgid "Failed to receive data, cause: %s"
+msgstr ""
+
+#: src/message.h:180
+#, c-format
+msgid "Failed to peek data, cause: %s"
+msgstr ""
+
+#: src/message.h:181
+#, c-format
+msgid "Unknown socket error %d (0x%x)"
+msgstr ""
+
+#: src/message.h:182
+#, c-format
+msgid "File %s exists, but %s does not exist."
+msgstr ""
+
+#: src/message.h:183
+#, c-format
+msgid "Invalid payload size for %s, size=%d. It should be %d."
+msgstr ""
+
+#: src/message.h:184
+#, c-format
+msgid "Invalid ID=%d for %s. It should be %d."
+msgstr ""
+
+#: src/message.h:185
+#, c-format
+msgid ""
+"Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
+"s, actualHash=%s"
+msgstr ""
+
+#: src/message.h:186
+msgid "Download aborted."
+msgstr "Download afgebroken."
+
+#: src/message.h:187
+#, c-format
+msgid "File %s is being downloaded by other command."
+msgstr ""
+
+#: src/message.h:188
+msgid "Insufficient checksums."
+msgstr ""
+
+#: src/message.h:189
+#, c-format
+msgid "Tracker returned failure reason: %s"
+msgstr ""
+
+#: src/message.h:190
+msgid "Flooding detected."
+msgstr ""
+
+#: src/message.h:191
+#, c-format
+msgid ""
+"Drop connection because no request/piece messages were exchanged in a "
+"certain period(%d seconds)."
+msgstr ""
+
+#: src/message.h:192
+msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
+msgstr ""
+
+#: src/message.h:193
+#, c-format
+msgid "No such file entry %s"
+msgstr ""
+
+#: src/message.h:194
+#, c-format
+msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
+msgstr ""
+
+#: src/message.h:195
+msgid "No HttpRequestEntry found."
+msgstr ""
+
+#: src/message.h:196
+#, c-format
+msgid "Got %d status, but no location header provided."
+msgstr ""
+
+#: src/message.h:197
+#, c-format
+msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
+msgstr ""
+
+#: src/message.h:198
+msgid "No file matched with your preference."
+msgstr ""
+
+#: src/message.h:199
+msgid "Exception caught"
+msgstr ""
+
+#: src/message.h:200
+#, c-format
+msgid "Max payload length exceeded or invalid. length = %d"
+msgstr ""
+
+#: src/message.h:201
+#, c-format
+msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
+msgstr ""
+
+#: src/DownloadEngineFactory.cc:97
+msgid "Errors occurred while binding port.\n"
+msgstr ""
+
+#: src/MultiUrlRequestInfo.cc:70
+#, fuzzy
+msgid "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/MultiUrlRequestInfo.cc:72
+msgid ""
+"If there are any errors, then see the log file. See '-l' option in help/man "
+"page for details."
+msgstr ""
+
+#: src/RequestGroupMan.cc:213
+#, fuzzy
+msgid "Download Results:"
+msgstr " Download een torrent:"
+
+#: src/Util.cc:649
+msgid "Files:"
+msgstr ""
+
+#: src/version_usage.cc:40
+msgid " version "
+msgstr ""
+
+#: src/version_usage.cc:50
+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"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\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"
+msgstr ""
+"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"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\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"
+
+#: src/version_usage.cc:64
+msgid "Contact Info:"
+msgstr "Contact informatie:"
+
+#: src/version_usage.cc:71
+#, c-format
+msgid "Usage: %s [options] URL ...\n"
+msgstr "Gebruik: %s [opties] URL ...\n"
+
+#: src/version_usage.cc:73
+#, fuzzy, c-format
+msgid "       %s [options] -T TORRENT_FILE URL ...\n"
+msgstr "       %s [opties] -T TORRENT_BESTAND BESTAND ...\n"
+
+#: src/version_usage.cc:76
+#, c-format
+msgid "       %s [options] -M METALINK_FILE\n"
+msgstr "       %s [opties] -M METALINK_BESTAND\n"
+
+#: src/version_usage.cc:79
+msgid "Options:"
+msgstr "Opties:"
+
+#: src/version_usage.cc:80
+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:81
+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:82
+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:85
+msgid " -D, --daemon                 Run as daemon."
+msgstr ""
+
+#: src/version_usage.cc:87
+msgid ""
+" -s, --split=N                Download a file using N connections. N must "
+"be\n"
+"                              between 1 and 5. This option affects all "
+"URLs.\n"
+"                              Thus, aria2 connects to each URL with\n"
+"                              N connections.\n"
+"                              Default: 1"
+msgstr ""
+
+#: src/version_usage.cc:92
+msgid ""
+" --retry-wait=SEC             Set the seconds to wait to retry after an "
+"error\n"
+"                              has occured. Specify a value between 0 and "
+"60.\n"
+"                              Default: 5"
+msgstr ""
+
+#: src/version_usage.cc:95
+msgid " -t, --timeout=SEC            Set timeout in seconds. Default: 60"
+msgstr ""
+
+#: src/version_usage.cc:96
+msgid ""
+" -m, --max-tries=N            Set number of tries. 0 means unlimited.\n"
+"                              Default: 5"
+msgstr ""
+
+#: src/version_usage.cc:104
+msgid ""
+" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+msgstr ""
+
+#: src/version_usage.cc:105
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+msgstr ""
+
+#: src/version_usage.cc:106
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+msgstr ""
+
+#: src/version_usage.cc:107
+msgid ""
+" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+msgstr ""
+
+#: src/version_usage.cc:108
+msgid ""
+" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+msgstr ""
+
+#: src/version_usage.cc:109
+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:112
+msgid ""
+" --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
+"basic\n"
+"                              is the only supported scheme.\n"
+"                              Default: basic"
+msgstr ""
+
+#: src/version_usage.cc:115
+msgid " --referer=REFERER            Set Referer. This affects all URLs."
+msgstr ""
+
+#: src/version_usage.cc:116
+msgid ""
+" --ftp-user=USER              Set FTP user. This affects all URLs.\n"
+"                              Default: anonymous"
+msgstr ""
+
+#: src/version_usage.cc:118
+msgid ""
+" --ftp-passwd=PASSWD          Set FTP password. This affects all URLs.\n"
+"                              Default: ARIA2USER@"
+msgstr ""
+
+#: src/version_usage.cc:120
+msgid ""
+" --ftp-type=TYPE              Set FTP transfer type. TYPE is either "
+"'binary'\n"
+"                              or 'ascii'.\n"
+"                              Default: binary"
+msgstr ""
+
+#: src/version_usage.cc:123
+msgid " -p, --ftp-pasv               Use passive mode in FTP."
+msgstr " -p, --ftp-pasv Gebruik passive mode bij FTP."
+
+#: src/version_usage.cc:124
+msgid ""
+" --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP. METHOD is either 'get' "
+"or\n"
+"                              'tunnel'.\n"
+"                              Default: tunnel"
+msgstr ""
+
+#: src/version_usage.cc:127
+msgid ""
+" --lowest-speed-limit=SPEED   Close connection if download speed is lower "
+"than\n"
+"                              or equal to this value(bytes per sec).\n"
+"                              0 means aria2 does not have a lowest speed "
+"limit.\n"
+"                              You can append K or M(1K = 1024, 1M = 1024K).\n"
+"                              This option does not affect BitTorrent "
+"downloads.\n"
+"                              Default: 0"
+msgstr ""
+
+#: src/version_usage.cc:134
+msgid ""
+" --max-download-limit=SPEED   Set max download speed in bytes per sec.\n"
+"                              0 means unrestricted.\n"
+"                              You can append K or M(1K = 1024, 1M = 1024K).\n"
+"                              Default: 0"
+msgstr ""
+
+#: src/version_usage.cc:138
+msgid ""
+" --file-allocation=METHOD     Specify file allocation method. METHOD is "
+"either\n"
+"                              'none' or 'prealloc'. 'none' doesn't pre-"
+"allocate\n"
+"                              file space. 'prealloc' pre-allocates file "
+"space\n"
+"                              before download begins. This may take some "
+"time\n"
+"                              depending on the size of the file.\n"
+"                              Default: prealloc"
+msgstr ""
+
+#: src/version_usage.cc:144
+msgid ""
+" --no-file-allocation-limit=SIZE No file allocation is made for files whose\n"
+"                              size is smaller than SIZE.\n"
+"                              You can append K or M(1K = 1024, 1M = 1024K).\n"
+"                              BitTorrent downloads ignore this option.\n"
+"                              Default: 5M"
+msgstr ""
+
+#: src/version_usage.cc:149
+msgid ""
+" --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
+"                              already exists but the corresponding .aria2 "
+"file\n"
+"                              doesn't exist.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:153
+msgid ""
+" -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
+"sequentially\n"
+"                              and download each URI in a separate session, "
+"like\n"
+"                              the usual command-line download utilities.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:157
+msgid ""
+" --auto-file-renaming[=true|false] Rename file name if the same file "
+"already\n"
+"                              exists. This option works only in http(s)/ftp\n"
+"                              download.\n"
+"                              The new file name has a dot and a number"
+"(1..9999)\n"
+"                              appended.\n"
+"                              Default: true"
+msgstr ""
+
+#: src/version_usage.cc:163
+msgid ""
+" -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
+"                              You can specify set of parts:\n"
+"                              http://{sv1,sv2,sv3}/foo.iso\n"
+"                              Also you can specify numeric sequences with "
+"step\n"
+"                              counter:\n"
+"                              http://host/image[000-100:2].img\n"
+"                              A step counter can be omitted.\n"
+"                              If all URIs do not point to the same file, "
+"such\n"
+"                              as the second example above, -Z option is\n"
+"                              required.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:174
+msgid ""
+" --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistant "
+"connection.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:176
+msgid ""
+" --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:179
+msgid ""
+" --check-integrity=true|false  Check file integrity by validating piece "
+"hash.\n"
+"                              This option only affects in BitTorrent "
+"downloads\n"
+"                              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"
+msgstr ""
+
+#: src/version_usage.cc:187
+msgid ""
+" --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
+"                              downloading a file in Metalink mode. This "
+"option\n"
+"                              on affects Metalink mode with chunk "
+"checksums.\n"
+"                              Default: true"
+msgstr ""
+
+#: src/version_usage.cc:192
+msgid ""
+" -c, --continue               Continue downloading a partially downloaded\n"
+"                              file. Use this option to resume a download\n"
+"                              started by a web browser or another program\n"
+"                              which downloads files sequentially from the\n"
+"                              beginning. Currently this option is only\n"
+"                              applicable to http(s)/ftp downloads."
+msgstr ""
+
+#: src/version_usage.cc:198
+msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
+msgstr ""
+
+#: src/version_usage.cc:199
+msgid " -n, --no-netrc               Disables netrc support."
+msgstr " -n, --no-netrc Schakel netrc ondersteuning uit."
+
+#: src/version_usage.cc:200
+msgid ""
+" -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
+"                              multiple URIs for a single entity: separate\n"
+"                              URIs on a single line using the TAB "
+"character.\n"
+"                              Reads input from stdin when '-' is specified."
+msgstr ""
+
+#: src/version_usage.cc:204
+msgid ""
+" -j, --max-concurrent-downloads=N Set maximum number of concurrent "
+"downloads.\n"
+"                              It should be used with the -i option.\n"
+"                              Default: 5"
+msgstr ""
+
+#: src/version_usage.cc:207
+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:210
+msgid ""
+" -S, --show-files             Print file listing of .torrent or .metalink "
+"file\n"
+"                              and exit."
+msgstr ""
+
+#: src/version_usage.cc:212
+msgid ""
+" --select-file=INDEX...       Set file to download by specifing its index.\n"
+"                              You can find the file index using the\n"
+"                              --show-files option. Multiple indexes can be\n"
+"                              specified by using ',', for example: \"3,6\".\n"
+"                              You can also use '-' to specify a range: \"1-5"
+"\".\n"
+"                              ',' and '-' can be used together.\n"
+"                              When used with the -M option, index may vary\n"
+"                              depending on the query(see --metalink-* "
+"options)."
+msgstr ""
+
+#: src/version_usage.cc:222
+msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
+msgstr ""
+
+#: src/version_usage.cc:223
+msgid ""
+" --follow-torrent=true|false  Set to false to prevent aria2 from\n"
+"                              entering BitTorrent mode even if the filename "
+"of\n"
+"                              the downloaded file ends with .torrent.\n"
+"                              Default: true"
+msgstr ""
+
+#: src/version_usage.cc:227
+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:230
+msgid ""
+" --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
+"                              Default: 6881-6999"
+msgstr ""
+
+#: src/version_usage.cc:232
+msgid ""
+" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+"                              0 means unrestricted.\n"
+"                              You can append K or M(1K = 1024, 1M = 1024K).\n"
+"                              Default: 0"
+msgstr ""
+
+#: src/version_usage.cc:236
+msgid ""
+" --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
+"                              --seed-ratio option."
+msgstr ""
+
+#: src/version_usage.cc:238
+msgid ""
+" --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
+"                              until share ratio reaches RATIO. 1.0 is\n"
+"                              encouraged. If --seed-time option is "
+"specified\n"
+"                              along with this option, seeding ends when at\n"
+"                              least one of the conditions is satisfied."
+msgstr ""
+
+#: src/version_usage.cc:243
+msgid ""
+" --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
+"in\n"
+"                              in BitTorrent is 20 byte length. If more than "
+"20\n"
+"                              bytes are specified, only first 20\n"
+"                              bytes are used. If less than 20 bytes are\n"
+"                              specified, the random alphabet characters are\n"
+"                              added to make it's length 20 bytes.\n"
+"                              Default: -aria2-"
+msgstr ""
+
+#: src/version_usage.cc:252
+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:253
+msgid ""
+" -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
+"                              simultaneously.\n"
+"                              Default: 5"
+msgstr ""
+" -C, --metalink-servers=AANTAL_SERVERS Het aantal servers om simultaan een\n"
+"                              connectie mee te maken.\n"
+"                              Standaard: 5"
+
+#: src/version_usage.cc:256
+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:257
+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:258
+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:259
+#, fuzzy
+msgid " --metalink-location=LOCATION The location of the prefered server."
+msgstr " --metalink-location=LOCATIE De locatie van de server met voorkeur."
+
+#: src/version_usage.cc:260
+msgid ""
+" --follow-metalink=true|false Set to false to prevent aria2 from\n"
+"                              entering Metalink mode even if the filename "
+"of\n"
+"                              the downloaded file ends with .metalink.\n"
+"                              Default: true"
+msgstr ""
+" --follow-metalink=true|false Zet op false om Metalink modus niet\n"
+"                              automatisch te laten inschakelen door aira2\n"
+"                              wanneer een gedownload bestand in .metalink "
+"eindigt.\n"
+"                              Standaard: true"
+
+#: src/version_usage.cc:265
+msgid " -v, --version                Print the version number and exit."
+msgstr " -v, --version Toon het versie nummer en sluit."
+
+#: src/version_usage.cc:266
+msgid " -h, --help                   Print this message and exit."
+msgstr " -h, --help Toon deze text en sluit."
+
+#: src/version_usage.cc:269
+msgid ""
+" You can specify multiple URLs. All URLs must point to the same file\n"
+" 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:272
+msgid "Examples:"
+msgstr "Voorbeelden:"
+
+#: src/version_usage.cc:273
+msgid " Download a file using 1 connection:"
+msgstr " Download een bestand m.b.v. 1 connectie:"
+
+#: src/version_usage.cc:275
+msgid " Download a file using 2 connections:"
+msgstr " Download een bestand m.b.v. 2 connecties:"
+
+#: src/version_usage.cc:277
+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:279
+msgid " You can mix up different protocols:"
+msgstr " U kunt verschillende protocollen door elkaar gebruiken:"
+
+#: src/version_usage.cc:281
+msgid " Parameterized URI:"
+msgstr " Geparametriseerde URI:"
+
+#: src/version_usage.cc:283
+msgid " Parameterized URI. -Z option is required in this case:"
+msgstr " Geparametriseerde URI. -Z is verplicht in dit geval:"
+
+#: src/version_usage.cc:287
+msgid " Download a torrent:"
+msgstr " Download een torrent:"
+
+#: src/version_usage.cc:289
+msgid " Download a torrent using a local .torrent file:"
+msgstr " Download een torrent m.b.v. een lokaal .torrent bestand:"
+
+#: src/version_usage.cc:291 src/version_usage.cc:304
+msgid " Download only selected files:"
+msgstr " Download allen geselecteerde bestanden:"
+
+#: src/version_usage.cc:293
+msgid " Print file listing of .torrent file:"
+msgstr " Toon bestandslijst van .torrent bestand:"
+
+#: src/version_usage.cc:298
+msgid " Metalink downloading:"
+msgstr " Metalink downloaden:"
+
+#: src/version_usage.cc:300
+msgid " Download a file using local .metalink file:"
+msgstr " Download een file met een lokaal .metalink bestand:"
+
+#: src/version_usage.cc:302
+msgid " Metalink downloading with preferences:"
+msgstr " Metalink downloaden met voorkeuren:"
+
+#: src/version_usage.cc:306
+msgid " Download only selected files using index:"
+msgstr " Download alleen geselecteerde bestanden m.b.v. index:"
+
+#: src/version_usage.cc:308
+msgid " Print file listing of .metalink file:"
+msgstr " Toon bestandslijst van .metalink bestand:"
+
+#: src/version_usage.cc:312
+#, c-format
+msgid "Report bugs to %s"
+msgstr "Rapporteer bugs aan %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "stopping application...\n"
+#~ msgstr ""
+#~ "\n"
+#~ "beëindigen programma...\n"
+
+#~ msgid "done\n"
+#~ msgstr "voltooid\n"

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-09-03 20:34+0900\n"
+"POT-Creation-Date: 2007-10-29 21:34+0900\n"
 "PO-Revision-Date: 2006-07-28 18:04+0600\n"
 "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -21,6 +21,53 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.2\n"
 
+#: src/OptionHandlerImpl.h:65
+#, fuzzy
+msgid "must be either 'true' or 'false'."
+msgstr "follow-torrent должен быть 'true' или 'false'."
+
+#: src/OptionHandlerImpl.h:93
+#, fuzzy, c-format
+msgid "must be smaller than or equal to %s."
+msgstr "upload-limit должен быть не меньше 0."
+
+#: src/OptionHandlerImpl.h:96
+#, fuzzy, c-format
+msgid "must be between %s and %s."
+msgstr "split должен быть находится в пределах 1..5."
+
+#: src/OptionHandlerImpl.h:99
+#, fuzzy, c-format
+msgid "must be greater than or equal to %s."
+msgstr "upload-limit должен быть не меньше 0."
+
+#: src/OptionHandlerImpl.h:102 src/OptionHandlerImpl.h:148
+msgid "must be a number."
+msgstr ""
+
+#: src/OptionHandlerImpl.h:139
+#, fuzzy, c-format
+msgid "must be smaller than or equal to %.1f."
+msgstr "upload-limit должен быть не меньше 0."
+
+#: src/OptionHandlerImpl.h:142
+#, fuzzy, c-format
+msgid "must be between %.1f and %.1f."
+msgstr "split должен быть находится в пределах 1..5."
+
+#: src/OptionHandlerImpl.h:145
+#, fuzzy, c-format
+msgid "must be greater than or equal to %.1f."
+msgstr "upload-limit должен быть не меньше 0."
+
+#: src/OptionHandlerImpl.h:195
+msgid "must be one of the following:"
+msgstr ""
+
+#: src/OptionHandlerImpl.h:223
+msgid "unrecognized proxy format"
+msgstr "неизвестный формат прокси"
+
 #: src/RequestInfo.h:54
 #, c-format
 msgid ""
@@ -815,16 +862,37 @@ msgstr ""
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/DownloadEngineFactory.cc:197
-#, c-format
+#: src/DownloadEngineFactory.cc:97
 msgid "Errors occurred while binding port.\n"
 msgstr "Ошибка при открытии порта.\n"
 
-#: src/main.cc:91
+#: src/MultiUrlRequestInfo.cc:70
+#, fuzzy
+msgid "aria2 will resume download if the transfer is restarted."
+msgstr ""
+"\n"
+"Скачивание не завершено из-за ошибок. Проверьте лог-файл.\n"
+
+#: src/MultiUrlRequestInfo.cc:72
+msgid ""
+"If there are any errors, then see the log file. See '-l' option in help/man "
+"page for details."
+msgstr ""
+
+#: src/RequestGroupMan.cc:213
+#, fuzzy
+msgid "Download Results:"
+msgstr " Скачать torrent:"
+
+#: src/Util.cc:649
+msgid "Files:"
+msgstr "Файлы:"
+
+#: src/version_usage.cc:40
 msgid " version "
 msgstr " версия "
 
-#: src/main.cc:101
+#: src/version_usage.cc:50
 #, fuzzy
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -856,42 +924,42 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 
-#: src/main.cc:115
+#: src/version_usage.cc:64
 #, fuzzy
 msgid "Contact Info:"
 msgstr "Связь с автором: %s\n"
 
-#: src/main.cc:122
+#: src/version_usage.cc:71
 #, c-format
 msgid "Usage: %s [options] URL ...\n"
 msgstr "Использование: %s [параметры] URL ...\n"
 
-#: src/main.cc:124
-#, c-format
-msgid "       %s [options] -T TORRENT_FILE FILE ...\n"
+#: src/version_usage.cc:73
+#, fuzzy, c-format
+msgid "       %s [options] -T TORRENT_FILE URL ...\n"
 msgstr "       %s [параметры] -T TORRENT_FILE FILE ...\n"
 
-#: src/main.cc:127
+#: src/version_usage.cc:76
 #, c-format
 msgid "       %s [options] -M METALINK_FILE\n"
 msgstr "       %s [параметры] -M METALINK_FILE\n"
 
-#: src/main.cc:130
+#: src/version_usage.cc:79
 msgid "Options:"
 msgstr "Параметры:"
 
-#: src/main.cc:131
+#: src/version_usage.cc:80
 #, fuzzy
 msgid ""
 " -d, --dir=DIR                The directory to store the downloaded file."
 msgstr " -d, --dir=DIR                Каталог для сохранения скачанных файлов."
 
-#: src/main.cc:132
+#: src/version_usage.cc:81
 #, fuzzy
 msgid " -o, --out=FILE               The file name of the downloaded file."
 msgstr " -o, --out=FILE               Имя файла для скачанного файла."
 
-#: src/main.cc:133
+#: src/version_usage.cc:82
 #, fuzzy
 msgid ""
 " -l, --log=LOG                The file name of the log file. If '-' is\n"
@@ -900,11 +968,11 @@ msgstr ""
 " -l, --log=LOG                Имя файла для логов. Если указано \"-\",\n"
 "                              логи будут выведены в stdout."
 
-#: src/main.cc:136
+#: src/version_usage.cc:85
 msgid " -D, --daemon                 Run as daemon."
 msgstr " -D, --daemon                 Запустить в качестве демона."
 
-#: src/main.cc:138
+#: src/version_usage.cc:87
 #, fuzzy
 msgid ""
 " -s, --split=N                Download a file using N connections. N must "
@@ -922,7 +990,7 @@ msgstr ""
 "                              Следуя этому, aria2 соединяется к каждому URL\n"
 "                              используя N соединений."
 
-#: src/main.cc:143
+#: src/version_usage.cc:92
 #, fuzzy
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
@@ -936,13 +1004,13 @@ msgstr ""
 "60.\n"
 "                              По умолчанию: 5"
 
-#: src/main.cc:146
+#: src/version_usage.cc:95
 #, fuzzy
 msgid " -t, --timeout=SEC            Set timeout in seconds. Default: 60"
 msgstr ""
 " -t, --timeout=SEC            Установить таймаут в секундах. По умолчанию: 60"
 
-#: src/main.cc:147
+#: src/version_usage.cc:96
 msgid ""
 " -m, --max-tries=N            Set number of tries. 0 means unlimited.\n"
 "                              Default: 5"
@@ -950,7 +1018,7 @@ msgstr ""
 " -m, --max-tries=N            Установить число попыток. 0 означает\n"
 "                              неограниченное число. По умолчанию: 5"
 
-#: src/main.cc:155
+#: src/version_usage.cc:104
 #, fuzzy
 msgid ""
 " --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
@@ -958,21 +1026,21 @@ msgstr ""
 " --http-proxy-user=USER       Установить пользователя для прокси HTTP. Это "
 "влияет на все URL."
 
-#: src/main.cc:156
+#: src/version_usage.cc:105
 #, fuzzy
 msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 " --http-user=USER             Установить пользователя для HTTP. Это влияет "
 "на все URL."
 
-#: src/main.cc:157
+#: src/version_usage.cc:106
 #, fuzzy
 msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 " --http-passwd=PASSWD         Установить пароль для HTTP. Это влияет на все "
 "URL."
 
-#: src/main.cc:158
+#: src/version_usage.cc:107
 #, fuzzy
 msgid ""
 " --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
@@ -980,7 +1048,7 @@ msgstr ""
 " --http-proxy-user=USER       Установить пользователя для прокси HTTP. Это "
 "влияет на все URL."
 
-#: src/main.cc:159
+#: src/version_usage.cc:108
 #, fuzzy
 msgid ""
 " --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
@@ -988,7 +1056,7 @@ msgstr ""
 " --http-proxy-passwd=PASSWD   Установить пароль для прокси HTTP. Это влияет "
 "на все URL."
 
-#: src/main.cc:160
+#: src/version_usage.cc:109
 msgid ""
 " --http-proxy-method=METHOD   Set the method to use in proxy request.\n"
 "                              METHOD is either 'get' or 'tunnel'.\n"
@@ -1000,7 +1068,7 @@ msgstr ""
 "                              или \"tunnel\".\n"
 "                              По умолчанию: tunnel"
 
-#: src/main.cc:163
+#: src/version_usage.cc:112
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
@@ -1011,13 +1079,13 @@ msgstr ""
 "                              момент доступна только схема \"basic\"\n"
 "                              По умолчанию: basic"
 
-#: src/main.cc:166
+#: src/version_usage.cc:115
 #, fuzzy
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 " --referer=REFERER            Установить реферер. Это влияет на все URL."
 
-#: src/main.cc:167
+#: src/version_usage.cc:116
 #, fuzzy
 msgid ""
 " --ftp-user=USER              Set FTP user. This affects all URLs.\n"
@@ -1027,7 +1095,7 @@ msgstr ""
 "URL.\n"
 "                              По умолчанию: anonymous"
 
-#: src/main.cc:169
+#: src/version_usage.cc:118
 #, fuzzy
 msgid ""
 " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs.\n"
@@ -1036,7 +1104,7 @@ msgstr ""
 " --ftp-passwd=PASSWD          Установить пароль FTP. Это влияет на все URL.\n"
 "                              По умолчанию: ARIA2USER@"
 
-#: src/main.cc:171
+#: src/version_usage.cc:120
 msgid ""
 " --ftp-type=TYPE              Set FTP transfer type. TYPE is either "
 "'binary'\n"
@@ -1047,11 +1115,11 @@ msgstr ""
 "                              или \"binary\", или \"ascii\".\n"
 "                              По умолчанию: binary"
 
-#: src/main.cc:174
+#: src/version_usage.cc:123
 msgid " -p, --ftp-pasv               Use passive mode in FTP."
 msgstr " -p, --ftp-pasv               Использовать пассивный режим для FTP."
 
-#: src/main.cc:175
+#: src/version_usage.cc:124
 msgid ""
 " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP. METHOD is either 'get' "
 "or\n"
@@ -1063,7 +1131,7 @@ msgstr ""
 "                              быть \"get\" или \"tunnel\".\n"
 "                              По умолчанию: tunnel"
 
-#: src/main.cc:178
+#: src/version_usage.cc:127
 #, fuzzy
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
@@ -1081,7 +1149,7 @@ msgstr ""
 "60.\n"
 "                              По умолчанию: 5"
 
-#: src/main.cc:185
+#: src/version_usage.cc:134
 #, fuzzy
 msgid ""
 " --max-download-limit=SPEED   Set max download speed in bytes per sec.\n"
@@ -1094,7 +1162,7 @@ msgstr ""
 "60.\n"
 "                              По умолчанию: 5"
 
-#: src/main.cc:189
+#: src/version_usage.cc:138
 #, fuzzy
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method. METHOD is "
@@ -1106,14 +1174,28 @@ msgid ""
 "                              before download begins. This may take some "
 "time\n"
 "                              depending on the size of the file.\n"
-"                              Default: none"
+"                              Default: prealloc"
 msgstr ""
 " --retry-wait=SEC             Установить промежуток времени между запросами\n"
 "                              при ошибках. Значение должно быть между 0 и "
 "60.\n"
 "                              По умолчанию: 5"
 
-#: src/main.cc:195
+#: src/version_usage.cc:144
+#, fuzzy
+msgid ""
+" --no-file-allocation-limit=SIZE No file allocation is made for files whose\n"
+"                              size is smaller than SIZE.\n"
+"                              You can append K or M(1K = 1024, 1M = 1024K).\n"
+"                              BitTorrent downloads ignore this option.\n"
+"                              Default: 5M"
+msgstr ""
+" --retry-wait=SEC             Установить промежуток времени между запросами\n"
+"                              при ошибках. Значение должно быть между 0 и "
+"60.\n"
+"                              По умолчанию: 5"
+
+#: src/version_usage.cc:149
 #, fuzzy
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
@@ -1128,7 +1210,7 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:199
+#: src/version_usage.cc:153
 #, fuzzy
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
@@ -1144,7 +1226,7 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:203
+#: src/version_usage.cc:157
 #, fuzzy
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
@@ -1162,7 +1244,7 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:209
+#: src/version_usage.cc:163
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -1179,7 +1261,20 @@ msgid ""
 "                              Default: false"
 msgstr ""
 
-#: src/main.cc:221
+#: src/version_usage.cc:174
+msgid ""
+" --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistant "
+"connection.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:176
+msgid ""
+" --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining.\n"
+"                              Default: false"
+msgstr ""
+
+#: src/version_usage.cc:179
 #, fuzzy
 msgid ""
 " --check-integrity=true|false  Check file integrity by validating piece "
@@ -1200,7 +1295,7 @@ msgstr ""
 "60.\n"
 "                              По умолчанию: 5"
 
-#: src/main.cc:229
+#: src/version_usage.cc:187
 #, fuzzy
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
@@ -1216,7 +1311,7 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:234
+#: src/version_usage.cc:192
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -1226,15 +1321,15 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/main.cc:240
+#: src/version_usage.cc:198
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/main.cc:241
+#: src/version_usage.cc:199
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/main.cc:242
+#: src/version_usage.cc:200
 msgid ""
 " -i, --input-file=FILE        Downloads URIs found in FILE. You can specify\n"
 "                              multiple URIs for a single entity: separate\n"
@@ -1243,7 +1338,7 @@ msgid ""
 "                              Reads input from stdin when '-' is specified."
 msgstr ""
 
-#: src/main.cc:246
+#: src/version_usage.cc:204
 #, fuzzy
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of concurrent "
@@ -1254,13 +1349,13 @@ msgstr ""
 " -m, --max-tries=N            Установить число попыток. 0 означает\n"
 "                              неограниченное число. По умолчанию: 5"
 
-#: src/main.cc:249
+#: src/version_usage.cc:207
 msgid ""
 " --load-cookies=FILE          Load cookies from FILE. The format of FILE is\n"
 "                              the same used by Netscape and Mozilla."
 msgstr ""
 
-#: src/main.cc:252
+#: src/version_usage.cc:210
 #, fuzzy
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
@@ -1269,7 +1364,7 @@ msgid ""
 msgstr ""
 " -S, --show-files             Вывести перечисленные .torrent файлы и выйти."
 
-#: src/main.cc:254
+#: src/version_usage.cc:212
 #, fuzzy
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
@@ -1291,12 +1386,12 @@ msgstr ""
 "                              Также вы можете использовать тире (\"1-5\").\n"
 "                              \",\" и \"-\" могут быть использованы вместе."
 
-#: src/main.cc:264
+#: src/version_usage.cc:222
 #, fuzzy
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr " -T, --torrent-file=TORRENT_FILE  Путь до .torrent-файла."
 
-#: src/main.cc:265
+#: src/version_usage.cc:223
 #, fuzzy
 msgid ""
 " --follow-torrent=true|false  Set to false to prevent aria2 from\n"
@@ -1311,7 +1406,7 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:269
+#: src/version_usage.cc:227
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file.\n"
@@ -1321,7 +1416,7 @@ msgstr ""
 "                              описанный в .torrent-файл.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:272
+#: src/version_usage.cc:230
 #, fuzzy
 msgid ""
 " --listen-port=PORT           Set TCP port number for BitTorrent downloads.\n"
@@ -1329,7 +1424,7 @@ msgid ""
 msgstr ""
 " --listen-port=PORT           Установить порт для прослушивания соединения."
 
-#: src/main.cc:274
+#: src/version_usage.cc:232
 #, fuzzy
 msgid ""
 " --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
@@ -1342,7 +1437,7 @@ msgstr ""
 "60.\n"
 "                              По умолчанию: 5"
 
-#: src/main.cc:278
+#: src/version_usage.cc:236
 #, fuzzy
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
@@ -1351,7 +1446,7 @@ msgstr ""
 " -m, --max-tries=N            Установить число попыток. 0 означает\n"
 "                              неограниченное число. По умолчанию: 5"
 
-#: src/main.cc:280
+#: src/version_usage.cc:238
 #, fuzzy
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
@@ -1368,7 +1463,7 @@ msgstr ""
 "                              Следуя этому, aria2 соединяется к каждому URL\n"
 "                              используя N соединений."
 
-#: src/main.cc:285
+#: src/version_usage.cc:243
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -1381,12 +1476,12 @@ msgid ""
 "                              Default: -aria2-"
 msgstr ""
 
-#: src/main.cc:294
+#: src/version_usage.cc:252
 #, fuzzy
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr " -M, --metalink-file=METALINK_FILE Путь к .metalink-файлу."
 
-#: src/main.cc:295
+#: src/version_usage.cc:253
 #, fuzzy
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
@@ -1399,27 +1494,27 @@ msgstr ""
 "параметр -s.\n"
 "                              По умолчанию: 15"
 
-#: src/main.cc:298
+#: src/version_usage.cc:256
 #, fuzzy
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr " --metalink-version=VERSION   Версия файла для скачивания."
 
-#: src/main.cc:299
+#: src/version_usage.cc:257
 #, fuzzy
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr " --metalink-language=LANGUAGE Язык файла для скачивания."
 
-#: src/main.cc:300
+#: src/version_usage.cc:258
 #, fuzzy
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr " --metalink-os=OS             Целевая операционная система файла."
 
-#: src/main.cc:301
+#: src/version_usage.cc:259
 msgid " --metalink-location=LOCATION The location of the prefered server."
 msgstr ""
 
-#: src/main.cc:302
+#: src/version_usage.cc:260
 #, fuzzy
 msgid ""
 " --follow-metalink=true|false Set to false to prevent aria2 from\n"
@@ -1434,15 +1529,15 @@ msgstr ""
 "                              файлы.\n"
 "                              По умолчанию: true"
 
-#: src/main.cc:307
+#: src/version_usage.cc:265
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                Вывести номер версии и выйти."
 
-#: src/main.cc:308
+#: src/version_usage.cc:266
 msgid " -h, --help                   Print this message and exit."
 msgstr " -h, --help                   Вывести это сообщение и выйти."
 
-#: src/main.cc:311
+#: src/version_usage.cc:269
 #, fuzzy
 msgid ""
 " You can specify multiple URLs. All URLs must point to the same file\n"
@@ -1451,105 +1546,102 @@ msgstr ""
 " Вы можете указать несколько URL. Все URL должны указывать на один и тот же\n"
 " файл, иначе скачивание завершится неудачей."
 
-#: src/main.cc:316
-#, fuzzy
-msgid ""
-" Specify files in multi-file torrent to download. Use in conjunction with "
-"the\n"
-" -T option. This argument is ignored if you specify the --select-file option."
-msgstr ""
-" Указать файлы для скачивания при многофайловом torent. Используйте вместе\n"
-" с параметром -T. Этот параметр игнорируется при указании --select-file."
-
-#: src/main.cc:320
+#: src/version_usage.cc:272
 msgid "Examples:"
 msgstr "Примеры:"
 
-#: src/main.cc:321
+#: src/version_usage.cc:273
 #, fuzzy
 msgid " Download a file using 1 connection:"
 msgstr " Скачать файл с помощью 1 соединения:"
 
-#: src/main.cc:323
+#: src/version_usage.cc:275
 #, fuzzy
 msgid " Download a file using 2 connections:"
 msgstr " Скачать файл с помощью 2 соединений:"
 
-#: src/main.cc:325
+#: src/version_usage.cc:277
 #, fuzzy
 msgid ""
 " Download a file using 2 connections, each connects to a different server:"
 msgstr " Скачать файл с помощью 2 соединений к различным серверам:"
 
-#: src/main.cc:327
+#: src/version_usage.cc:279
 msgid " You can mix up different protocols:"
 msgstr " Вы можете смешивать различные протоколы:"
 
-#: src/main.cc:329
+#: src/version_usage.cc:281
 msgid " Parameterized URI:"
 msgstr ""
 
-#: src/main.cc:331
+#: src/version_usage.cc:283
 msgid " Parameterized URI. -Z option is required in this case:"
 msgstr ""
 
-#: src/main.cc:335
+#: src/version_usage.cc:287
 msgid " Download a torrent:"
 msgstr " Скачать torrent:"
 
-#: src/main.cc:337
+#: src/version_usage.cc:289
 #, fuzzy
 msgid " Download a torrent using a local .torrent file:"
 msgstr " Скачать torrent с помощью локального .torrent-файла:"
 
-#: src/main.cc:339 src/main.cc:352
+#: src/version_usage.cc:291 src/version_usage.cc:304
 msgid " Download only selected files:"
 msgstr " Скачать только выбранные файлы:"
 
-#: src/main.cc:341
+#: src/version_usage.cc:293
 msgid " Print file listing of .torrent file:"
 msgstr " Вывести список фалов из .torrent"
 
-#: src/main.cc:346
+#: src/version_usage.cc:298
 msgid " Metalink downloading:"
 msgstr " Скачать metalink:"
 
-#: src/main.cc:348
+#: src/version_usage.cc:300
 msgid " Download a file using local .metalink file:"
 msgstr " Скачать файл с помощью локального .metalink-файла:"
 
-#: src/main.cc:350
+#: src/version_usage.cc:302
 msgid " Metalink downloading with preferences:"
 msgstr " Скачивание metalink с настройками:"
 
-#: src/main.cc:354
+#: src/version_usage.cc:306
 #, fuzzy
 msgid " Download only selected files using index:"
 msgstr " Скачать только выбранные файлы:"
 
-#: src/main.cc:356
+#: src/version_usage.cc:308
 #, fuzzy
 msgid " Print file listing of .metalink file:"
 msgstr " Вывести список фалов из .torrent"
 
-#: src/main.cc:360
+#: src/version_usage.cc:312
 #, c-format
 msgid "Report bugs to %s"
 msgstr "Сообщения об ошибках направляйте на адрес %s"
 
-#: src/ConsoleDownloadEngine.cc:198
-#, c-format
-msgid ""
-"\n"
-"stopping application...\n"
-msgstr ""
-"\n"
-"остановка приложения...\n"
+#, fuzzy
+#~ msgid ""
+#~ " Specify files in multi-file torrent to download. Use in conjunction with "
+#~ "the\n"
+#~ " -T option. This argument is ignored if you specify the --select-file "
+#~ "option."
+#~ msgstr ""
+#~ " Указать файлы для скачивания при многофайловом torent. Используйте "
+#~ "вместе\n"
+#~ " с параметром -T. Этот параметр игнорируется при указании --select-file."
 
-#: src/ConsoleDownloadEngine.cc:202
-#, c-format
-msgid "done\n"
-msgstr "завершено\n"
+#~ msgid ""
+#~ "\n"
+#~ "stopping application...\n"
+#~ msgstr ""
+#~ "\n"
+#~ "остановка приложения...\n"
+
+#~ msgid "done\n"
+#~ msgstr "завершено\n"
 
 #~ msgid ""
 #~ " --http-proxy=HOST:PORT       Use HTTP proxy server. This affects to all\n"
@@ -1559,12 +1651,6 @@ msgstr "завершено\n"
 #~ "на\n"
 #~ "                              все URL."
 
-#~ msgid "Files:"
-#~ msgstr "Файлы:"
-
-#~ msgid "unrecognized proxy format"
-#~ msgstr "неизвестный формат прокси"
-
 #~ msgid "Currently, supported authentication scheme is basic."
 #~ msgstr "Поддерживаемая схема аутентификации - \"basic\"."
 
@@ -1586,16 +1672,9 @@ msgstr "завершено\n"
 #~ msgid "listen-port must be between 1024 and 65535."
 #~ msgstr "listen-port должен быть в пределах 1024..65535."
 
-#~ msgid "follow-torrent must be either 'true' or 'false'."
-#~ msgstr "follow-torrent должен быть 'true' или 'false'."
-
 #~ msgid "direct-file-mapping must be either 'true' or 'false'."
 #~ msgstr "direct-file-mapping должен быть 'true' или 'false'."
 
-#, fuzzy
-#~ msgid "seed-time must be greater than or equal to 0."
-#~ msgstr "upload-limit должен быть не меньше 0."
-
 #, fuzzy
 #~ msgid "seed-ratio must be greater than or equal to 0.0."
 #~ msgstr "upload-limit должен быть не меньше 0."
@@ -1627,9 +1706,6 @@ msgstr "завершено\n"
 #~ msgid "realtime-chunk-checksum must be either 'true' or 'false'."
 #~ msgstr "follow-metalink должен быть 'true' или 'false'."
 
-#~ msgid "split must be between 1 and 5."
-#~ msgstr "split должен быть находится в пределах 1..5."
-
 #~ msgid "timeout must be between 1 and 600"
 #~ msgstr "таймаут должен быть в пределах 1..600"
 

src/BtCheckIntegrityEntry.cc

@@ -51,7 +51,7 @@ Commands BtCheckIntegrityEntry::prepareForNextAction(DownloadEngine* e)
 {
   Commands commands;
   FileAllocationEntryHandle entry = new BtFileAllocationEntry(_requestGroup);
-  if(_requestGroup->isFileAllocationEnabled() && !_requestGroup->getPieceStorage()->getDiskAdaptor()->fileAllocationIterator()->finished()) {
+  if(_requestGroup->needsFileAllocation()) {
     e->_fileAllocationMan->pushFileAllocationEntry(entry);
   } else {
     commands = entry->prepareForNextAction(e);

src/DefaultBtProgressInfoFile.cc

@@ -142,7 +142,7 @@ void DefaultBtProgressInfoFile::save() {
     throw new DlAbortEx(EX_SEGMENT_FILE_WRITE,
 			_filename.c_str(), strerror(errno));
   }
-  if(rename(filenameTemp.c_str(), _filename.c_str()) == -1) {
+  if(!File(filenameTemp).renameTo(_filename)) {
     throw new DlAbortEx(EX_SEGMENT_FILE_WRITE,
 			_filename.c_str(), strerror(errno));
   }

src/HttpRequest.cc

@@ -138,7 +138,7 @@ string HttpRequest::createProxyRequest() const
   string requestLine =
     string("CONNECT ")+getHost()+":"+Util::itos(getPort())+
     string(" HTTP/1.1\r\n")+
-    "User-Agent: "+Util::urlencode(userAgent)+"\r\n"+
+    "User-Agent: "+userAgent+"\r\n"+
     "Host: "+getHost()+":"+Util::itos(getPort())+"\r\n";
   if(request->isKeepAlive()) {
     requestLine += "Proxy-Connection: Keep-Alive\r\n";

src/OptionHandlerFactory.cc

@@ -99,6 +99,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
   handlers.push_back(new BooleanOptionHandler(PREF_PARAMETERIZED_URI));  
   handlers.push_back(new BooleanOptionHandler(PREF_ENABLE_HTTP_KEEP_ALIVE));
   handlers.push_back(new BooleanOptionHandler(PREF_ENABLE_HTTP_PIPELINING));
+  handlers.push_back(new UnitNumberOptionHandler(PREF_NO_FILE_ALLOCATION_LIMIT, 0));
 
   return handlers;
 }

src/RequestGroup.cc

@@ -512,3 +512,10 @@ void RequestGroup::setProgressInfoFile(const BtProgressInfoFileHandle& progressI
 {
   _progressInfoFile = progressInfoFile;
 }
+
+bool RequestGroup::needsFileAllocation() const
+{
+  return isFileAllocationEnabled() &&
+    _option->getAsLLInt(PREF_NO_FILE_ALLOCATION_LIMIT) <= getTotalLength() &&
+    !_pieceStorage->getDiskAdaptor()->fileAllocationIterator()->finished();
+}

src/RequestGroup.h

@@ -263,6 +263,8 @@ public:
     return _fileAllocationEnabled;
   }
 
+  bool needsFileAllocation() const;
+
   /**
    * Setting _preLocalFileCheckEnabled to false, then skip the check to see
    * if a file is already exists and control file exists etc.

src/StreamCheckIntegrityEntry.cc

@@ -54,7 +54,7 @@ StreamCheckIntegrityEntry::~StreamCheckIntegrityEntry() {}
 Commands StreamCheckIntegrityEntry::prepareForNextAction(DownloadEngine* e)
 {
   Commands commands;
-  if(_requestGroup->isFileAllocationEnabled() && !_requestGroup->getPieceStorage()->getDiskAdaptor()->fileAllocationIterator()->finished()) {
+  if(_requestGroup->needsFileAllocation()) {
     FileAllocationEntryHandle entry =
       new StreamFileAllocationEntry(_currentRequest, _requestGroup,
 				    popNextCommand());

src/option_processing.cc

@@ -106,7 +106,8 @@ Option* option_processing(int argc, char* const argv[])
   op->put(PREF_MAX_UPLOAD_LIMIT, "0");
   op->put(PREF_STARTUP_IDLE_TIME, "10");
   op->put(PREF_TRACKER_MAX_TRIES, "10");
-  op->put(PREF_FILE_ALLOCATION, V_NONE);
+  op->put(PREF_FILE_ALLOCATION, V_PREALLOC);
+  op->put(PREF_NO_FILE_ALLOCATION_LIMIT, "5242880"); // 5MiB
   op->put(PREF_ALLOW_OVERWRITE, V_FALSE);
   op->put(PREF_REALTIME_CHUNK_CHECKSUM, V_TRUE);
   op->put(PREF_CHECK_INTEGRITY, V_FALSE);
@@ -169,6 +170,7 @@ Option* option_processing(int argc, char* const argv[])
       { "parameterized-uri", optional_argument, 0, 'P' },
       { "enable-http-keep-alive", optional_argument, &lopt, 207 },
       { "enable-http-pipelining", optional_argument, &lopt, 208 },
+      { "no-file-allocation-limit", required_argument, &lopt, 209 },
 #if defined ENABLE_BITTORRENT || ENABLE_METALINK
       { "show-files", no_argument, NULL, 'S' },
       { "select-file", required_argument, &lopt, 21 },
@@ -316,6 +318,9 @@ Option* option_processing(int argc, char* const argv[])
       case 208:
 	cmdstream << PREF_ENABLE_HTTP_PIPELINING << "=" << toBoolArg(optarg) << "\n";
 	break;
+      case 209:
+	cmdstream << PREF_NO_FILE_ALLOCATION_LIMIT << "=" << optarg << "\n";
+	break;
       }
       break;
     }

src/prefs.h

@@ -87,6 +87,8 @@
 // value: prealloc | none
 #define PREF_FILE_ALLOCATION "file-allocation"
 #  define V_PREALLOC "prealloc"
+#// value: 1*digit
+#define PREF_NO_FILE_ALLOCATION_LIMIT "no-file-allocation-limit"
 // value: true | false
 #define PREF_ALLOW_OVERWRITE "allow-overwrite"
 // value: true | false

src/version_usage.cc

@@ -140,7 +140,12 @@ void showUsage() {
 	    "                              file space. 'prealloc' pre-allocates file space\n"
 	    "                              before download begins. This may take some time\n"
 	    "                              depending on the size of the file.\n"
-	    "                              Default: none") << endl;
+	    "                              Default: prealloc") << endl;
+  cout << _(" --no-file-allocation-limit=SIZE No file allocation is made for files whose\n"
+	    "                              size is smaller than SIZE.\n"
+	    "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
+	    "                              BitTorrent downloads ignore this option.\n"
+	    "                              Default: 5M") << endl;
   cout << _(" --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
   		"                              already exists but the corresponding .aria2 file\n"
   		"                              doesn't exist.\n"

test/HttpRequestTest.cc

@@ -17,6 +17,7 @@ class HttpRequestTest : public CppUnit::TestFixture {
   CPPUNIT_TEST(testCreateRequest_with_cookie);
   CPPUNIT_TEST(testCreateProxyRequest);
   CPPUNIT_TEST(testIsRangeSatisfied);
+  CPPUNIT_TEST(testUserAgent);
   CPPUNIT_TEST_SUITE_END();
 private:
 
@@ -30,6 +31,7 @@ public:
   void testCreateRequest_with_cookie();
   void testCreateProxyRequest();
   void testIsRangeSatisfied();
+  void testUserAgent();
 };
 
 
@@ -500,3 +502,40 @@ void HttpRequestTest::testIsRangeSatisfied()
 
   CPPUNIT_ASSERT(!httpRequest.isRangeSatisfied(range));
 }
+
+void HttpRequestTest::testUserAgent()
+{
+  SharedHandle<Option> option = new Option();
+  RequestFactory requestFactory;
+  requestFactory.setOption(option.get());
+
+  RequestHandle request = requestFactory.createRequest();
+  request->setUrl("http://localhost:8080/archives/aria2-1.0.0.tar.bz2");
+
+  SegmentHandle segment = new PiecedSegment(1024, new Piece(0, 1024));
+
+  HttpRequest httpRequest;
+
+  httpRequest.setRequest(request);
+  httpRequest.setSegment(segment);
+  httpRequest.setUserAgent("aria2 (Linux)");
+
+  string expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
+    "User-Agent: aria2 (Linux)\r\n"
+    "Accept: */*\r\n"
+    "Host: localhost:8080\r\n"
+    "Pragma: no-cache\r\n"
+    "Cache-Control: no-cache\r\n"
+    "Connection: close\r\n"
+    "\r\n";
+
+  CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
+
+  string expectedTextForProxy = "CONNECT localhost:8080 HTTP/1.1\r\n"
+    "User-Agent: aria2 (Linux)\r\n"
+    "Host: localhost:8080\r\n"
+    "Proxy-Connection: close\r\n"
+    "\r\n";
+
+  CPPUNIT_ASSERT_EQUAL(expectedTextForProxy, httpRequest.createProxyRequest());
+}