2008-11-18 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Updated Ukrainian, Japanese, Bulgarian, Russian and French
	translations. Thanks to all translators.
	* po/bg.po
	* po/fr.po
	* po/ja.po
	* po/ru.po
	* po/uk.po

ChangeLog

@@ -1,3 +1,13 @@
+2008-11-18  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Updated Ukrainian, Japanese, Bulgarian, Russian and French translations.
+	Thanks to all translators.
+	* po/bg.po
+	* po/fr.po
+	* po/ja.po
+	* po/ru.po
+	* po/uk.po
+	
 2008-11-18  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Bump up version number to 1.0.0

po/aria2c.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: aria2c 0.16.2\n"
+"Project-Id-Version: aria2c 1.0.0\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+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,30 +16,30 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr ""
 
@@ -55,49 +55,49 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 msgid "must be either 'true' or 'false'."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 msgid "must be a number."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr ""
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 msgid "unrecognized proxy format"
 msgstr ""
 
@@ -130,83 +130,100 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
 "                              has occured."
 msgstr ""
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr ""
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:62
-msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+#: src/usage_text.h:66
+msgid ""
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:64
-msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+#: src/usage_text.h:70
+msgid ""
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:66
+#: src/usage_text.h:74
 msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:68
-msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+#: src/usage_text.h:81
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:83
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:72
+#: src/usage_text.h:85
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
+msgstr ""
+
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
 "                              is the only supported scheme."
 msgstr ""
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr ""
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr ""
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
 msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -218,14 +235,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -237,14 +254,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -252,7 +269,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -260,7 +277,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -270,7 +287,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -279,7 +296,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -290,7 +307,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -306,28 +323,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -335,7 +352,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -345,39 +362,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -386,7 +410,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -400,11 +424,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -420,13 +444,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -437,20 +461,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -462,7 +486,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -473,15 +497,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -492,18 +516,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -513,7 +537,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -521,7 +545,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -531,57 +555,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -597,7 +629,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -607,11 +639,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -626,23 +658,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -654,30 +686,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -686,7 +718,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -697,7 +729,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -711,7 +743,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -728,7 +760,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -737,7 +769,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -747,7 +779,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -755,7 +787,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -766,6 +798,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1384,350 +1458,368 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr ""
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+msgid "No certificate found."
+msgstr ""
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr ""
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr ""
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr ""
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr ""
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr ""
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr ""
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr ""
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr ""
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr ""
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr ""
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr ""
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr ""
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr ""
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr ""
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr ""
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr ""
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr ""
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr ""
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr ""
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr ""
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr ""
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr ""
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr ""
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 

po/he.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+0900\n"
 "PO-Revision-Date: 2008-02-13 11:01+0000\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -17,30 +17,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr ""
 
@@ -56,49 +56,49 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 msgid "must be either 'true' or 'false'."
 msgstr "מוכרח להיות 'אמת' או 'שקר'."
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr "מוכרח להיות בטווח שבין %s ל-%s."
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr "מוכרח להיות קטן או שווה ל-%s."
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr "מוכרח להיות גדול או שווה ל-%s."
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 msgid "must be a number."
 msgstr "מוכרח להיות ערך מספרי."
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr "מוכרח להיות קטן או שווה ל-%.1f."
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr "מוכרח להיות בטווח שבין %.1f ל- %.1f."
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr "מוכרח להיות גדול או שווה ל-%.1f."
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr "מוכרח להיות אחד מהבאים:"
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 msgid "unrecognized proxy format"
 msgstr "תבנית מתווך לא מוכרת"
 
@@ -131,83 +131,100 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
 "                              has occured."
 msgstr ""
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr ""
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:62
-msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+#: src/usage_text.h:66
+msgid ""
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:64
-msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+#: src/usage_text.h:70
+msgid ""
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:66
+#: src/usage_text.h:74
 msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:68
-msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+#: src/usage_text.h:81
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:83
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:72
+#: src/usage_text.h:85
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
+msgstr ""
+
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
 "                              is the only supported scheme."
 msgstr ""
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr ""
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr ""
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
 msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -219,14 +236,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -238,14 +255,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -253,7 +270,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -261,7 +278,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -271,7 +288,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -280,7 +297,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -291,7 +308,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -307,28 +324,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -336,7 +353,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -346,39 +363,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -387,7 +411,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -401,11 +425,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -421,13 +445,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -438,20 +462,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -463,7 +487,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -474,15 +498,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -493,18 +517,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -514,7 +538,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -522,7 +546,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -532,57 +556,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -598,7 +630,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -608,11 +640,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -627,23 +659,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -655,30 +687,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -687,7 +719,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -698,7 +730,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -712,7 +744,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -729,7 +761,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -738,7 +770,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -748,7 +780,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -756,7 +788,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -767,6 +799,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1400,350 +1474,369 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, fuzzy, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr "שגיאה בקריאה מהקובץ %s, סיבה: %s"
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+#, fuzzy
+msgid "No certificate found."
+msgstr "לא נמצאה כותרת"
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr "תם הזמן."
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr "גודל נתח בלתי חוקי."
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr "נתח גדול מדי. גודל=%d"
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr "כותרת בלתי חוקית."
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr "תגובה בלתי חוקית."
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr "לא נמצאה כותרת"
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr "אין כותרת מצב."
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr "החיבור למתווך נכשל."
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr "החיבור נכשל."
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr "שם הקובץ המבוקש והשם הקודם שרשמת אינם זהים. צפוי:%s ממשי:%s"
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr "מצב התגובה אינו מוצלח. מצב=%d"
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr "קובץ גדול מדי. גודל=%s"
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr "קידוד ההעברה %s אינו נתמך."
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr "הפעלת ה-SSL נכשלה: %s"
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr "שגיאת קלט/פלט עם SSL"
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr "שגיאת פרוטוקול SSL"
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr "שגיאת SSL לא ידועה %d"
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr "הפעלת SSL נכשלה: שגיאת חיבור OpenSSL %d"
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr "הגודל אינו תואם צפוי:%s ממשי:%s"
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr "אימות נכשל."
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr "קבל את סיום הקובץ מהשרת."
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr "התקבל סיום הקובץ מהעמית."
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr "מידע מטא לא תקני"
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr "כשל בפתיחת הקובץ %s, סיבה: %s"
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr "שגיאה בכתיבה לקובץ %s, סיבה: %s"
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr "שגיאה בקריאה מהקובץ %s, סיבה: %s"
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr "שגיאה בעת קריאה מהכונן."
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr "שגיאה בחישוב תמצית SHA1 או חלק מהקובץ %s, סיבה: %s"
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr "שגיאה בחיפוש אחר הקובץ %s, סיבה: %s"
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr "הקיזוז הינו מחוץ לטווח, קיזוז=%s"
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s אינו תיקיה."
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr "שגיאה ביצירת התיקיה %s, סיבה: %s"
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr "שגיאה בפתיחת קובץ המקטע %s, סיבה: %s"
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr "שגיאה בכתיבה לקובץ המקטע %s, סיבה: %s"
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr "שגיאה בעת קריאה מקובץ המקטע %s, סיבה: %s"
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr "שגיאה בפתיחת החיבור, סיבה: %s"
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr "שגיאה בהגדרת אפשרויות החיבור, סיבה: %s"
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr "שגיאה בהגדרת החיבור כחוסם, סיבה: %s"
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr "שגיאה בהגדרת החיבור כלא חוסם, סיבה: %s"
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr "שגיאה בקישור החיבור, סיבה: %s"
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr "שגיאה בהאזנה לחיבור, סיבה: %s"
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr "שגיאה בקבלת חיבור מהעמית, סיבה: %s"
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr "שגיאה בקבלת שם החיבור, סיבה: %s"
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr "שגיאת חיבור לא ידועה %d (0x%x)"
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr "הקובץ %s קיים, אך %s לא קיים."
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr "ההורדה בוטלה."
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr "בדיקות שגויות."
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr "העוקב השיב בשגיאה מהסיבה: %s"
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr "נתגלתה הצפה."
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 

po/hu.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+0900\n"
 "PO-Revision-Date: 2008-01-24 14:58+0000\n"
 "Last-Translator: Juhász József <juhasz.jozsef@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -17,30 +17,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr ""
 
@@ -56,49 +56,49 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 msgid "must be either 'true' or 'false'."
 msgstr "Az értéknek 'igaz'-nak vagy 'hamis'-nak kell lennie"
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr "az értéknek kisebbnek vagy egyenlőnek kell lennie mint %s"
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr "az értéknek nagyobbnak vagy egyenlőnek kell lennie mint %s"
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 msgid "must be a number."
 msgstr "az értéknek számnak kell lennie"
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr "az értéknek kisebbnek vagy egyenlőnek kell lennie mint %.1f"
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr "az érték a következő lehet"
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 msgid "unrecognized proxy format"
 msgstr "értelmezhetetlen proxy formátum"
 
@@ -131,83 +131,100 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
 "                              has occured."
 msgstr ""
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr ""
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:62
-msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+#: src/usage_text.h:66
+msgid ""
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:64
-msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+#: src/usage_text.h:70
+msgid ""
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:66
+#: src/usage_text.h:74
 msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:68
-msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+#: src/usage_text.h:81
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:83
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:72
+#: src/usage_text.h:85
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
+msgstr ""
+
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
 "                              is the only supported scheme."
 msgstr ""
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr ""
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr ""
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
 msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -219,14 +236,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -238,14 +255,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -253,7 +270,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -261,7 +278,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -271,7 +288,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -280,7 +297,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -291,7 +308,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -307,28 +324,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -336,7 +353,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -346,39 +363,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -387,7 +411,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -401,11 +425,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -421,13 +445,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -438,20 +462,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -463,7 +487,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -474,15 +498,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -493,18 +517,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -514,7 +538,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -522,7 +546,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -532,57 +556,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -598,7 +630,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -608,11 +640,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -627,23 +659,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -655,30 +687,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -687,7 +719,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -698,7 +730,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -712,7 +744,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -729,7 +761,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -738,7 +770,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -748,7 +780,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -756,7 +788,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -767,6 +799,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1391,350 +1465,368 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr ""
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+msgid "No certificate found."
+msgstr ""
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr ""
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr ""
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr ""
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr ""
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr ""
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr ""
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr ""
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr ""
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr ""
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr ""
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr ""
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr ""
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr ""
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr ""
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr ""
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr ""
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr ""
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr ""
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr ""
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr ""
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr ""
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr ""
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr ""
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 

po/id.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+0900\n"
 "PO-Revision-Date: 2008-02-14 14:27+0000\n"
 "Last-Translator: Iwan Setyawan <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -17,30 +17,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 akan melanjutkan download jika proses transfer dimulai kembali."
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr "Hasil download:"
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr ""
 
@@ -56,49 +56,49 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 msgid "must be either 'true' or 'false'."
 msgstr "harus diisi 'true' atau 'false'"
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr "harus diantara %s dan %s"
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr "harus lebih kecil atau sama dengan %s"
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr "harus lebih besar atau sama dengan %s."
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 msgid "must be a number."
 msgstr "harus sebuah angka"
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr "harus lebih kecil atau sama dengan %.1f."
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr "harus diantara %.1f dan %.1f."
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr "harus lebih besar atau sama dengan %.1f"
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr "harus berisi salah satu dari:"
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 msgid "unrecognized proxy format"
 msgstr "format proxy tidak dikenali"
 
@@ -131,83 +131,100 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
 "                              has occured."
 msgstr ""
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr ""
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:62
-msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+#: src/usage_text.h:66
+msgid ""
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:64
-msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+#: src/usage_text.h:70
+msgid ""
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:66
+#: src/usage_text.h:74
 msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:68
-msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+#: src/usage_text.h:81
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:83
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:72
+#: src/usage_text.h:85
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
+msgstr ""
+
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
 "                              is the only supported scheme."
 msgstr ""
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr ""
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr ""
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
 msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -219,14 +236,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -238,14 +255,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -253,7 +270,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -261,7 +278,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -271,7 +288,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -280,7 +297,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -291,7 +308,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -307,28 +324,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -336,7 +353,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -346,39 +363,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -387,7 +411,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -401,11 +425,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -421,13 +445,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -438,20 +462,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -463,7 +487,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -474,15 +498,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -493,18 +517,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -514,7 +538,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -522,7 +546,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -532,57 +556,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -598,7 +630,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -608,11 +640,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -627,23 +659,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -655,30 +687,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -687,7 +719,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -698,7 +730,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -712,7 +744,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -729,7 +761,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -738,7 +770,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -748,7 +780,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -756,7 +788,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -767,6 +799,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1391,350 +1465,368 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr ""
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+msgid "No certificate found."
+msgstr ""
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr ""
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr ""
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr ""
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr ""
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr ""
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr ""
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr ""
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr ""
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr ""
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr ""
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr ""
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr ""
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr ""
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr ""
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr ""
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr ""
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr ""
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr ""
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr ""
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr ""
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr ""
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr ""
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr ""
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr "Download dibatalkan."
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr "Tidak ada file yang cocok dengan pilihan Anda."
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 

po/nn.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+0900\n"
 "PO-Revision-Date: 2008-08-13 22:28+0000\n"
 "Last-Translator: Tor Christian Tovslid <tctovsli@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-08-15 12:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 #, fuzzy
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr "Avsluttingssekvens undervegs... Trykk Ctrl-C att for nødavslutning."
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 #, fuzzy
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Nødavslutning undervegs..."
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 vil fortsette nedlastinga dersom overføringa vert omstarta."
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -40,11 +40,11 @@ msgstr ""
 "Dersom det er nokon feil, sjå loggfila. Sjå '-l' val i hjelp/manual for "
 "detaljar."
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr "Nedlastingsresultat:"
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr "Statusforklaring:"
 
@@ -61,49 +61,49 @@ msgstr "                              Taggar: "
 msgid "                              Possible Values: "
 msgstr "                              Tilgjengelege verdiar: "
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 msgid "must be either 'true' or 'false'."
 msgstr "må anten vere 'true' eller 'false'."
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr "må vere mellom %s og %s."
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr "må vere mindre enn eller lik %s."
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr "må vere større enn eller lik %s."
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 msgid "must be a number."
 msgstr "må vere eit nummer."
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr "må vere mindre enn eller lik %.1f."
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr "må vere mellom %.1f og %.1f."
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr "må vere større eller lik %.1f."
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr "må vere ein av følgande:"
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 msgid "unrecognized proxy format"
 msgstr "ugjenkjenneleg proxyformat"
 
@@ -136,83 +136,100 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
 "                              has occured."
 msgstr ""
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr ""
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:62
-msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+#: src/usage_text.h:66
+msgid ""
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:64
-msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+#: src/usage_text.h:70
+msgid ""
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:66
+#: src/usage_text.h:74
 msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:68
-msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+#: src/usage_text.h:81
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:83
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:72
+#: src/usage_text.h:85
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
+msgstr ""
+
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
 "                              is the only supported scheme."
 msgstr ""
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr ""
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr ""
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
 msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -224,14 +241,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -243,14 +260,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -258,7 +275,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -266,7 +283,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -276,7 +293,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -285,7 +302,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -296,7 +313,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -312,28 +329,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -341,7 +358,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -351,39 +368,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -392,7 +416,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -406,11 +430,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -426,13 +450,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -443,20 +467,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -468,7 +492,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -479,15 +503,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -498,18 +522,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -519,7 +543,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -527,7 +551,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -537,57 +561,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -603,7 +635,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -613,11 +645,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -632,23 +664,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -660,30 +692,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -692,7 +724,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -703,7 +735,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -717,7 +749,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -734,7 +766,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -743,7 +775,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -753,7 +785,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -761,7 +793,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -772,6 +804,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1396,350 +1470,368 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr ""
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+msgid "No certificate found."
+msgstr ""
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr ""
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr ""
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr ""
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr ""
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr ""
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr ""
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr ""
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr ""
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr ""
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr ""
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr ""
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr ""
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr ""
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr ""
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr ""
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr ""
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr ""
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr ""
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr ""
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr ""
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr ""
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr ""
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr ""
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 

po/pl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+0900\n"
 "PO-Revision-Date: 2008-03-05 11:38+0000\n"
 "Last-Translator: Maciej Habant <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -17,30 +17,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-15 07:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr ""
 
@@ -56,51 +56,51 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 #, fuzzy
 msgid "must be either 'true' or 'false'."
 msgstr "musisz wpisać \"true\" (ang. prawda) lub \"false\" (ang. fałsz)"
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr "musi zawierać wartość między %s a %s."
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr "musi być mniejsze, lub równe %s."
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr "musi być większe, lub równe %s."
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 #, fuzzy
 msgid "must be a number."
 msgstr "musisz wpisać numer."
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr "musi być mniejsze lub równe %.1f."
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr "musi zawierać wartość między %.1f a %.1f."
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr "musi być większe, lub równe %.1f."
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr "musi być jednym z wymienionych"
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 #, fuzzy
 msgid "unrecognized proxy format"
 msgstr "nierozpoznany format proxy"
@@ -134,83 +134,100 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
 "                              has occured."
 msgstr ""
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr ""
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:62
-msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+#: src/usage_text.h:66
+msgid ""
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:64
-msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+#: src/usage_text.h:70
+msgid ""
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:66
+#: src/usage_text.h:74
 msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:68
-msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+#: src/usage_text.h:81
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:83
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:72
+#: src/usage_text.h:85
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
+msgstr ""
+
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
 "                              is the only supported scheme."
 msgstr ""
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr ""
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr ""
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
 msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -222,14 +239,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -241,14 +258,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -256,7 +273,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -264,7 +281,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -274,7 +291,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -283,7 +300,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -294,7 +311,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -310,28 +327,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -339,7 +356,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -349,39 +366,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -390,7 +414,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -404,11 +428,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -424,13 +448,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -441,20 +465,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -466,7 +490,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -477,15 +501,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -496,18 +520,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -517,7 +541,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -525,7 +549,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -535,57 +559,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -601,7 +633,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -611,11 +643,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -630,23 +662,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -658,30 +690,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -690,7 +722,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -701,7 +733,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -715,7 +747,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -732,7 +764,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -741,7 +773,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -751,7 +783,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -759,7 +791,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -770,6 +802,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1406,350 +1480,368 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, fuzzy, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr "Błąd podczas ładowania ciasteczek z %s"
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+msgid "No certificate found."
+msgstr ""
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr ""
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr ""
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr ""
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr ""
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr ""
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr ""
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr ""
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr ""
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr ""
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr ""
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr ""
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr ""
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr ""
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr ""
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr ""
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr ""
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr ""
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr ""
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr ""
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr ""
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr ""
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr ""
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr ""
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 

po/pt_BR.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+0900\n"
 "PO-Revision-Date: 2007-12-01 14:25+0000\n"
 "Last-Translator: jareth-Br <fcarretoni@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,30 +17,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr ""
 
@@ -56,49 +56,49 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 msgid "must be either 'true' or 'false'."
 msgstr "deve ser 'true' ou 'false'"
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr "deve estar entre %s e %s"
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr "deve ser menor que, ou igual a %s"
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr "deve ser maior que, ou igual a %s"
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 msgid "must be a number."
 msgstr "deve ser um número."
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr "deve ser menor que, ou igual a %.1f."
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr "deve estar entre %.1f e %.1f."
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr "deve ser maior que, ou igual a %.1f."
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr "deve ser um dos seguintes:"
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 msgid "unrecognized proxy format"
 msgstr "formato proxy não reconhecido"
 
@@ -131,83 +131,100 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
 "                              has occured."
 msgstr ""
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr ""
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:62
-msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+#: src/usage_text.h:66
+msgid ""
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:64
-msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+#: src/usage_text.h:70
+msgid ""
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:66
+#: src/usage_text.h:74
 msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:68
-msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+#: src/usage_text.h:81
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:83
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:72
+#: src/usage_text.h:85
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
+msgstr ""
+
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
 "                              is the only supported scheme."
 msgstr ""
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr ""
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr ""
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
 msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -219,14 +236,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -238,14 +255,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -253,7 +270,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -261,7 +278,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -271,7 +288,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -280,7 +297,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -291,7 +308,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -307,28 +324,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -336,7 +353,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -346,39 +363,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -387,7 +411,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -401,11 +425,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -421,13 +445,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -438,20 +462,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -463,7 +487,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -474,15 +498,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -493,18 +517,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -514,7 +538,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -522,7 +546,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -532,57 +556,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -598,7 +630,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -608,11 +640,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -627,23 +659,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -655,30 +687,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -687,7 +719,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -698,7 +730,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -712,7 +744,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -729,7 +761,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -738,7 +770,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -748,7 +780,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -756,7 +788,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -767,6 +799,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1405,350 +1479,368 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr ""
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+msgid "No certificate found."
+msgstr ""
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr ""
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr ""
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr ""
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr ""
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr ""
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr ""
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr ""
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr ""
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr ""
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr ""
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr ""
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr ""
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr ""
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr ""
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr ""
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr ""
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr ""
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr ""
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr ""
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr ""
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr ""
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr ""
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr ""
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 

po/sr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+0900\n"
 "PO-Revision-Date: 2008-10-15 12:33+0000\n"
 "Last-Translator: Marko <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -17,20 +17,20 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-19 15:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Започиње след хитног искључивања..."
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 ће наставити преузимање уколико пренос буде рестартован."
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
@@ -38,11 +38,11 @@ msgstr ""
 "Уколико постоје било какве грешке, онда погледај log фајл.  Погледај '-l'  "
 "опцију у помоћним man страницама за детаље."
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr "Резултати преузимања"
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr "Статусна легенда"
 
@@ -58,49 +58,49 @@ msgstr "                              Ознаке: "
 msgid "                              Possible Values: "
 msgstr "                              Могуће вредности: "
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 msgid "must be either 'true' or 'false'."
 msgstr "мора бити или \"тачно\" или \"нетачно\"."
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr "мора бити између %s и %s."
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr "мора бити мање или једнако са %s."
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr "мора бити веће или једнако са %s."
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 msgid "must be a number."
 msgstr "мора бити број."
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr "мора бити мање или једнако са %.1f."
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr "мора бити између %.1f и %.1f."
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr "мора бити веће или једнако са %.1f."
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr "мора бити једно од следећег:"
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 msgid "unrecognized proxy format"
 msgstr "Не препознатљив proxy формат."
 
@@ -126,6 +126,7 @@ msgid " -D, --daemon                 Run as daemon."
 msgstr " -D, --daemon Покрени као самостартујући програм."
 
 #: src/usage_text.h:46
+#, fuzzy
 msgid ""
 " -s, --split=N                Download a file using N connections. If more\n"
 "                              than N URLs are given, first N URLs are used "
@@ -135,7 +136,9 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 " -s, --split=N Преузми фајл користећи N конекција. Уколико више\n"
 "                              онда N URL-ова је дато, прво N URL-ова је "
@@ -148,7 +151,7 @@ msgstr ""
 "                              истовремено.  Молим вас погледајте и -j опцију "
 "такође."
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
@@ -158,48 +161,60 @@ msgstr ""
 "грешке\n"
 "                              је прошло."
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr " -t, --timeout=SEC Подеси време прекида у секундама."
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr " -m, --max-tries=N Подеси број покушаја. 0 значи неограничено."
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
-" --http-proxy=HOST:PORT Користи HTTP proxy сервер. Ово утиче на све URL-ове."
-
-#: src/usage_text.h:62
-msgid " --http-user=USER             Set HTTP user. This affects all URLs."
-msgstr " --http-user=USER Подеси HTTP корисника.  Ово утиче на све URL-ове."
-
-#: src/usage_text.h:64
-msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
-msgstr " --http-passwd=PASSWD Подеси HTTP лозинку. Ово утиче на све URL-ове."
 
 #: src/usage_text.h:66
 msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
-" --http-proxy-user=USER Подеси HTTP proxy корисника. Ово утиче на све URL-"
-"ове."
 
-#: src/usage_text.h:68
+#: src/usage_text.h:70
 msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
-" --http-proxy-passwd=PASSWD Подеси HTTP proxy лозинку. Ово утиче на све URL-"
-"ове."
 
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:74
+msgid ""
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
+msgstr ""
+
+#: src/usage_text.h:81
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+msgstr " --http-user=USER Подеси HTTP корисника.  Ово утиче на све URL-ове."
+
+#: src/usage_text.h:83
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+msgstr " --http-passwd=PASSWD Подеси HTTP лозинку. Ово утиче на све URL-ове."
+
+#: src/usage_text.h:85
+#, fuzzy
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
 msgstr ""
 " --http-proxy-method=METHOD Подеси метод за коришћење током proxy захтева."
 
-#: src/usage_text.h:72
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
@@ -209,31 +224,30 @@ msgstr ""
 "основни\n"
 "                              је једина подржана шема."
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr " --referer=REFERER Подеси referator. Ово утиче на све URL-ове."
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr " --ftp-user=USER Подеси FTP корисника. Ово утиче на све URL-ове."
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr " --ftp-passwd=PASSWD Подеси FTP лозинку. Ово утиче на све URL-ове."
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr " --ftp-type=TYPE Подеси FTP тип преноса."
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr " -p, --ftp-pasv Користи пасивни мод у FTP-у."
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
-msgstr " --ftp-via-http-proxy=METHOD Користи HTTP proxy у FTP-у."
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
+msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -245,14 +259,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -264,14 +278,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -279,7 +293,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -287,7 +301,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -297,7 +311,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -306,7 +320,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -317,7 +331,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -333,28 +347,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -362,7 +376,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -372,39 +386,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -413,7 +434,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -427,11 +448,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -447,13 +468,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -464,20 +485,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -489,7 +510,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -500,15 +521,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -519,18 +540,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -540,7 +561,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -548,7 +569,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -558,57 +579,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -624,7 +653,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -634,11 +663,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -653,23 +682,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -681,30 +710,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -713,7 +742,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -724,7 +753,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -738,7 +767,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -755,7 +784,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -764,7 +793,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -774,7 +803,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -782,7 +811,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -793,6 +822,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1411,353 +1482,397 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr ""
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+msgid "No certificate found."
+msgstr ""
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr ""
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr ""
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr ""
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr ""
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr ""
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr ""
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr ""
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr ""
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr ""
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr ""
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr ""
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr ""
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr ""
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr ""
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr ""
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr ""
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr ""
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr ""
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr ""
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr ""
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr ""
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr ""
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr ""
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 
 #: src/Util.cc:714
 msgid "Files:"
 msgstr ""
+
+#~ msgid ""
+#~ " --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all "
+#~ "URLs."
+#~ msgstr ""
+#~ " --http-proxy=HOST:PORT Користи HTTP proxy сервер. Ово утиче на све URL-"
+#~ "ове."
+
+#~ msgid ""
+#~ " --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+#~ msgstr ""
+#~ " --http-proxy-user=USER Подеси HTTP proxy корисника. Ово утиче на све URL-"
+#~ "ове."
+
+#~ msgid ""
+#~ " --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all "
+#~ "URLs."
+#~ msgstr ""
+#~ " --http-proxy-passwd=PASSWD Подеси HTTP proxy лозинку. Ово утиче на све "
+#~ "URL-ове."
+
+#~ msgid " -p, --ftp-pasv               Use passive mode in FTP."
+#~ msgstr " -p, --ftp-pasv Користи пасивни мод у FTP-у."
+
+#~ msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#~ msgstr " --ftp-via-http-proxy=METHOD Користи HTTP proxy у FTP-у."

po/th.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+0900\n"
 "PO-Revision-Date: 2007-12-29 20:22+0000\n"
 "Last-Translator: pruet <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,30 +17,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 msgid "Emergency shutdown sequence commencing..."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr ""
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr ""
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr ""
 
@@ -56,50 +56,50 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 #, fuzzy
 msgid "must be either 'true' or 'false'."
 msgstr "ต้องเป็น 'true' หรือ 'false'"
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr "ต้องอยู่ระหว่าง %s และ  %s"
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr "ต้องน้อยกว่าหรือเท่ากับ %s"
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr "ต้องมากกว่าหรือเท่ากับ %s"
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 msgid "must be a number."
 msgstr "ต้องเป็นตัวเลข"
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr "ต้องน้อยกว่าหรือเท่ากับ %.1f"
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr "ต้องอยู่ระหว่าง %.1f และ %.1f"
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr "ต้องมากกว่าหรือเท่ากับ %.1f"
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr "ต้องเลือกหนึ่งตัวเลือกจากรายการต่อไปนี้"
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 msgid "unrecognized proxy format"
 msgstr "รูปแบบพร๊อกซีไม่ถูกต้อง"
 
@@ -132,83 +132,100 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
 "                              has occured."
 msgstr ""
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr ""
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:62
-msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+#: src/usage_text.h:66
+msgid ""
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:64
-msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+#: src/usage_text.h:70
+msgid ""
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:66
+#: src/usage_text.h:74
 msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:68
-msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+#: src/usage_text.h:81
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:83
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:72
+#: src/usage_text.h:85
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
+msgstr ""
+
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
 "                              is the only supported scheme."
 msgstr ""
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr ""
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr ""
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
 msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -220,14 +237,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -239,14 +256,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -254,7 +271,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -262,7 +279,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -272,7 +289,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -281,7 +298,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -292,7 +309,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -308,28 +325,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -337,7 +354,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -347,39 +364,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -388,7 +412,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -402,11 +426,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -422,13 +446,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -439,20 +463,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -464,7 +488,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -475,15 +499,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -494,18 +518,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -515,7 +539,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -523,7 +547,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -533,57 +557,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -599,7 +631,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -609,11 +641,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -628,23 +660,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -656,30 +688,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -688,7 +720,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -699,7 +731,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -713,7 +745,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -730,7 +762,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -739,7 +771,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -749,7 +781,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -757,7 +789,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -768,6 +800,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1396,350 +1470,368 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr ""
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+msgid "No certificate found."
+msgstr ""
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr ""
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr ""
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr ""
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr ""
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr ""
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr ""
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr ""
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr ""
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr ""
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr ""
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr ""
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr ""
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr ""
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr ""
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr ""
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr ""
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr ""
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr ""
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr ""
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr ""
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr ""
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr ""
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr ""
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 

po/vi.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+0900\n"
 "PO-Revision-Date: 2008-10-10 13:17+0000\n"
 "Last-Translator: Thuat <hoctro0104@gmail.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
@@ -17,33 +17,33 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-14 11:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 "Quá trình đóng chương trình bắt đầu... Nhấn \"Ctrl-C\" lần nữa để đóng "
 "chương trình cấp tốc"
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 msgid "Emergency shutdown sequence commencing..."
 msgstr "Quá trình đóng chương trình bắt đầu..."
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 sẽ tiếp tục tải về nếu quá trình chuyển dữ liệu bắt đầu lại"
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 "Nếu gặp lỗi, vui lòng xem tập tin log. Nhấn tuỳ chọn \"-l\" ở phần help/man"
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr "Kết quả tải tập tin"
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr "Tình trạng"
 
@@ -59,49 +59,49 @@ msgstr "                              Ghi chú "
 msgid "                              Possible Values: "
 msgstr "                              Giá trị có thể "
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 msgid "must be either 'true' or 'false'."
 msgstr "Giá trị phải là \"true\" (đúng) hoặc \"falsa\" (sai)"
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr "phải ở giữa %s và %s"
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 msgid "must be a number."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr ""
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr ""
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 msgid "unrecognized proxy format"
 msgstr ""
 
@@ -134,83 +134,100 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
 "                              has occured."
 msgstr ""
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr ""
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr ""
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:62
-msgid " --http-user=USER             Set HTTP user. This affects all URLs."
+#: src/usage_text.h:66
+msgid ""
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:64
-msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
+#: src/usage_text.h:70
+msgid ""
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:66
+#: src/usage_text.h:74
 msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:68
-msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
+#: src/usage_text.h:81
+msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:83
+msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:72
+#: src/usage_text.h:85
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
+msgstr ""
+
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
 "                              is the only supported scheme."
 msgstr ""
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr ""
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr ""
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr ""
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
 msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -222,14 +239,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -241,14 +258,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -256,7 +273,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -264,7 +281,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -274,7 +291,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -283,7 +300,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -294,7 +311,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -310,28 +327,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -339,7 +356,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -349,39 +366,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -390,7 +414,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -404,11 +428,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -424,13 +448,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -441,20 +465,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -466,7 +490,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -477,15 +501,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -496,18 +520,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -517,7 +541,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -525,7 +549,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -535,57 +559,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -601,7 +633,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -611,11 +643,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -630,23 +662,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -658,30 +690,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -690,7 +722,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -701,7 +733,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -715,7 +747,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -732,7 +764,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -741,7 +773,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -751,7 +783,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -759,7 +791,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -770,6 +802,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1388,350 +1462,368 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr ""
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+msgid "No certificate found."
+msgstr ""
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr ""
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr ""
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr ""
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr ""
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr ""
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr ""
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr ""
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr ""
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr ""
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr ""
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr ""
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr ""
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr ""
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr ""
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr ""
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr ""
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr ""
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr ""
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr ""
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr ""
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr ""
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr ""
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr ""
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr ""
 

po/zh_CN.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-10-20 00:07+0900\n"
+"POT-Creation-Date: 2008-11-18 21:22+0900\n"
 "PO-Revision-Date: 2008-10-08 08:18+0000\n"
 "Last-Translator: snufkinto <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -17,30 +17,30 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-14 11:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/DownloadEngine.cc:801
+#: src/DownloadEngine.cc:820
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
 
-#: src/DownloadEngine.cc:805
+#: src/DownloadEngine.cc:826
 msgid "Emergency shutdown sequence commencing..."
 msgstr "紧急关闭序列开始..."
 
-#: src/MultiUrlRequestInfo.cc:88
+#: src/MultiUrlRequestInfo.cc:96
 msgid "aria2 will resume download if the transfer is restarted."
 msgstr "aria2 将恢复下载，如果传输重新开始。"
 
-#: src/MultiUrlRequestInfo.cc:90
+#: src/MultiUrlRequestInfo.cc:98
 msgid ""
 "If there are any errors, then see the log file. See '-l' option in help/man "
 "page for details."
 msgstr ""
 
-#: src/RequestGroupMan.cc:382
+#: src/RequestGroupMan.cc:389
 msgid "Download Results:"
 msgstr "下载结果："
 
-#: src/RequestGroupMan.cc:397
+#: src/RequestGroupMan.cc:430
 msgid "Status Legend:"
 msgstr "状态标识："
 
@@ -56,49 +56,49 @@ msgstr ""
 msgid "                              Possible Values: "
 msgstr ""
 
-#: src/OptionHandlerImpl.h:96
+#: src/OptionHandlerImpl.h:99
 msgid "must be either 'true' or 'false'."
 msgstr "必须为'true'或'false'."
 
-#: src/OptionHandlerImpl.h:127 src/OptionHandlerImpl.h:174
+#: src/OptionHandlerImpl.h:130 src/OptionHandlerImpl.h:177
 #, c-format
 msgid "must be between %s and %s."
 msgstr "必须在%s和%s之间."
 
-#: src/OptionHandlerImpl.h:171
+#: src/OptionHandlerImpl.h:174
 #, c-format
 msgid "must be smaller than or equal to %s."
 msgstr "必须小于或等于%s."
 
-#: src/OptionHandlerImpl.h:177
+#: src/OptionHandlerImpl.h:180
 #, c-format
 msgid "must be greater than or equal to %s."
 msgstr "必须大于或等于%s."
 
-#: src/OptionHandlerImpl.h:180 src/OptionHandlerImpl.h:243
+#: src/OptionHandlerImpl.h:183 src/OptionHandlerImpl.h:246
 msgid "must be a number."
 msgstr "必须是一个数字"
 
-#: src/OptionHandlerImpl.h:234
+#: src/OptionHandlerImpl.h:237
 #, c-format
 msgid "must be smaller than or equal to %.1f."
 msgstr "必须小于或等于%.1f."
 
-#: src/OptionHandlerImpl.h:237
+#: src/OptionHandlerImpl.h:240
 #, c-format
 msgid "must be between %.1f and %.1f."
 msgstr "必须在%.1f 和%.1f之间."
 
-#: src/OptionHandlerImpl.h:240
+#: src/OptionHandlerImpl.h:243
 #, c-format
 msgid "must be greater than or equal to %.1f."
 msgstr "必须大于或等于%.1f."
 
-#: src/OptionHandlerImpl.h:377
+#: src/OptionHandlerImpl.h:380
 msgid "must be one of the following:"
 msgstr "必须为以下值之一:"
 
-#: src/OptionHandlerImpl.h:424
+#: src/OptionHandlerImpl.h:427 src/OptionHandlerImpl.h:468
 msgid "unrecognized proxy format"
 msgstr "无法识别的代理格式"
 
@@ -131,83 +131,101 @@ msgid ""
 "                              N URLs are given, those URLs are used more "
 "than\n"
 "                              once so that N connections total are made\n"
-"                              simultaneously. Please see -j option too."
+"                              simultaneously. Please see -j option too.\n"
+"                              Please note that in Metalink download, this\n"
+"                              option has no effect and use -C option instead."
 msgstr ""
 
-#: src/usage_text.h:53
+#: src/usage_text.h:55
 msgid ""
 " --retry-wait=SEC             Set the seconds to wait to retry after an "
 "error\n"
 "                              has occured."
 msgstr ""
 
-#: src/usage_text.h:56
+#: src/usage_text.h:58
 msgid " -t, --timeout=SEC            Set timeout in seconds."
 msgstr " -t, --timeout=SEC 设置超时（秒）。"
 
-#: src/usage_text.h:58
+#: src/usage_text.h:60
 msgid " -m, --max-tries=N            Set number of tries. 0 means unlimited."
 msgstr " -m, --max-tries=N 设置重试次数。0 意味着不限次数。"
 
-#: src/usage_text.h:60
+#: src/usage_text.h:62
 msgid ""
-" --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all URLs."
-msgstr " --http-proxy=HOST:PORT 使用 HTTP 代理服务器。这对所有 URL 都有效。"
+" --http-proxy=PROXY           Use this proxy server for HTTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
+msgstr ""
 
-#: src/usage_text.h:62
+#: src/usage_text.h:66
+msgid ""
+" --https-proxy=PROXY          Use this proxy server for HTTPS.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
+msgstr ""
+
+#: src/usage_text.h:70
+msgid ""
+" --ftp-proxy=PROXY            Use this proxy server for FTP.\n"
+"                              See also  --all-proxy option.\n"
+"                              This affects all URLs."
+msgstr ""
+
+#: src/usage_text.h:74
+msgid ""
+" --all-proxy=PROXY            Use this proxy server in the all protocols.\n"
+"                              You can override this setting and specify a\n"
+"                              proxy server for particular proctol using\n"
+"                              --http-proxy, --https-proxy and --ftp-proxy\n"
+"                              options.\n"
+"                              This affects all URLs."
+msgstr ""
+
+#: src/usage_text.h:81
 msgid " --http-user=USER             Set HTTP user. This affects all URLs."
 msgstr " --http-user=USER 设置 HTTP 用户。这对所有 URL 都有效。"
 
-#: src/usage_text.h:64
+#: src/usage_text.h:83
 msgid " --http-passwd=PASSWD         Set HTTP password. This affects all URLs."
 msgstr " --http-passwd=PASSWD 设置 HTTP 口令。这对所有 URL 都有效。"
 
-#: src/usage_text.h:66
-msgid ""
-" --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
-msgstr " --http-proxy-user=USER 设置 HTTP 代理用户。这对所有 URL 都有效。"
-
-#: src/usage_text.h:68
-msgid ""
-" --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all URLs."
-msgstr " --http-proxy-passwd=PASSWD 设置 HTTP 代理口令。这对所有 URL 都有效。"
-
-#: src/usage_text.h:70
-msgid " --http-proxy-method=METHOD   Set the method to use in proxy request."
+#: src/usage_text.h:85
+#, fuzzy
+msgid " --proxy-method=METHOD        Set the method to use in proxy request."
 msgstr " --http-proxy-method=METHOD 设置代理请求中使用的方法。"
 
-#: src/usage_text.h:72
+#: src/usage_text.h:87
 msgid ""
 " --http-auth-scheme=SCHEME    Set HTTP authentication scheme. Currently, "
 "basic\n"
 "                              is the only supported scheme."
 msgstr ""
 
-#: src/usage_text.h:75
+#: src/usage_text.h:90
 msgid " --referer=REFERER            Set Referer. This affects all URLs."
 msgstr " --referer=REFERER 设置 Referer 。这对所有 URL 都有效。"
 
-#: src/usage_text.h:77
+#: src/usage_text.h:92
 msgid " --ftp-user=USER              Set FTP user. This affects all URLs."
 msgstr " --ftp-user=USER 设置 FTP 用户。这对所有 URL 都有效。"
 
-#: src/usage_text.h:79
+#: src/usage_text.h:94
 msgid " --ftp-passwd=PASSWD          Set FTP password. This affects all URLs."
 msgstr " --ftp-passwd=PASSWD 设置 FTP 口令。这对所有 URL 都有效。"
 
-#: src/usage_text.h:81
+#: src/usage_text.h:96
 msgid " --ftp-type=TYPE              Set FTP transfer type."
 msgstr " --ftp-type=TYPE 设置 FTP 传输类型。"
 
-#: src/usage_text.h:83
-msgid " -p, --ftp-pasv               Use passive mode in FTP."
-msgstr " -p, --ftp-pasv 设置 FTP passive 模式。"
-
-#: src/usage_text.h:85
-msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
-msgstr " --ftp-via-http-proxy=METHOD 在 FTP 中使用 HTTP 代理。"
+#: src/usage_text.h:98
+msgid ""
+" -p, --ftp-pasv[=true|false]  Use the passive mode in FTP. If false is "
+"given,\n"
+"                              the active mode will be used."
+msgstr ""
 
-#: src/usage_text.h:87
+#: src/usage_text.h:101
 msgid ""
 " --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
@@ -219,14 +237,14 @@ msgid ""
 "downloads."
 msgstr ""
 
-#: src/usage_text.h:93
+#: src/usage_text.h:107
 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)."
 msgstr ""
 
-#: src/usage_text.h:97
+#: src/usage_text.h:111
 msgid ""
 " --file-allocation=METHOD     Specify file allocation method.\n"
 "                              'none' doesn't pre-allocate file space. "
@@ -238,14 +256,14 @@ msgid ""
 "                              the file."
 msgstr ""
 
-#: src/usage_text.h:103
+#: src/usage_text.h:117
 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)."
 msgstr ""
 
-#: src/usage_text.h:107
+#: src/usage_text.h:121
 msgid ""
 " --enable-direct-io[=true|false] Enable directI/O, which lowers cpu usage "
 "while\n"
@@ -253,7 +271,7 @@ msgid ""
 "                              Turn off if you encounter any error"
 msgstr ""
 
-#: src/usage_text.h:111
+#: src/usage_text.h:125
 msgid ""
 " --allow-overwrite=true|false If false, aria2 doesn't download a file which\n"
 "                              already exists but the corresponding .aria2 "
@@ -261,7 +279,7 @@ msgid ""
 "                              doesn't exist."
 msgstr ""
 
-#: src/usage_text.h:115
+#: src/usage_text.h:129
 msgid ""
 " --allow-piece-length-change=true|false If false is given, aria2 aborts "
 "download\n"
@@ -271,7 +289,7 @@ msgid ""
 "                              but some download progress will be lost."
 msgstr ""
 
-#: src/usage_text.h:120
+#: src/usage_text.h:134
 msgid ""
 " -Z, --force-sequential[=true|false] Fetch URIs in the command-line "
 "sequentially\n"
@@ -280,7 +298,7 @@ msgid ""
 "                              the usual command-line download utilities."
 msgstr ""
 
-#: src/usage_text.h:124
+#: src/usage_text.h:138
 msgid ""
 " --auto-file-renaming[=true|false] Rename file name if the same file "
 "already\n"
@@ -291,7 +309,7 @@ msgid ""
 "                              appended."
 msgstr ""
 
-#: src/usage_text.h:130
+#: src/usage_text.h:144
 msgid ""
 " -P, --parameterized-uri[=true|false] Enable parameterized URI support.\n"
 "                              You can specify set of parts:\n"
@@ -307,28 +325,28 @@ msgid ""
 "                              required."
 msgstr ""
 
-#: src/usage_text.h:141
+#: src/usage_text.h:155
 msgid ""
 " --enable-http-keep-alive[=true|false] Enable HTTP/1.1 persistent connection."
 msgstr ""
 
-#: src/usage_text.h:143
+#: src/usage_text.h:157
 msgid " --enable-http-pipelining[=true|false] Enable HTTP/1.1 pipelining."
 msgstr ""
 
-#: src/usage_text.h:145
+#: src/usage_text.h:159
 msgid ""
-" --check-integrity=true|false  Check file integrity by validating piece "
-"hash.\n"
-"                              This option only affects in BitTorrent "
-"downloads\n"
+" -V, --check-integrity[=true|false] Check file integrity by validating "
+"piece\n"
+"                              hashes. This option has effect only in "
+"BitTorrent\n"
 "                              and Metalink downloads with chunk checksums.\n"
 "                              Use this option to re-download a damaged "
 "portion\n"
 "                              of a file."
 msgstr ""
 
-#: src/usage_text.h:151
+#: src/usage_text.h:165
 msgid ""
 " --realtime-chunk-checksum=true|false  Validate chunk checksum while\n"
 "                              downloading a file in Metalink mode. This "
@@ -336,7 +354,7 @@ msgid ""
 "                              on affects Metalink mode with chunk checksums."
 msgstr ""
 
-#: src/usage_text.h:155
+#: src/usage_text.h:169
 msgid ""
 " -c, --continue               Continue downloading a partially downloaded\n"
 "                              file. Use this option to resume a download\n"
@@ -346,39 +364,46 @@ msgid ""
 "                              applicable to http(s)/ftp downloads."
 msgstr ""
 
-#: src/usage_text.h:162
+#: src/usage_text.h:176
 msgid " -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads."
 msgstr ""
 
-#: src/usage_text.h:164
+#: src/usage_text.h:178
 msgid " -n, --no-netrc               Disables netrc support."
 msgstr ""
 
-#: src/usage_text.h:166
+#: src/usage_text.h:180
 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."
+"                              Reads input from stdin when '-' is specified.\n"
+"                              The additional out and dir options can be\n"
+"                              specified after each line of URIs. This "
+"optional\n"
+"                              line must start with white space(s). See "
+"INPUT\n"
+"                              FILE section of man page for details."
 msgstr ""
 
-#: src/usage_text.h:171
+#: src/usage_text.h:189
 msgid ""
 " -j, --max-concurrent-downloads=N Set maximum number of parallel downloads "
 "for\n"
 "                              every static (HTTP/FTP) URL, torrent and "
-"metalink."
+"metalink.\n"
+"                              See also -s and -C options."
 msgstr ""
 
-#: src/usage_text.h:174
+#: src/usage_text.h:193
 msgid ""
 " --load-cookies=FILE          Load Cookies from FILE using the Firefox3 "
 "format\n"
 "                              and Mozilla/Firefox(1.x/2.x)/Netscape format."
 msgstr ""
 
-#: src/usage_text.h:177
+#: src/usage_text.h:196
 msgid ""
 " -S, --show-files             Print file listing of .torrent or .metalink "
 "file\n"
@@ -387,7 +412,7 @@ msgid ""
 "                              in case of torrent file."
 msgstr ""
 
-#: src/usage_text.h:181
+#: src/usage_text.h:200
 msgid ""
 " --select-file=INDEX...       Set file to download by specifing its index.\n"
 "                              You can find the file index using the\n"
@@ -401,11 +426,11 @@ msgid ""
 "options)."
 msgstr ""
 
-#: src/usage_text.h:190
+#: src/usage_text.h:209
 msgid " -T, --torrent-file=TORRENT_FILE  The path to the .torrent file."
 msgstr ""
 
-#: src/usage_text.h:192
+#: src/usage_text.h:211
 msgid ""
 " --follow-torrent=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .torrent or content type is\n"
@@ -421,13 +446,13 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:202
+#: src/usage_text.h:221
 msgid ""
 " --direct-file-mapping=true|false Directly read from and write to each file\n"
 "                              mentioned in .torrent file."
 msgstr ""
 
-#: src/usage_text.h:205
+#: src/usage_text.h:224
 msgid ""
 " --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -438,20 +463,20 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:211
+#: src/usage_text.h:230
 msgid ""
-" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
+" -u, --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)."
 msgstr ""
 
-#: src/usage_text.h:215
+#: src/usage_text.h:234
 msgid ""
 " --seed-time=MINUTES          Specify seeding time in minutes. Also see the\n"
 "                              --seed-ratio option."
 msgstr ""
 
-#: src/usage_text.h:218
+#: src/usage_text.h:237
 msgid ""
 " --seed-ratio=RATIO           Specify share ratio. Seed completed torrents\n"
 "                              until share ratio reaches RATIO. 1.0 is\n"
@@ -463,7 +488,7 @@ msgid ""
 "                              the conditions is satisfied."
 msgstr ""
 
-#: src/usage_text.h:226
+#: src/usage_text.h:245
 msgid ""
 " --peer-id-prefix=PEERI_ID_PREFIX Specify the prefix of peer ID. The peer ID "
 "in\n"
@@ -474,15 +499,15 @@ msgid ""
 "                              added to make it's length 20 bytes."
 msgstr ""
 
-#: src/usage_text.h:233
+#: src/usage_text.h:252
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
 msgstr ""
 
-#: src/usage_text.h:235
+#: src/usage_text.h:254
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""
 
-#: src/usage_text.h:237
+#: src/usage_text.h:256
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@@ -493,18 +518,18 @@ msgid ""
 "                              be used together."
 msgstr ""
 
-#: src/usage_text.h:243
+#: src/usage_text.h:262
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
 
-#: src/usage_text.h:246
+#: src/usage_text.h:265
 msgid ""
 " --dht-file-path=PATH         Change the DHT routing table file to PATH."
 msgstr ""
 
-#: src/usage_text.h:248
+#: src/usage_text.h:267
 msgid ""
 " --bt-min-crypto-level=plain|arc4 Set minimum level of encryption method.\n"
 "                              If several encryption methods are provided by "
@@ -514,7 +539,7 @@ msgid ""
 "                              the given level."
 msgstr ""
 
-#: src/usage_text.h:253
+#: src/usage_text.h:272
 msgid ""
 " --bt-require-crypto=true|false If true is given, aria2 doesn't accept and\n"
 "                              establish connection with legacy BitTorrent\n"
@@ -522,7 +547,7 @@ msgid ""
 "                              handshake."
 msgstr ""
 
-#: src/usage_text.h:258
+#: src/usage_text.h:277
 msgid ""
 " --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the "
 "download\n"
@@ -532,57 +557,65 @@ msgid ""
 "                              You can append K or M(1K = 1024, 1M = 1024K)."
 msgstr ""
 
-#: src/usage_text.h:263
+#: src/usage_text.h:282
 msgid ""
 " --bt-max-open-files=NUM      Specify maximum number of files to open in "
 "each\n"
 "                              BitTorrent download."
 msgstr ""
 
-#: src/usage_text.h:266
+#: src/usage_text.h:285
 msgid ""
 " --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"
 "                              verifying piece hashes."
 msgstr ""
 
-#: src/usage_text.h:269
+#: src/usage_text.h:288
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
 msgstr ""
 
-#: src/usage_text.h:271
+#: src/usage_text.h:290
 msgid ""
 " -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"
-"                              simultaneously."
-msgstr ""
-
-#: src/usage_text.h:274
+"                              simultaneously. Some Metalinks regulates the\n"
+"                              number of servers to connect. aria2 strictly\n"
+"                              respects them. This means that if Metalink "
+"defines\n"
+"                              the maxconnections attribute lower than\n"
+"                              NUM_SERVERS, then aria2 uses the value of\n"
+"                              maxconnections attribute instead of "
+"NUM_SERVERS.\n"
+"                              See also -s and -j options."
+msgstr ""
+
+#: src/usage_text.h:299
 msgid " --metalink-version=VERSION   The version of the file to download."
 msgstr ""
 
-#: src/usage_text.h:276
+#: src/usage_text.h:301
 msgid " --metalink-language=LANGUAGE The language of the file to download."
 msgstr ""
 
-#: src/usage_text.h:278
+#: src/usage_text.h:303
 msgid ""
 " --metalink-os=OS             The operating system of the file to download."
 msgstr ""
 
-#: src/usage_text.h:280
+#: src/usage_text.h:305
 msgid ""
 " --metalink-location=LOCATION[,...] The location of the preferred server.\n"
 "                              A comma-deliminated list of locations is\n"
 "                              acceptable."
 msgstr ""
 
-#: src/usage_text.h:284
+#: src/usage_text.h:309
 msgid ""
 " --metalink-preferred-protocol=PROTO Specify preferred protocol. Specifiy "
 "'none'\n"
 "                              if you don't have any preferred protocol."
 msgstr ""
 
-#: src/usage_text.h:287
+#: src/usage_text.h:312
 msgid ""
 " --follow-metalink=true|false|mem If true or mem is specified, when a file\n"
 "                              whose suffix is .metaink or content type is\n"
@@ -598,7 +631,7 @@ msgid ""
 "                              is not taken."
 msgstr ""
 
-#: src/usage_text.h:297
+#: src/usage_text.h:322
 msgid ""
 " --metalink-enable-unique-protocol=true|false If true is given and several\n"
 "                              protocols are available for a mirror in a "
@@ -608,11 +641,11 @@ msgid ""
 "                              specify the preference of protocol."
 msgstr ""
 
-#: src/usage_text.h:303
+#: src/usage_text.h:328
 msgid " -v, --version                Print the version number and exit."
 msgstr ""
 
-#: src/usage_text.h:305
+#: src/usage_text.h:330
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@@ -627,23 +660,23 @@ msgid ""
 "                              and print the result."
 msgstr ""
 
-#: src/usage_text.h:313
+#: src/usage_text.h:338
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
 
-#: src/usage_text.h:315
+#: src/usage_text.h:340
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
 
-#: src/usage_text.h:317
+#: src/usage_text.h:342
 msgid ""
 " --stop=SEC                   Stop application after SEC seconds has "
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
 
-#: src/usage_text.h:320
+#: src/usage_text.h:345
 msgid ""
 " --header=HEADER              Append HEADER to HTTP request header. You can "
 "use\n"
@@ -655,30 +688,30 @@ msgid ""
 "                              http://host/file"
 msgstr ""
 
-#: src/usage_text.h:326
+#: src/usage_text.h:351
 msgid " -q, --quiet[=true|false]     Make aria2 quite (no console output)."
 msgstr ""
 
-#: src/usage_text.h:328
+#: src/usage_text.h:353
 msgid " --async-dns[=true|false]     Enable asynchronous DNS."
 msgstr ""
 
-#: src/usage_text.h:330
+#: src/usage_text.h:355
 msgid " --ftp-reuse-connection[=true|false] Reuse connection in FTP."
 msgstr ""
 
-#: src/usage_text.h:332
+#: src/usage_text.h:357
 msgid ""
 " --summary-interval=SEC       Set interval to output download progress "
 "summary.\n"
 "                              Setting 0 suppresses the output."
 msgstr ""
 
-#: src/usage_text.h:335
+#: src/usage_text.h:360
 msgid " --log-level=LEVEL            Set log level to output."
 msgstr ""
 
-#: src/usage_text.h:337
+#: src/usage_text.h:362
 msgid ""
 " -R, --remote-time[=true|false] Retrieve timestamp of the remote file from "
 "the\n"
@@ -687,7 +720,7 @@ msgid ""
 "                              apply it to the local file."
 msgstr ""
 
-#: src/usage_text.h:341
+#: src/usage_text.h:366
 msgid ""
 " --connect-timeout=SEC        Set the connect timeout in seconds to "
 "establish\n"
@@ -698,7 +731,7 @@ msgid ""
 "                              effect and --timeout option is used instead."
 msgstr ""
 
-#: src/usage_text.h:346
+#: src/usage_text.h:371
 msgid ""
 " --max-file-not-found=NUM     If aria2 recieves `file not found' status from "
 "the\n"
@@ -712,7 +745,7 @@ msgid ""
 "                              HTTP/FTP servers."
 msgstr ""
 
-#: src/usage_text.h:353
+#: src/usage_text.h:378
 msgid ""
 " --uri-selector=SELECTOR      Specify URI selection algorithm.\n"
 "                              If 'inorder' is given, URI is tried in the "
@@ -729,7 +762,7 @@ msgid ""
 "                              --server-stat-if options."
 msgstr ""
 
-#: src/usage_text.h:364
+#: src/usage_text.h:389
 msgid ""
 " --server-stat-of=FILE        Specify the filename to which performance "
 "profile\n"
@@ -738,7 +771,7 @@ msgid ""
 "                              using --server-stat-if option."
 msgstr ""
 
-#: src/usage_text.h:368
+#: src/usage_text.h:393
 msgid ""
 " --server-stat-if=FILE        Specify the filename to load performance "
 "profile\n"
@@ -748,7 +781,7 @@ msgid ""
 "                              See also --uri-selector option"
 msgstr ""
 
-#: src/usage_text.h:373
+#: src/usage_text.h:398
 msgid ""
 " --server-stat-timeout=SEC    Specifies timeout in seconds to invalidate\n"
 "                              performance profile of the servers since the "
@@ -756,7 +789,7 @@ msgid ""
 "                              contact to them."
 msgstr ""
 
-#: src/usage_text.h:377
+#: src/usage_text.h:402
 msgid ""
 " --auto-save-interval=SEC     Save a control file(*.aria2) every SEC "
 "seconds.\n"
@@ -767,6 +800,48 @@ msgid ""
 "                              regardless of the value."
 msgstr ""
 
+#: src/usage_text.h:407
+msgid ""
+" --certificate=FILE           Use the client certificate in FILE.\n"
+"                              The certificate must be in PEM format.\n"
+"                              You may use --private-key option to specify "
+"the\n"
+"                              private key."
+msgstr ""
+
+#: src/usage_text.h:412
+msgid ""
+" --private-key=FILE           Use the private key in FILE.\n"
+"                              The private key must be decrypted and in PEM\n"
+"                              format. See also --certificate option."
+msgstr ""
+
+#: src/usage_text.h:416
+msgid ""
+" --ca-certificate=FILE        Use the certificate authorities in FILE to "
+"verify\n"
+"                              the peers. The certificate file must be in "
+"PEM\n"
+"                              format and can contain multiple CA "
+"certificates.\n"
+"                              Use --check-certificate option to enable\n"
+"                              verification."
+msgstr ""
+
+#: src/usage_text.h:422
+msgid ""
+" --check-certificate[=true|false] Verify the peer using certificates "
+"specified\n"
+"                              in --ca-certificate option."
+msgstr ""
+
+#: src/usage_text.h:425
+msgid ""
+" --no-proxy=DOMAINS           Specify comma separated hostnames or domains "
+"to\n"
+"                              which proxy should not be used."
+msgstr ""
+
 #: src/version_usage.cc:54
 msgid " version "
 msgstr ""
@@ -1389,353 +1464,392 @@ msgid "Network problem has occurred. cause:%s"
 msgstr ""
 
 #: src/message.h:161
+#, c-format
+msgid "Failed to load trusted CA certificates from %s. Cause: %s"
+msgstr ""
+
+#: src/message.h:163
+#, c-format
+msgid "Certificate verification failed. Cause: %s"
+msgstr ""
+
+#: src/message.h:164
+msgid "No certificate found."
+msgstr ""
+
+#: src/message.h:165
+msgid "Hostname not match."
+msgstr ""
+
+#: src/message.h:167
 msgid "Timeout."
 msgstr ""
 
-#: src/message.h:162
+#: src/message.h:168
 msgid "Invalid chunk size."
 msgstr ""
 
-#: src/message.h:163
+#: src/message.h:169
 #, c-format
 msgid "Too large chunk. size=%d"
 msgstr ""
 
-#: src/message.h:164
+#: src/message.h:170
 msgid "Invalid header."
 msgstr ""
 
-#: src/message.h:165
+#: src/message.h:171
 msgid "Invalid response."
 msgstr ""
 
-#: src/message.h:166
+#: src/message.h:172
 msgid "No header found."
 msgstr ""
 
-#: src/message.h:167
+#: src/message.h:173
 msgid "No status header."
 msgstr ""
 
-#: src/message.h:168
+#: src/message.h:174
 msgid "Proxy connection failed."
 msgstr ""
 
-#: src/message.h:169
+#: src/message.h:175
 msgid "Connection failed."
 msgstr ""
 
-#: src/message.h:170
+#: src/message.h:176
 #, c-format
 msgid ""
 "The requested filename and the previously registered one are not same. "
 "Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:171
+#: src/message.h:177
 #, c-format
 msgid "The response status is not successful. status=%d"
 msgstr ""
 
-#: src/message.h:172
+#: src/message.h:178
 #, c-format
 msgid "Too large file size. size=%s"
 msgstr ""
 
-#: src/message.h:173
+#: src/message.h:179
 #, c-format
 msgid "Transfer encoding %s is not supported."
 msgstr ""
 
-#: src/message.h:174
+#: src/message.h:180
 #, c-format
 msgid "SSL initialization failed: %s"
 msgstr ""
 
-#: src/message.h:175
+#: src/message.h:181
 msgid "SSL I/O error"
 msgstr ""
 
-#: src/message.h:176
+#: src/message.h:182
 msgid "SSL protocol error"
 msgstr ""
 
-#: src/message.h:177
+#: src/message.h:183
 #, c-format
 msgid "SSL unknown error %d"
 msgstr ""
 
-#: src/message.h:178
+#: src/message.h:184
 #, c-format
 msgid "SSL initialization failed: OpenSSL connect error %d"
 msgstr ""
 
-#: src/message.h:179
+#: src/message.h:185
 #, c-format
 msgid "Size mismatch Expected:%s Actual:%s"
 msgstr ""
 
-#: src/message.h:180
+#: src/message.h:186
 msgid "Authorization failed."
 msgstr ""
 
-#: src/message.h:181
+#: src/message.h:187
 msgid "Got EOF from the server."
 msgstr ""
 
-#: src/message.h:182
+#: src/message.h:188
 msgid "Got EOF from peer."
 msgstr ""
 
-#: src/message.h:183
+#: src/message.h:189
 msgid "Malformed meta info."
 msgstr ""
 
-#: src/message.h:185
+#: src/message.h:191
 #, c-format
 msgid "Failed to open the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:186
+#: src/message.h:192
 #, c-format
 msgid "Failed to write into the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:187
+#: src/message.h:193
 #, c-format
 msgid "Failed to read from the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:188
+#: src/message.h:194
 msgid "Failed to read data from disk."
 msgstr ""
 
-#: src/message.h:189
+#: src/message.h:195
 #, c-format
 msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:190
+#: src/message.h:196
 #, c-format
 msgid "Failed to seek the file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:191
+#: src/message.h:197
 #, c-format
 msgid "The offset is out of range, offset=%s"
 msgstr ""
 
-#: src/message.h:192
+#: src/message.h:198
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: src/message.h:193
+#: src/message.h:199
 #, c-format
 msgid "Failed to make the directory %s, cause: %s"
 msgstr ""
 
-#: src/message.h:194
+#: src/message.h:200
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:195
+#: src/message.h:201
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:196
+#: src/message.h:202
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
 msgstr ""
 
-#: src/message.h:198
+#: src/message.h:204
 #, c-format
 msgid "Failed to open a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:199
+#: src/message.h:205
 #, c-format
 msgid "Failed to set a socket option, cause: %s"
 msgstr ""
 
-#: src/message.h:200
+#: src/message.h:206
 #, c-format
 msgid "Failed to set a socket as blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:201
+#: src/message.h:207
 #, c-format
 msgid "Failed to set a socket as non-blocking, cause: %s"
 msgstr ""
 
-#: src/message.h:202
+#: src/message.h:208
 #, c-format
 msgid "Failed to bind a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:203
+#: src/message.h:209
 #, c-format
 msgid "Failed to listen to a socket, cause: %s"
 msgstr ""
 
-#: src/message.h:204
+#: src/message.h:210
 #, c-format
 msgid "Failed to accept a peer connection, cause: %s"
 msgstr ""
 
-#: src/message.h:205
+#: src/message.h:211
 #, c-format
 msgid "Failed to get the name of socket, cause: %s"
 msgstr ""
 
-#: src/message.h:206
+#: src/message.h:212
 #, c-format
 msgid "Failed to get the name of connected peer, cause: %s"
 msgstr ""
 
-#: src/message.h:207
+#: src/message.h:213
 #, c-format
 msgid "Failed to resolve the hostname %s, cause: %s"
 msgstr ""
 
-#: src/message.h:208
+#: src/message.h:214
 #, c-format
 msgid "Failed to connect to the host %s, cause: %s"
 msgstr ""
 
-#: src/message.h:209
+#: src/message.h:215
 #, c-format
 msgid "Failed to check whether the socket is writable, cause: %s"
 msgstr ""
 
-#: src/message.h:210
+#: src/message.h:216
 #, c-format
 msgid "Failed to check whether the socket is readable, cause: %s"
 msgstr ""
 
-#: src/message.h:211
+#: src/message.h:217
 #, c-format
 msgid "Failed to send data, cause: %s"
 msgstr ""
 
-#: src/message.h:212
+#: src/message.h:218
 #, c-format
 msgid "Failed to receive data, cause: %s"
 msgstr ""
 
-#: src/message.h:213
+#: src/message.h:219
 #, c-format
 msgid "Failed to peek data, cause: %s"
 msgstr ""
 
-#: src/message.h:214
+#: src/message.h:220
 #, c-format
 msgid "Unknown socket error %d (0x%x)"
 msgstr ""
 
-#: src/message.h:215
+#: src/message.h:221
 #, c-format
 msgid "File %s exists, but %s does not exist."
 msgstr ""
 
-#: src/message.h:216
+#: src/message.h:222
 #, c-format
 msgid "Invalid payload size for %s, size=%d. It should be %d."
 msgstr ""
 
-#: src/message.h:217
+#: src/message.h:223
 #, c-format
 msgid "Invalid ID=%d for %s. It should be %d."
 msgstr ""
 
-#: src/message.h:218
+#: src/message.h:224
 #, c-format
 msgid ""
 "Chunk checksum validation failed. checksumIndex=%d, offset=%s, expectedHash=%"
 "s, actualHash=%s"
 msgstr ""
 
-#: src/message.h:219
+#: src/message.h:225
 msgid "Download aborted."
 msgstr ""
 
-#: src/message.h:220
+#: src/message.h:226
 #, c-format
 msgid "File %s is being downloaded by other command."
 msgstr ""
 
-#: src/message.h:221
+#: src/message.h:227
 msgid "Insufficient checksums."
 msgstr ""
 
-#: src/message.h:222
+#: src/message.h:228
 #, c-format
 msgid "Tracker returned failure reason: %s"
 msgstr ""
 
-#: src/message.h:223
+#: src/message.h:229
 msgid "Flooding detected."
 msgstr ""
 
-#: src/message.h:224
+#: src/message.h:230
 #, c-format
 msgid ""
 "Drop connection because no request/piece messages were exchanged in a "
 "certain period(%d seconds)."
 msgstr ""
 
-#: src/message.h:225
+#: src/message.h:231
 msgid "The infoHash in torrent file doesn't match to one in .aria2 file."
 msgstr ""
 
-#: src/message.h:226
+#: src/message.h:232
 #, c-format
 msgid "No such file entry %s"
 msgstr ""
 
-#: src/message.h:227
+#: src/message.h:233
 #, c-format
 msgid "Too slow Downloading speed: %d <= %d(B/s), host:%s"
 msgstr ""
 
-#: src/message.h:228
+#: src/message.h:234
 msgid "No HttpRequestEntry found."
 msgstr ""
 
-#: src/message.h:229
+#: src/message.h:235
 #, c-format
 msgid "Got %d status, but no location header provided."
 msgstr ""
 
-#: src/message.h:230
+#: src/message.h:236
 #, c-format
 msgid "Invalid range header. Request: %s-%s/%s, Response: %s-%s/%s"
 msgstr ""
 
-#: src/message.h:231
+#: src/message.h:237
 msgid "No file matched with your preference."
 msgstr ""
 
-#: src/message.h:232
+#: src/message.h:238
 msgid "Exception caught"
 msgstr ""
 
-#: src/message.h:233
+#: src/message.h:239
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
 msgstr ""
 
-#: src/message.h:234
+#: src/message.h:240
 #, c-format
 msgid "Invalid file length. Cannot continue download %s: local %s, remote %s"
 msgstr ""
 
-#: src/BtSetup.cc:123
+#: src/BtSetup.cc:160
 msgid "Errors occurred while binding port.\n"
 msgstr "绑定端口时发生错误。\n"
 
 #: src/Util.cc:714
 msgid "Files:"
 msgstr "文件："
+
+#~ msgid ""
+#~ " --http-proxy=HOST:PORT       Use HTTP proxy server. This affects all "
+#~ "URLs."
+#~ msgstr " --http-proxy=HOST:PORT 使用 HTTP 代理服务器。这对所有 URL 都有效。"
+
+#~ msgid ""
+#~ " --http-proxy-user=USER       Set HTTP proxy user. This affects all URLs."
+#~ msgstr " --http-proxy-user=USER 设置 HTTP 代理用户。这对所有 URL 都有效。"
+
+#~ msgid ""
+#~ " --http-proxy-passwd=PASSWD   Set HTTP proxy password. This affects all "
+#~ "URLs."
+#~ msgstr ""
+#~ " --http-proxy-passwd=PASSWD 设置 HTTP 代理口令。这对所有 URL 都有效。"
+
+#~ msgid " -p, --ftp-pasv               Use passive mode in FTP."
+#~ msgstr " -p, --ftp-pasv 设置 FTP passive 模式。"
+
+#~ msgid " --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP."
+#~ msgstr " --ftp-via-http-proxy=METHOD 在 FTP 中使用 HTTP 代理。"